diff options
| author | Peter Kokot <peterkokot@gmail.com> | 2019-03-02 18:52:01 +0100 |
|---|---|---|
| committer | Peter Kokot <peterkokot@gmail.com> | 2019-03-02 18:52:01 +0100 |
| commit | fa574ddd6f2553cda5bcfae96f2cea58993a54fe (patch) | |
| tree | 386f1e1f0b24eb10737a28c49e8b6ff37c26ec31 | |
| parent | c2fb85547d66411ca6047a675a56ad07b50115ea (diff) | |
| parent | 637713c1a442931ca2528292cd6ff54fcaed951c (diff) | |
| download | php-git-fa574ddd6f2553cda5bcfae96f2cea58993a54fe.tar.gz | |
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Update NEWS
Fix shared module generation on AIX bug #77676
| -rw-r--r-- | acinclude.m4 | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index 266c2cff37..688d2d761c 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -833,15 +833,11 @@ dnl from object_var in build-dir. dnl AC_DEFUN([PHP_SHARED_MODULE],[ install_modules="install-modules" + suffix=la case $host_alias in *aix*[)] - suffix=so - link_cmd='$(LIBTOOL) --mode=link ifelse($4,,[$(CC)],[$(CXX)]) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$3'/$1.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $($2) $(translit($1,a-z_-,A-Z__)_SHARED_LIBADD) && mv -f '$3'/.libs/$1.so '$3'/$1.so' - ;; - *[)] - suffix=la - link_cmd='$(LIBTOOL) --mode=link ifelse($4,,[$(CC)],[$(CXX)]) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o [$]@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $($2) $(translit($1,a-z_-,A-Z__)_SHARED_LIBADD)' + additional_flags="-Wl,-G" ;; esac @@ -856,7 +852,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) - $link_cmd + \$(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 ]) |