diff options
| author | Remi Collet <remi@remirepo.net> | 2019-10-04 18:26:46 +0200 |
|---|---|---|
| committer | Remi Collet <remi@remirepo.net> | 2019-10-04 18:26:46 +0200 |
| commit | ffb51b9cb282ba64978e5ab1eb361af94668debc (patch) | |
| tree | 2e86b0a1e6b861586b242098e9ecd1885b962c2c | |
| parent | 4bc81cfedb0ecb68a0e74cde282f43235f4222fc (diff) | |
fix broken intl extension on EL-7
| -rw-r--r-- | f633c347574c0d814050b4bf2493e0cac6a5988c.patch | 36 | ||||
| -rw-r--r-- | php.spec | 7 |
2 files changed, 42 insertions, 1 deletions
diff --git a/f633c347574c0d814050b4bf2493e0cac6a5988c.patch b/f633c347574c0d814050b4bf2493e0cac6a5988c.patch new file mode 100644 index 0000000..55fa13c --- /dev/null +++ b/f633c347574c0d814050b4bf2493e0cac6a5988c.patch @@ -0,0 +1,36 @@ +From f633c347574c0d814050b4bf2493e0cac6a5988c Mon Sep 17 00:00:00 2001 +From: Dmitry Stogov <dmitry@zend.com> +Date: Thu, 19 Sep 2019 23:44:53 +0300 +Subject: [PATCH] Don't buid static libaraies when only DSO required + +--- + build/Makefile.global | 2 +- + build/php.m4 | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/build/Makefile.global b/build/Makefile.global +index 82e0d69f35e3..3aec9fc9d597 100644 +--- a/build/Makefile.global ++++ b/build/Makefile.global +@@ -16,7 +16,7 @@ build-modules: $(PHP_MODULES) $(PHP_ZEND_EX) + build-binaries: $(PHP_BINARIES) + + libphp$(PHP_MAJOR_VERSION).la: $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS) +- $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(EXTRA_CFLAGS) -rpath $(phptempdir) $(EXTRA_LDFLAGS) $(LDFLAGS) $(PHP_RPATHS) $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS) $(EXTRA_LIBS) $(ZEND_EXTRA_LIBS) -o $@ ++ $(LIBTOOL) --mode=link --tag=disable-static $(CC) $(CFLAGS) $(EXTRA_CFLAGS) -rpath $(phptempdir) $(EXTRA_LDFLAGS) $(LDFLAGS) $(PHP_RPATHS) $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS) $(EXTRA_LIBS) $(ZEND_EXTRA_LIBS) -o $@ + -@$(LIBTOOL) --silent --mode=install cp $@ $(phptempdir)/$@ >/dev/null 2>&1 + + libs/libphp$(PHP_MAJOR_VERSION).bundle: $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS) +diff --git a/build/php.m4 b/build/php.m4 +index 3624a33a8eec..3d6a1133777b 100644 +--- a/build/php.m4 ++++ b/build/php.m4 +@@ -849,7 +849,7 @@ AC_DEFUN([PHP_SHARED_MODULE],[ + \$(LIBTOOL) --mode=install cp $3/$1.$suffix \$(phplibdir) + + $3/$1.$suffix: \$($2) \$(translit($1,a-z_-,A-Z__)_SHARED_DEPENDENCIES) +- \$(LIBTOOL) --mode=link ifelse($4,,[\$(CC)],[\$(CXX)]) \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(LDFLAGS) $additional_flags -o [\$]@ -export-dynamic -avoid-version -prefer-pic -module -rpath \$(phplibdir) \$(EXTRA_LDFLAGS) \$($2) \$(translit($1,a-z_-,A-Z__)_SHARED_LIBADD) ++ \$(LIBTOOL) --mode=link --tag=disable-static ifelse($4,,[\$(CC)],[\$(CXX)]) \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(LDFLAGS) $additional_flags -o [\$]@ -export-dynamic -avoid-version -prefer-pic -module -rpath \$(phplibdir) \$(EXTRA_LDFLAGS) \$($2) \$(translit($1,a-z_-,A-Z__)_SHARED_LIBADD) + + EOF + ]) @@ -108,7 +108,7 @@ Summary: PHP scripting language for creating dynamic web sites Name: %{?scl_prefix}php Version: %{upver}%{?lower:~%{lower}}%{?gh_date:.%{gh_date}} -Release: 23%{?dist} +Release: 24%{?dist} # All files licensed under PHP version 3.01, except # Zend is licensed under Zend # TSRM is licensed under BSD @@ -166,6 +166,7 @@ Patch47: php-5.6.3-phpinfo.patch Patch91: php-7.2.0-oci8conf.patch # Upstream fixes (100+) +Patch100: https://github.com/php/php-src/commit/f633c347574c0d814050b4bf2493e0cac6a5988c.patch # Security fixes (200+) @@ -938,6 +939,7 @@ sed -e 's/php-devel/%{?scl_prefix}php-devel/' -i scripts/phpize.in %patch91 -p1 -b .remi-oci8 # upstream patches +%patch100 -p1 -R # security patches @@ -1787,6 +1789,9 @@ fi %changelog +* Fri Oct 4 2019 Remi Collet <remi@remirepo.net> - 7.4.0~rc3-24 +- fix broken intl extension on EL-7 + * Tue Oct 1 2019 Remi Collet <remi@remirepo.net> - 7.4.0~rc3-23 - update to 7.4.0RC3 |