[packages/php/dev-7.0] fix shared php build

glen glen at pld-linux.org
Sat Sep 26 14:24:59 CEST 2015


commit 534cc418baa0249253e328e6cad0c0979d63366c
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Sat Sep 26 15:22:54 2015 +0300

    fix shared php build

 php-shared.patch | 12 ++++++++++++
 php.spec         |  8 +++-----
 2 files changed, 15 insertions(+), 5 deletions(-)
---
diff --git a/php.spec b/php.spec
index a5e6923..1571998 100644
--- a/php.spec
+++ b/php.spec
@@ -1,5 +1,3 @@
-# TODO 7.0
-# - restore libphp_common.so (lost in f4ee12ea)
 # TODO 5.6:
 # - phpdbg: link with libphp_common
 # - enable --with-fpm-systemd, but ensure it checks for sd_booted()
@@ -131,7 +129,7 @@ ERROR: You need to select at least one Apache SAPI to build shared modules.
 %undefine	with_filter
 %endif
 
-%define		rel	0.3
+%define		rel	0.4
 %define		subver	RC3
 %define		orgname	php
 %define		ver_suffix 70
@@ -3002,7 +3000,7 @@ fi
 %dir %{_sysconfdir}
 %dir %{_sysconfdir}/conf.d
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/php.ini
-#%attr(755,root,root) %{_libdir}/libphp_common-*.so
+%attr(755,root,root) %{_libdir}/libphp_common-*.so
 %dir %{php_extensiondir}
 
 %doc ext/session/mod_files.sh
@@ -3012,7 +3010,7 @@ fi
 %doc CODING_STANDARDS README.{EXT_SKEL,PARAMETER_PARSING_API,SELF-CONTAINED-EXTENSIONS,STREAMS,SUBMITTING_PATCH,TESTING,TESTING2,UNIX-BUILD-SYSTEM,input_filter}
 %attr(755,root,root) %{_bindir}/phpize
 %attr(755,root,root) %{_bindir}/php-config
-#%attr(755,root,root) %{_libdir}/libphp_common.so
+%attr(755,root,root) %{_libdir}/libphp_common.so
 %{_libdir}/libphp_common.la
 %{_includedir}/php
 %{_libdir}/%{name}/build
diff --git a/php-shared.patch b/php-shared.patch
index db49e1b..bfe647c 100644
--- a/php-shared.patch
+++ b/php-shared.patch
@@ -1,3 +1,15 @@
+--- php-7.0.0RC3/configure.in~	2015-09-26 14:55:35.000000000 +0300
++++ php-7.0.0RC3/configure.in	2015-09-26 15:13:29.581882625 +0300
+@@ -224,6 +224,9 @@
+ dnl check for -R, etc. switch
+ PHP_RUNPATH_SWITCH
+ 
++dnl Always shared
++PHP_BUILD_SHARED
++
+ dnl Checks for some support/generator progs
+ PHP_PROG_AWK
+ PHP_PROG_BISON
 --- php-5.2.4/Makefile.global~	2007-08-31 19:13:58.000000000 +0300
 +++ php-5.2.4/Makefile.global	2007-08-31 19:19:33.799017413 +0300
 @@ -13,8 +13,12 @@
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/php.git/commitdiff/534cc418baa0249253e328e6cad0c0979d63366c



More information about the pld-cvs-commit mailing list