diff options
| author | jperkin <jperkin> | 2014-04-14 10:17:19 +0000 |
|---|---|---|
| committer | jperkin <jperkin> | 2014-04-14 10:17:19 +0000 |
| commit | 703b2f4c75c5464ca8723d7f4bcae9891b22ca24 (patch) | |
| tree | 568fa79005828256cf13119abbb38c505ea55c19 | |
| parent | 1bf819c459b618b4d2923c53a494fed5d001bbe9 (diff) | |
| download | pkgsrc-703b2f4c75c5464ca8723d7f4bcae9891b22ca24.tar.gz | |
Don't define _XOPEN_SOURCE on SunOS, it conflicts with the environment
from the PHP build.
| -rw-r--r-- | lang/php55/distinfo | 3 | ||||
| -rw-r--r-- | lang/php55/patches/patch-ext_sqlite3_libsqlite_sqlite3.c | 15 |
2 files changed, 17 insertions, 1 deletions
diff --git a/lang/php55/distinfo b/lang/php55/distinfo index 95fda36c1d0..d2e5abadba3 100644 --- a/lang/php55/distinfo +++ b/lang/php55/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.18 2014/04/04 03:04:59 taca Exp $ +$NetBSD: distinfo,v 1.19 2014/04/14 10:17:19 jperkin Exp $ SHA1 (php-5.5.11.tar.bz2) = 58d660e5455b3f2abdfe3205182ffe3a58b5d1cd RMD160 (php-5.5.11.tar.bz2) = 9666e7e595ffa8cc8db87534d75fb05efda495ad @@ -15,6 +15,7 @@ SHA1 (patch-ext_pdo__mysql_config.m4) = 3526e737da25129710218e7141d5a05ae0a51390 SHA1 (patch-ext_pdo_config.m4) = 26a4ad02e5c6b7a54c3c54a6d026a3ccfed62c59 SHA1 (patch-ext_phar_Makefile.frag) = 1af23d9135557bc7ba2f3627b317d4cbef37aaba SHA1 (patch-ext_phar_phar_phar.php) = 011f2d68048dbc63f5efcab4e23062daa9e8e08c +SHA1 (patch-ext_sqlite3_libsqlite_sqlite3.c) = 8b72c83819e4d348001c11ec122d377f95b2099d SHA1 (patch-ext_standard_basic__functions.c) = f2a44998145306c2cb2d2f3822c0e7cc70c778b4 SHA1 (patch-makedist) = 3f6b0621d30264824f2cb4c2903d15ba95be3937 SHA1 (patch-php.ini-development) = 4fc40f0af5f6e58b614794e066a5738694dc8ef8 diff --git a/lang/php55/patches/patch-ext_sqlite3_libsqlite_sqlite3.c b/lang/php55/patches/patch-ext_sqlite3_libsqlite_sqlite3.c new file mode 100644 index 00000000000..6d74cf4ee66 --- /dev/null +++ b/lang/php55/patches/patch-ext_sqlite3_libsqlite_sqlite3.c @@ -0,0 +1,15 @@ +$NetBSD: patch-ext_sqlite3_libsqlite_sqlite3.c,v 1.1 2014/04/14 10:17:19 jperkin Exp $ + +Don't redefine _XOPEN_SOURCE, it is already set from php. + +--- ext/sqlite3/libsqlite/sqlite3.c.orig 2014-04-01 12:32:03.000000000 +0000 ++++ ext/sqlite3/libsqlite/sqlite3.c +@@ -7822,7 +7822,7 @@ struct sqlite3_rtree_geometry { + ** But _XOPEN_SOURCE define causes problems for Mac OS X, so omit + ** it. + */ +-#if !defined(_XOPEN_SOURCE) && !defined(__DARWIN__) && !defined(__APPLE__) ++#if !defined(_XOPEN_SOURCE) && !defined(__DARWIN__) && !defined(__APPLE__) && !defined(__sun) + # define _XOPEN_SOURCE 600 + #endif + |