diff options
| author | A. Wilcox <awilcox@wilcox-tech.com> | 2020-04-05 13:57:10 +0000 |
|---|---|---|
| committer | A. Wilcox <awilcox@wilcox-tech.com> | 2020-04-05 13:57:10 +0000 |
| commit | 36b28239a67475e728fc48a2716afd0f16f99a68 (patch) | |
| tree | 0ef9c4511a75c14f4fa239c3b46671ffbd064a77 | |
| parent | 343e40efb539159bff58339cae63279e2a7cf9c2 (diff) | |
| parent | 0f35e5c26e10182ff2dcd83cfc3c716c0cd66e87 (diff) | |
| download | packages-36b28239a67475e728fc48a2716afd0f16f99a68.tar.gz packages-36b28239a67475e728fc48a2716afd0f16f99a68.tar.bz2 packages-36b28239a67475e728fc48a2716afd0f16f99a68.tar.xz packages-36b28239a67475e728fc48a2716afd0f16f99a68.zip | |
Merge branch 'fix/php-enchant' into 'master'
user/php7: fix build with dash-binsh (hopefully)
See merge request adelie/packages!424
| -rw-r--r-- | user/php7/APKBUILD | 2 | ||||
| -rw-r--r-- | user/php7/enchant-2.patch | 11 |
2 files changed, 12 insertions, 1 deletions
diff --git a/user/php7/APKBUILD b/user/php7/APKBUILD index 581104a84..c86d41e84 100644 --- a/user/php7/APKBUILD +++ b/user/php7/APKBUILD @@ -534,7 +534,7 @@ cb3ba48fbd412f12d98ef1f88b509b40bc4ca44a16779a06d43e4db3cb8d24d54404b9e11ca941b5 01d4ba3ef104ea378eb0e8cbb7bdee3fdf65e4bd6865eb3bc6c0dc4af31c2d52887abdf0150b5ef984b877860285a3b1af84b11ffebb5b8b722ea9faf83edfeb php-fpm.logrotate a7f9ba5e11652fd1cb9e756c3269269a95de083ecb5be936a85c7a09c1396db9088e0251c6a643c40235c0e776fce2a471e5c7f5a033b85c7d3b3110c2b39e48 php-module.conf 587057aaf93feec2936e2851dbb42ba78310fc012e340d90c58a8912437a8b6a15585895490c31ac31cf36969ea1f2999993c5ca42031c378f31fb83d361fd73 disabled-tests.list -2fb8e1dce0e71a968c53869b01369bb681e4e043e87d342cd96cb7c09e8c2ca0aad9752d8e0781de54488bee54717ba0de5ef9eba28f16cd7e6b914e03c53bc6 enchant-2.patch +7c8c3cac9efce81d525cb5a70e1402e393881b83ef4c7b5d39d3565803d21cd283daf3d74e9a8b059ecac66cf339756acc63608ffcb83d960dba86583bd45108 enchant-2.patch a77dd3bdf9dc7a0f2c06ff3e7c425d062bbaa29902c17402ce98701dc99499be863ad543aa5e6a7d1c249702d6afb193398dd3199ae58e42b32b95d434fb1883 fpm-paths.patch 821bf6fde83302e7613429a61066e2bd3ca4e998dcb7c11e39f4ae84829056537501b47a051e1feba752f72d98644b9a214633db9ccb16d137d3242d145acfe0 getsockopt.patch 951fa8445c20513aa48bf7c7d773c6b4012322e7e7592c13d965758e761b9898c484f0dbc5ae565c05787e6ab868769c97c71504624b10c9570e1d4214f75b10 install-pear.patch diff --git a/user/php7/enchant-2.patch b/user/php7/enchant-2.patch index 709345cf0..9d421c3bf 100644 --- a/user/php7/enchant-2.patch +++ b/user/php7/enchant-2.patch @@ -63,3 +63,14 @@ } /* }}} */ +--- php-7.4.4/build/php.m4 2020-03-17 06:40:21.000000000 -0400 ++++ php-7.4.4/build/php.m4 2020-04-05 09:27:14.634620646 -0400 +@@ -1541,7 +1541,7 @@ AC_DEFUN([PHP_CHECK_LIBRARY], [ + ],[ + LDFLAGS=$save_old_LDFLAGS + ext_shared=$save_ext_shared +- unset ac_cv_lib_$1[]_$2 ++ unset ac_cv_lib_[]translit($1, -, _)_$2 + $4 + ])dnl + ]) |