diff options
| author | jdolecek <jdolecek@pkgsrc.org> | 2016-07-24 13:27:23 +0000 |
|---|---|---|
| committer | jdolecek <jdolecek@pkgsrc.org> | 2016-07-24 13:27:23 +0000 |
| commit | 7d5006a54fc8a4d4ca8f7feb65901b7128847858 (patch) | |
| tree | 0e2d711a9c34a4151eb467f52e287e1d1a074928 /lang/php70 | |
| parent | 1c37feef18ba797a386fdb9b9636b40c61730c19 (diff) | |
| download | pkgsrc-7d5006a54fc8a4d4ca8f7feb65901b7128847858.tar.gz | |
add patch for ext/recode/recode.c so that the variable 'program_name' required by recode library is provided unconditionally; it should not depend on whether or not program without this symbol happens to compile
Diffstat (limited to 'lang/php70')
| -rw-r--r-- | lang/php70/distinfo | 3 | ||||
| -rw-r--r-- | lang/php70/patches/patch-ext_recode_recode.c | 22 |
2 files changed, 24 insertions, 1 deletions
diff --git a/lang/php70/distinfo b/lang/php70/distinfo index 5b1467ad044..8dd5b007885 100644 --- a/lang/php70/distinfo +++ b/lang/php70/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.15 2016/07/24 02:20:16 taca Exp $ +$NetBSD: distinfo,v 1.16 2016/07/24 13:27:23 jdolecek Exp $ SHA1 (php-7.0.9.tar.bz2) = bc94c0c0d548ab4b89840994f9f3b468a3d89c4b RMD160 (php-7.0.9.tar.bz2) = d6771507506336da29f88ae59e5d93da4207bfdd @@ -13,6 +13,7 @@ SHA1 (patch-ext_pdo__mysql_config.m4) = b1ef91be5a729040197e9af50da0f5fd1f6c90a8 SHA1 (patch-ext_pdo_config.m4) = 522281775cc0e70a135b1f813158988ef1f3e244 SHA1 (patch-ext_phar_Makefile.frag) = 558869b60f8ed6674a3ba1d595a65f010df4c426 SHA1 (patch-ext_phar_phar_phar.php) = f630e3946b21b76d4fe857a43e00e25c9445f2c8 +SHA1 (patch-ext_recode_recode.c) = a97a1815d6a41410f68c289debbb9396128a2159 SHA1 (patch-ext_sqlite3_libsqlite_sqlite3.c) = 8a529a1b3f7c97731f2e719d006f67c3a7259bb5 SHA1 (patch-ext_standard_basic__functions.c) = f97a2748c7b15fbd9a2d3c21e56079088cc05d56 SHA1 (patch-ext_standard_php__dns.h) = 3687ceac4dff4605263b53acb761b071f7446ccb diff --git a/lang/php70/patches/patch-ext_recode_recode.c b/lang/php70/patches/patch-ext_recode_recode.c new file mode 100644 index 00000000000..6d636973fe8 --- /dev/null +++ b/lang/php70/patches/patch-ext_recode_recode.c @@ -0,0 +1,22 @@ +$NetBSD: patch-ext_recode_recode.c,v 1.1 2016/07/24 13:27:23 jdolecek Exp $ + +program_name is expected variable, is required by recode 3.5 and recode 3.6 to actually work. + +The config.m4 test for it is broken at least for some platforms - it only tests if program without it compiles, but on Solaris and MacOS/Darwin at least it only fails when run. + +--- ext/recode/recode.c.orig 2016-07-24 13:07:47.000000000 +0000 ++++ ext/recode/recode.c +@@ -29,11 +29,8 @@ + + #if HAVE_LIBRECODE + +-/* For recode 3.5 */ +-#if HAVE_BROKEN_RECODE +-extern char *program_name; +-char *program_name = "php"; +-#endif ++extern const char *program_name; ++const char *program_name = "php"; + + #ifdef HAVE_STDBOOL_H + # include <stdbool.h> |