diff options
| author | Remi Collet <remi@remirepo.net> | 2019-10-11 09:58:31 +0200 |
|---|---|---|
| committer | Remi Collet <remi@remirepo.net> | 2019-10-11 09:58:31 +0200 |
| commit | 2e43d27999bf2c74044786883fea888778dd0485 (patch) | |
| tree | 1be5feb1fc330d6853a9ba6fa75aa83063bc35b3 /1bb1a1ee285e0a41247f2f60e8f0f03e8a1d9325.patch | |
| parent | 67aed2d0ea6eeb7ca10cbd0bcdfd2ad394d6cc5d (diff) | |
test build with more upstream patches
Diffstat (limited to '1bb1a1ee285e0a41247f2f60e8f0f03e8a1d9325.patch')
| -rw-r--r-- | 1bb1a1ee285e0a41247f2f60e8f0f03e8a1d9325.patch | 37 |
1 files changed, 37 insertions, 0 deletions
diff --git a/1bb1a1ee285e0a41247f2f60e8f0f03e8a1d9325.patch b/1bb1a1ee285e0a41247f2f60e8f0f03e8a1d9325.patch new file mode 100644 index 0000000..3863c41 --- /dev/null +++ b/1bb1a1ee285e0a41247f2f60e8f0f03e8a1d9325.patch @@ -0,0 +1,37 @@ +From 1bb1a1ee285e0a41247f2f60e8f0f03e8a1d9325 Mon Sep 17 00:00:00 2001 +From: Dmitry Stogov <dmitry@zend.com> +Date: Thu, 10 Oct 2019 16:24:12 +0300 +Subject: [PATCH] Revert "Don't buid static libaraies when only DSO required" + +This reverts commit f633c347574c0d814050b4bf2493e0cac6a5988c. +--- + 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 3aec9fc9d597..82e0d69f35e3 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 --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) --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) --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 57016ad7669f..2105e703249c 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 --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) ++ \$(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) + + EOF + ]) |