/[packages]/cauldron/php/current/SPECS/php.spec
ViewVC logotype

Diff of /cauldron/php/current/SPECS/php.spec

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 275075 by guillomovitch, Fri Jul 27 21:27:50 2012 UTC revision 275080 by guillomovitch, Fri Jul 27 22:32:55 2012 UTC
# Line 1  Line 1 
1  %define _build_pkgcheck_set %{nil}  %define _build_pkgcheck_set %{nil}
2  %define _build_pkgcheck_srpm %{nil}  %define _build_pkgcheck_srpm %{nil}
3    %define _disable_ld_no_undefined 1
4    
5  %define mod_name mod_php  %define mod_name mod_php
6  %define load_order 70  %define load_order 70
# Line 1287  rm -rf ext/xmlrpc/libxmlrpc Line 1288  rm -rf ext/xmlrpc/libxmlrpc
1288  %build  %build
1289  %serverbuild  %serverbuild
1290    
1291  # it does not work with -fPIE and someone added that to the serverbuild macro...  export CFLAGS="${CFLAGS} -fno-strict-aliasing"
 CFLAGS=`echo $CFLAGS|sed -e 's|-fPIE||g'`  
 CXXFLAGS=`echo $CXXFLAGS|sed -e 's|-fPIE||g'`  
   
 #export CFLAGS="`echo ${CFLAGS} | sed s/O2/O0/` -fPIC -L%{_libdir} -fno-strict-aliasing"  
 export CFLAGS="${CFLAGS} -fPIC -L%{_libdir} -fno-strict-aliasing"  
 export CXXFLAGS="${CFLAGS}"  
 export RPM_OPT_FLAGS="${CFLAGS}"  
1292    
1293  cat > php-devel/buildext <<EOF  cat > php-devel/buildext <<EOF
1294  #!/bin/bash  #!/bin/bash
# Line 1322  export oldstyleextdir=yes Line 1316  export oldstyleextdir=yes
1316  export EXTENSION_DIR="%{_libdir}/php/extensions"  export EXTENSION_DIR="%{_libdir}/php/extensions"
1317  export PROG_SENDMAIL="%{_sbindir}/sendmail"  export PROG_SENDMAIL="%{_sbindir}/sendmail"
1318  export GD_SHARED_LIBADD="$GD_SHARED_LIBADD -lm"  export GD_SHARED_LIBADD="$GD_SHARED_LIBADD -lm"
 SAFE_LDFLAGS=`echo %{ldflags}|sed -e 's|-Wl,--no-undefined||g'`  
 export LDFLAGS="$SAFE_LDFLAGS"  
1319    
1320  # never use "--disable-rpath", it does the opposite  # never use "--disable-rpath", it does the opposite
1321    
# Line 1498  install -m0644 scripts/man1/phpize.1 %{b Line 1490  install -m0644 scripts/man1/phpize.1 %{b
1490  install -m0644 scripts/man1/php-config.1 %{buildroot}%{_mandir}/man1/  install -m0644 scripts/man1/php-config.1 %{buildroot}%{_mandir}/man1/
1491    
1492  # fpm  # fpm
1493  install -d %{buildroot}/lib/systemd/system  install -d %{buildroot}%{_unitdir}
1494  install -d %{buildroot}%{_sysconfdir}/logrotate.d  install -d %{buildroot}%{_sysconfdir}/logrotate.d
1495  install -d %{buildroot}%{_sysconfdir}/sysconfig  install -d %{buildroot}%{_sysconfdir}/sysconfig
1496  install -d %{buildroot}%{_sysconfdir}/php-fpm.d  install -d %{buildroot}%{_sysconfdir}/php-fpm.d

Legend:
Removed from v.275075  
changed lines
  Added in v.275080

  ViewVC Help
Powered by ViewVC 1.1.30