diff options
| author | Remi Collet <remi@remirepo.net> | 2019-10-15 14:21:26 +0200 |
|---|---|---|
| committer | Remi Collet <remi@remirepo.net> | 2019-10-15 14:21:26 +0200 |
| commit | f9d71a15a180592ef19ca38c4e1679443ee9823f (patch) | |
| tree | 49f9a12d09793167af1eed35f24ed49fc0ac4854 /f633c347574c0d814050b4bf2493e0cac6a5988c.patch | |
| parent | 028cf358b400b31869b1691e229200611bbb2748 (diff) | |
update to 7.4.0RC4
Diffstat (limited to 'f633c347574c0d814050b4bf2493e0cac6a5988c.patch')
| -rw-r--r-- | f633c347574c0d814050b4bf2493e0cac6a5988c.patch | 36 |
1 files changed, 0 insertions, 36 deletions
diff --git a/f633c347574c0d814050b4bf2493e0cac6a5988c.patch b/f633c347574c0d814050b4bf2493e0cac6a5988c.patch deleted file mode 100644 index 55fa13c..0000000 --- a/f633c347574c0d814050b4bf2493e0cac6a5988c.patch +++ /dev/null @@ -1,36 +0,0 @@ -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 - ]) |