Wed Jun 17 12:26:14 2015 UTC ()
Copy over sqlite3.c patch from lang/php55. Fixes build on SunOS.
(fhajny)
diff -r1.58 -r1.59 pkgsrc/lang/php54/distinfo
diff -r0 -r1.1 pkgsrc/lang/php54/patches/patch-ext_sqlite3_libsqlite_sqlite3.c
--- pkgsrc/lang/php54/Attic/distinfo 2015/06/12 04:51:01 1.58
+++ pkgsrc/lang/php54/Attic/distinfo 2015/06/17 12:26:14 1.59
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.58 2015/06/12 04:51:01 taca Exp $
+$NetBSD: distinfo,v 1.59 2015/06/17 12:26:14 fhajny Exp $
SHA1 (php-5.4.42.tar.bz2) = fa7d35d9766ebd055ac7ccdda1d86c53425ea0bc
RMD160 (php-5.4.42.tar.bz2) = 5b91d856f8637abe1cdbb37adc2f43e3ceef8317
@@ -14,6 +14,7 @@
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) = a95941231097914b884986bb5dc1e7247dbfefe2
SHA1 (patch-ext_standard_basic__functions.c) = 563fe67eb78b786cd46195026381ef22128e0841
SHA1 (patch-php.ini-development) = 056a74646cbeb0b2bcfc18463348343d817b54bc
SHA1 (patch-php.ini-production) = ac61016e18077a0870b8c8c42e89e3848c26d1f2
$NetBSD: patch-ext_sqlite3_libsqlite_sqlite3.c,v 1.1 2015/06/17 12:26:14 fhajny Exp $
Don't redefine _XOPEN_SOURCE, it is already set from php.
--- ext/sqlite3/libsqlite/sqlite3.c.orig 2015-06-10 05:11:55.000000000 +0000
+++ ext/sqlite3/libsqlite/sqlite3.c
@@ -8408,7 +8408,7 @@ struct sqlite3_rtree_query_info {
** 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