diff options
| author | Alex Dupre <ale@FreeBSD.org> | 2014-04-09 07:58:43 +0000 |
|---|---|---|
| committer | Alex Dupre <ale@FreeBSD.org> | 2014-04-09 07:58:43 +0000 |
| commit | b5eb3fa38f1eefaf157b93d6f08ce95b4d22abec (patch) | |
| tree | 31694987e0cf378649f9b96963e33d79f3fe8024 /lang | |
| parent | 33201e74812b42959005b80454448181219355ab (diff) | |
| download | ports-b5eb3fa38f1eefaf157b93d6f08ce95b4d22abec.tar.gz ports-b5eb3fa38f1eefaf157b93d6f08ce95b4d22abec.zip | |
Notes
Diffstat (limited to 'lang')
| -rw-r--r-- | lang/php5/files/patch-configure.in | 22 | ||||
| -rw-r--r-- | lang/php55/files/patch-configure.in | 22 |
2 files changed, 30 insertions, 14 deletions
diff --git a/lang/php5/files/patch-configure.in b/lang/php5/files/patch-configure.in index b0e9c61f5a02..ac7c4605d639 100644 --- a/lang/php5/files/patch-configure.in +++ b/lang/php5/files/patch-configure.in @@ -1,6 +1,6 @@ ---- configure.in.orig 2013-12-10 19:32:43.000000000 +0000 -+++ configure.in 2013-12-13 21:55:53.986235686 +0000 -@@ -370,7 +370,6 @@ sinclude(TSRM/tsrm.m4) +--- configure.in.orig 2014-04-02 05:43:49.000000000 +0000 ++++ configure.in 2014-04-09 07:55:06.042404378 +0000 +@@ -370,7 +370,6 @@ dnl . dnl ------------------------------------------------------------------------- @@ -8,7 +8,15 @@ PHP_HELP_SEPARATOR([SAPI modules:]) PHP_SHLIB_SUFFIX_NAMES PHP_BUILD_PROGRAM -@@ -409,7 +408,6 @@ fi +@@ -401,15 +400,9 @@ + AC_MSG_RESULT([none]) + fi + +-dnl Exit early +-if test -z "$PHP_INSTALLED_SAPIS"; then +- AC_MSG_ERROR([Nothing to build.]) +-fi +- dnl force ZTS if test "$enable_maintainer_zts" = "yes"; then PTHREADS_ASSIGN_VARS @@ -16,7 +24,7 @@ fi dnl Starting system checks. -@@ -688,7 +686,7 @@ nanosleep \ +@@ -688,7 +681,7 @@ ) dnl Some systems (like OpenSolaris) do not have nanosleep in libc @@ -25,7 +33,7 @@ dnl Check for getaddrinfo, should be a better way, but... dnl Also check for working getaddrinfo -@@ -1225,7 +1223,7 @@ EXPANDED_SYSCONFDIR=`eval echo $sysconfd +@@ -1225,7 +1218,7 @@ EXPANDED_DATADIR=$datadir EXPANDED_PHP_CONFIG_FILE_PATH=`eval echo "$PHP_CONFIG_FILE_PATH"` EXPANDED_PHP_CONFIG_FILE_SCAN_DIR=`eval echo "$PHP_CONFIG_FILE_SCAN_DIR"` @@ -34,7 +42,7 @@ exec_prefix=$old_exec_prefix libdir=$old_libdir -@@ -1435,7 +1433,7 @@ PHP_SUBST(all_targets) +@@ -1435,7 +1428,7 @@ PHP_SUBST(install_targets) PHP_SUBST(install_binary_targets) diff --git a/lang/php55/files/patch-configure.in b/lang/php55/files/patch-configure.in index 36c0848bb606..f30e9d392594 100644 --- a/lang/php55/files/patch-configure.in +++ b/lang/php55/files/patch-configure.in @@ -1,6 +1,6 @@ ---- configure.in.orig 2013-12-10 23:31:06.000000000 +0000 -+++ configure.in 2013-12-13 21:50:25.183258334 +0000 -@@ -370,7 +370,6 @@ sinclude(TSRM/tsrm.m4) +--- configure.in.orig 2014-04-01 12:32:03.000000000 +0000 ++++ configure.in 2014-04-09 07:56:27.824397653 +0000 +@@ -370,7 +370,6 @@ dnl . dnl ------------------------------------------------------------------------- @@ -8,7 +8,15 @@ PHP_HELP_SEPARATOR([SAPI modules:]) PHP_SHLIB_SUFFIX_NAMES PHP_BUILD_PROGRAM -@@ -409,7 +408,6 @@ fi +@@ -401,15 +400,9 @@ + AC_MSG_RESULT([none]) + fi + +-dnl Exit early +-if test -z "$PHP_INSTALLED_SAPIS"; then +- AC_MSG_ERROR([Nothing to build.]) +-fi +- dnl force ZTS if test "$enable_maintainer_zts" = "yes"; then PTHREADS_ASSIGN_VARS @@ -16,7 +24,7 @@ fi dnl Starting system checks. -@@ -688,7 +686,7 @@ nanosleep \ +@@ -688,7 +681,7 @@ ) dnl Some systems (like OpenSolaris) do not have nanosleep in libc @@ -25,7 +33,7 @@ dnl Check for getaddrinfo, should be a better way, but... dnl Also check for working getaddrinfo -@@ -1225,7 +1223,7 @@ EXPANDED_SYSCONFDIR=`eval echo $sysconfd +@@ -1225,7 +1218,7 @@ EXPANDED_DATADIR=$datadir EXPANDED_PHP_CONFIG_FILE_PATH=`eval echo "$PHP_CONFIG_FILE_PATH"` EXPANDED_PHP_CONFIG_FILE_SCAN_DIR=`eval echo "$PHP_CONFIG_FILE_SCAN_DIR"` @@ -34,7 +42,7 @@ exec_prefix=$old_exec_prefix libdir=$old_libdir -@@ -1435,7 +1433,7 @@ PHP_SUBST(all_targets) +@@ -1435,7 +1428,7 @@ PHP_SUBST(install_targets) PHP_SUBST(install_binary_targets) |