sergiotarxz/termux-packages
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

php: Link pgsql extension against libpcre

Browse Source 
The pgsql extension uses pcre functions but does not link against
libpcre by default, as the php executable which dlopen():s the
extension already links against libpcre.

However, on Android this doesn't work, see
	https://github.com/android-ndk/ndk/issues/201
so we need to link against libpcre explicitly.
This commit is contained in:
Fredrik Fornwall 2017-03-30 23:54:20 +02:00
parent 4b6a89d5fb
commit 1a6cff7349
2 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
packages/php/build.sh
View File

@ -1,6 +1,7 @@
TERMUX_PKG_HOMEPAGE=https://php.net
TERMUX_PKG_DESCRIPTION="Server-side, HTML-embedded scripting language"
TERMUX_PKG_VERSION=7.1.3
TERMUX_PKG_REVISION=1
TERMUX_PKG_SRCURL=http://www.php.net/distributions/php-${TERMUX_PKG_VERSION}.tar.xz
TERMUX_PKG_SHA256=e4887c2634778e37fd962fbdf5c4a7d32cd708482fe07b448804625570cb0bb0
# Build native php for phar to build (see pear-Makefile.frag.patch):

15
packages/php/ext-pgsql-config.m4.patch Normal file
View File

@ -0,0 +1,15 @@
diff -u -r ../php-7.1.3/ext/pgsql/config.m4 ./ext/pgsql/config.m4
--- ../php-7.1.3/ext/pgsql/config.m4 2017-03-14 14:17:47.000000000 +0100
+++ ./ext/pgsql/config.m4 2017-03-30 23:24:49.664225152 +0200
@@ -101,6 +101,11 @@
LDFLAGS=$old_LDFLAGS
PHP_ADD_LIBRARY_WITH_PATH(pq, $PGSQL_LIBDIR, PGSQL_SHARED_LIBADD)
+ dnl The pgsql extension uses pcre so needs to link explicitly
+ dnl against it to work on android (the php binary, which dlopen():s
+ dnl this module already links to pcre, but that is not enough on
+ dnl Android, see https://github.com/android-ndk/ndk/issues/201):
+ PHP_ADD_LIBRARY_WITH_PATH(pcre, $PGSQL_LIBDIR, PGSQL_SHARED_LIBADD)
PHP_SUBST(PGSQL_SHARED_LIBADD)
PHP_ADD_INCLUDE($PGSQL_INCLUDE)