aboutsummaryrefslogtreecommitdiffstats
path: root/converters
diff options
context:
space:
mode:
authorjoneum <joneum@FreeBSD.org>2018-11-16 00:40:59 +0800
committerjoneum <joneum@FreeBSD.org>2018-11-16 00:40:59 +0800
commit39d3d1384b38e0f30deee5975e0b19046cb83222 (patch)
treef35139e5b4e2f4e81d49adbe64396d7bb4081a6b /converters
parent70ff1cae57dbb8cf0b669c730ebc12b1b87bd345 (diff)
downloadfreebsd-ports-gnome-39d3d1384b38e0f30deee5975e0b19046cb83222.tar.gz
freebsd-ports-gnome-39d3d1384b38e0f30deee5975e0b19046cb83222.tar.zst
freebsd-ports-gnome-39d3d1384b38e0f30deee5975e0b19046cb83222.zip
Update to 7.1.24
Changelog: http://www.php.net/ChangeLog-7.php#7.1.24 Approved by: tz (implicit) MFH: 2018Q4 Sponsored by: Netzkommune GmbH
Diffstat (limited to 'converters')
-rw-r--r--converters/php71-mbstring/files/patch-config.m420
1 files changed, 10 insertions, 10 deletions
diff --git a/converters/php71-mbstring/files/patch-config.m4 b/converters/php71-mbstring/files/patch-config.m4
index 026798f26a5a..3e299951c999 100644
--- a/converters/php71-mbstring/files/patch-config.m4
+++ b/converters/php71-mbstring/files/patch-config.m4
@@ -1,9 +1,10 @@
---- config.m4.orig 2009-11-25 02:30:06.000000000 +0100
-+++ config.m4 2010-04-12 09:59:54.000000000 +0200
-@@ -43,6 +43,30 @@
+--- config.m4.orig 2018-11-10 15:21:47.103604000 +0100
++++ config.m4 2018-11-10 15:24:23.615118000 +0100
+@@ -42,6 +42,30 @@ AC_DEFUN([PHP_MBSTRING_EXTENSION], [
+ PHP_ADD_INCLUDE([$ext_srcdir/$dir])
PHP_ADD_INCLUDE([$ext_builddir/$dir])
done
-
++
+ dnl This is PECL build, check if bundled PCRE library is used
+ old_CPPFLAGS=$CPPFLAGS
+ CPPFLAGS=$INCLUDES
@@ -27,11 +28,10 @@
+ PHP_PCRE_REGEX=no
+ ])
+ ])
-+
+
if test "$ext_shared" = "no"; then
PHP_ADD_SOURCES(PHP_EXT_DIR(mbstring), $PHP_MBSTRING_BASE_SOURCES)
- out="php_config.h"
-@@ -80,7 +104,6 @@
+@@ -85,7 +109,6 @@ AC_DEFUN([PHP_MBSTRING_SETUP_MBREGEX], [
int foo(int x, ...) {
va_list va;
va_start(va, x);
@@ -39,13 +39,13 @@
va_arg(va, char *);
va_arg(va, double);
return 0;
-@@ -347,6 +370,9 @@
+@@ -367,6 +390,9 @@ PHP_ARG_WITH(onig, [for external oniguru
[ --with-onig[=DIR] MBSTRING: Use external oniguruma. DIR is the oniguruma install prefix.
- If DIR is not set, the bundled oniguruma will be used], no, no)
+ If DIR is not set, the bundled oniguruma will be used], no, no)
+PHP_ARG_WITH(pcre-dir, pcre install prefix,
+[ --with-pcre-dir MBSTRING: pcre install prefix], no, no)
+
- if test "$PHP_MBSTRING" != "no"; then
+ if test "$PHP_MBSTRING" != "no"; then
AC_DEFINE([HAVE_MBSTRING],1,[whether to have multibyte string support])