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