|
|
@ -5,11 +5,11 @@ diff -u -r ../php-7.1.3/ext/pgsql/config.m4 ./ext/pgsql/config.m4 |
|
|
LDFLAGS=$old_LDFLAGS |
|
|
LDFLAGS=$old_LDFLAGS |
|
|
|
|
|
|
|
|
PHP_ADD_LIBRARY_WITH_PATH(pq, $PGSQL_LIBDIR, PGSQL_SHARED_LIBADD) |
|
|
PHP_ADD_LIBRARY_WITH_PATH(pq, $PGSQL_LIBDIR, PGSQL_SHARED_LIBADD) |
|
|
+ dnl The pgsql extension uses pcre so needs to link explicitly
|
|
|
+ dnl The pgsql extension uses pcre2 so needs to link explicitly
|
|
|
+ dnl against it to work on android (the php binary, which dlopen():s
|
|
|
+ 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 this module already links to pcre2, but that is not enough on
|
|
|
+ dnl Android, see https://github.com/android-ndk/ndk/issues/201):
|
|
|
+ dnl Android, see https://github.com/android-ndk/ndk/issues/201):
|
|
|
+ PHP_ADD_LIBRARY_WITH_PATH(pcre, $PGSQL_LIBDIR, PGSQL_SHARED_LIBADD)
|
|
|
+ PHP_ADD_LIBRARY_WITH_PATH(pcre2-8, $PGSQL_LIBDIR, PGSQL_SHARED_LIBADD)
|
|
|
PHP_SUBST(PGSQL_SHARED_LIBADD) |
|
|
PHP_SUBST(PGSQL_SHARED_LIBADD) |
|
|
|
|
|
|
|
|
PHP_ADD_INCLUDE($PGSQL_INCLUDE) |
|
|
PHP_ADD_INCLUDE($PGSQL_INCLUDE) |
|
|
|
Fredrik Fornwall
6 years ago