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
cvs diff -r1.58 -r1.59 pkgsrc/lang/php54/Attic/distinfo (expand / switch to unified diff)

--- 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,24 +1,25 @@ @@ -1,24 +1,25 @@
1$NetBSD: distinfo,v 1.58 2015/06/12 04:51:01 taca Exp $ 1$NetBSD: distinfo,v 1.59 2015/06/17 12:26:14 fhajny Exp $
2 2
3SHA1 (php-5.4.42.tar.bz2) = fa7d35d9766ebd055ac7ccdda1d86c53425ea0bc 3SHA1 (php-5.4.42.tar.bz2) = fa7d35d9766ebd055ac7ccdda1d86c53425ea0bc
4RMD160 (php-5.4.42.tar.bz2) = 5b91d856f8637abe1cdbb37adc2f43e3ceef8317 4RMD160 (php-5.4.42.tar.bz2) = 5b91d856f8637abe1cdbb37adc2f43e3ceef8317
5Size (php-5.4.42.tar.bz2) = 12708394 bytes 5Size (php-5.4.42.tar.bz2) = 12708394 bytes
6SHA1 (patch-acinclude.m4) = 71635e5381abf99a9fc9f2537b1c2f18e8096f00 6SHA1 (patch-acinclude.m4) = 71635e5381abf99a9fc9f2537b1c2f18e8096f00
7SHA1 (patch-aclocal.m4) = 699086785fcd3d3834cc6016479dbdae6518e522 7SHA1 (patch-aclocal.m4) = 699086785fcd3d3834cc6016479dbdae6518e522
8SHA1 (patch-build_libtool.m4) = d81527abea3bd97e220f00a5d5296d8b1bfe2659 8SHA1 (patch-build_libtool.m4) = d81527abea3bd97e220f00a5d5296d8b1bfe2659
9SHA1 (patch-configure) = df6209127b1e23d17bc7128da3a44f3e44bbfd48 9SHA1 (patch-configure) = df6209127b1e23d17bc7128da3a44f3e44bbfd48
10SHA1 (patch-ext_gd_config.m4) = 2353efe6f25e1081b41d61033c3185cc643c7891 10SHA1 (patch-ext_gd_config.m4) = 2353efe6f25e1081b41d61033c3185cc643c7891
11SHA1 (patch-ext_imap_config.m4) = 01681e8b54ee586ec4db72a5da2d0aec3fa89fcc 11SHA1 (patch-ext_imap_config.m4) = 01681e8b54ee586ec4db72a5da2d0aec3fa89fcc
12SHA1 (patch-ext_mssql_php__mssql.c) = 732e48b05086180585a3087c2e9737db557dbc3b 12SHA1 (patch-ext_mssql_php__mssql.c) = 732e48b05086180585a3087c2e9737db557dbc3b
13SHA1 (patch-ext_pdo__mysql_config.m4) = 3526e737da25129710218e7141d5a05ae0a51390 13SHA1 (patch-ext_pdo__mysql_config.m4) = 3526e737da25129710218e7141d5a05ae0a51390
14SHA1 (patch-ext_pdo_config.m4) = 26a4ad02e5c6b7a54c3c54a6d026a3ccfed62c59 14SHA1 (patch-ext_pdo_config.m4) = 26a4ad02e5c6b7a54c3c54a6d026a3ccfed62c59
15SHA1 (patch-ext_phar_Makefile.frag) = 1af23d9135557bc7ba2f3627b317d4cbef37aaba 15SHA1 (patch-ext_phar_Makefile.frag) = 1af23d9135557bc7ba2f3627b317d4cbef37aaba
16SHA1 (patch-ext_phar_phar_phar.php) = 011f2d68048dbc63f5efcab4e23062daa9e8e08c 16SHA1 (patch-ext_phar_phar_phar.php) = 011f2d68048dbc63f5efcab4e23062daa9e8e08c
 17SHA1 (patch-ext_sqlite3_libsqlite_sqlite3.c) = a95941231097914b884986bb5dc1e7247dbfefe2
17SHA1 (patch-ext_standard_basic__functions.c) = 563fe67eb78b786cd46195026381ef22128e0841 18SHA1 (patch-ext_standard_basic__functions.c) = 563fe67eb78b786cd46195026381ef22128e0841
18SHA1 (patch-php.ini-development) = 056a74646cbeb0b2bcfc18463348343d817b54bc 19SHA1 (patch-php.ini-development) = 056a74646cbeb0b2bcfc18463348343d817b54bc
19SHA1 (patch-php.ini-production) = ac61016e18077a0870b8c8c42e89e3848c26d1f2 20SHA1 (patch-php.ini-production) = ac61016e18077a0870b8c8c42e89e3848c26d1f2
20SHA1 (patch-run-tests.php) = ff80b8ad52d7c0a43fa318ed9bffca9d7b3e688d 21SHA1 (patch-run-tests.php) = ff80b8ad52d7c0a43fa318ed9bffca9d7b3e688d
21SHA1 (patch-sapi_cgi_Makefile.frag) = c271096b8565e89a85b0189c6f503f3fb5cd4b27 22SHA1 (patch-sapi_cgi_Makefile.frag) = c271096b8565e89a85b0189c6f503f3fb5cd4b27
22SHA1 (patch-sapi_fpm_fpm_events_port.c) = ad45bcebadf923ee8cb3f2ad4d78d21dd178a8e3 23SHA1 (patch-sapi_fpm_fpm_events_port.c) = ad45bcebadf923ee8cb3f2ad4d78d21dd178a8e3
23SHA1 (patch-sapi_fpm_fpm_fpm__sockets.c) = 3a43488f79fa778abb25b0e29579166d436cb4c3 24SHA1 (patch-sapi_fpm_fpm_fpm__sockets.c) = 3a43488f79fa778abb25b0e29579166d436cb4c3
24SHA1 (patch-sapi_fpm_php-fpm.conf.in) = 2369bb6a426a7fb47dc73c88f0daa0f6fa67b593 25SHA1 (patch-sapi_fpm_php-fpm.conf.in) = 2369bb6a426a7fb47dc73c88f0daa0f6fa67b593
File Added: pkgsrc/lang/php54/patches/Attic/patch-ext_sqlite3_libsqlite_sqlite3.c
$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