127 lines
3.8 KiB
Plaintext
127 lines
3.8 KiB
Plaintext
$NetBSD: patch-ab,v 1.8 2014/03/12 19:52:04 asau Exp $
|
|
|
|
--- configure.orig 2013-12-10 20:13:12.000000000 +0000
|
|
+++ configure
|
|
@@ -14121,7 +14121,7 @@ EOF
|
|
PHP_VAR_SUBST="$PHP_VAR_SUBST SAPI_CGI_PATH"
|
|
|
|
|
|
- INSTALL_IT="@echo \"Installing PHP CGI binary: \$(INSTALL_ROOT)\$(bindir)/\"; \$(INSTALL) -m 0755 \$(SAPI_CGI_PATH) \$(INSTALL_ROOT)\$(bindir)/\$(program_prefix)php-cgi\$(program_suffix)\$(EXEEXT)"
|
|
+ INSTALL_IT="@echo \"Installing PHP CGI binary: \$(INSTALL_ROOT)@CGIDIR@\"; \$(INSTALL) -m 0755 \$(SAPI_CGI_PATH) \$(INSTALL_ROOT)@CGIDIR@/php"
|
|
|
|
if test "$PHP_SAPI" != "default"; then
|
|
{ echo "configure: error:
|
|
@@ -23462,7 +23462,7 @@ fi
|
|
if test "$found_openssl" = "no"; then
|
|
|
|
if test "$PHP_OPENSSL_DIR" = "yes"; then
|
|
- PHP_OPENSSL_DIR="/usr/local/ssl /usr/local /usr /usr/local/openssl"
|
|
+ PHP_OPENSSL_DIR="/usr/local/ssl /usr/local /usr /usr/local/openssl /"
|
|
fi
|
|
|
|
for i in $PHP_OPENSSL_DIR; do
|
|
@@ -25453,7 +25453,7 @@ echo "configure:25433: checking bundled
|
|
PHP_SQLITE3_CFLAGS="-I@ext_srcdir@/libsqlite $other_flags $threadsafe_flags $debug_flags"
|
|
|
|
|
|
- for header_file in ext/sqlite3/libsqlite/sqlite3.h; do
|
|
+ for header_file; do
|
|
|
|
|
|
unique=`echo $header_file|$SED 's/[^a-zA-Z0-9]/_/g'`
|
|
@@ -36315,7 +36315,7 @@ fi
|
|
if test "$found_openssl" = "no"; then
|
|
|
|
if test "$PHP_OPENSSL_DIR" = "yes"; then
|
|
- PHP_OPENSSL_DIR="/usr/local/ssl /usr/local /usr /usr/local/openssl"
|
|
+ PHP_OPENSSL_DIR="/usr/local/ssl /usr/local /usr /usr/local/openssl /"
|
|
fi
|
|
|
|
for i in $PHP_OPENSSL_DIR; do
|
|
@@ -50656,7 +50656,7 @@ fi
|
|
if test "$found_openssl" = "no"; then
|
|
|
|
if test "$PHP_OPENSSL_DIR" = "yes"; then
|
|
- PHP_OPENSSL_DIR="/usr/local/ssl /usr/local /usr /usr/local/openssl"
|
|
+ PHP_OPENSSL_DIR="/usr/local/ssl /usr/local /usr /usr/local/openssl /"
|
|
fi
|
|
|
|
for i in $PHP_OPENSSL_DIR; do
|
|
@@ -84774,7 +84774,7 @@ fi
|
|
if test "$found_openssl" = "no"; then
|
|
|
|
if test "$PHP_OPENSSL_DIR" = "yes"; then
|
|
- PHP_OPENSSL_DIR="/usr/local/ssl /usr/local /usr /usr/local/openssl"
|
|
+ PHP_OPENSSL_DIR="/usr/local/ssl /usr/local /usr /usr/local/openssl /"
|
|
fi
|
|
|
|
for i in $PHP_OPENSSL_DIR; do
|
|
@@ -107937,12 +107937,7 @@ old_CC=$CC
|
|
if test "$PHP_THREAD_SAFETY" = "yes" && test -n "$ac_cv_pthreads_cflags"; then
|
|
CXXFLAGS="$CXXFLAGS $ac_cv_pthreads_cflags"
|
|
INLINE_CFLAGS="$INLINE_CFLAGS $ac_cv_pthreads_cflags"
|
|
- cat >meta_ccld<<EOF
|
|
-#! /bin/sh
|
|
-exec $CC $ac_cv_pthreads_cflags \$@
|
|
-EOF
|
|
- CC="$abs_builddir/meta_ccld"
|
|
- chmod +x meta_ccld
|
|
+ CPPFLAGS="$CPPFLAGS $ac_cv_pthreads_cflags"
|
|
fi
|
|
|
|
if test "$PHP_THREAD_SAFETY" = "yes" && test "$PHP_MYSQL" = "yes"; then
|
|
@@ -110873,7 +110868,7 @@ if test -z "$aix_libpath"; then aix_libp
|
|
hardcode_shlibpath_var=no
|
|
;;
|
|
|
|
- freebsd1*)
|
|
+ freebsd1|freebsd1.*)
|
|
ld_shlibs=no
|
|
;;
|
|
|
|
@@ -111512,7 +111507,7 @@ dgux*)
|
|
shlibpath_var=LD_LIBRARY_PATH
|
|
;;
|
|
|
|
-freebsd1*)
|
|
+freebsd1|freebsd1.*)
|
|
dynamic_linker=no
|
|
;;
|
|
|
|
@@ -111523,7 +111518,7 @@ freebsd* | dragonfly*)
|
|
objformat=`/usr/bin/objformat`
|
|
else
|
|
case $host_os in
|
|
- freebsd[123]*) objformat=aout ;;
|
|
+ freebsd[123]|freebsd[123].*) objformat=aout ;;
|
|
*) objformat=elf ;;
|
|
esac
|
|
fi
|
|
@@ -113653,7 +113648,7 @@ if test -z "$aix_libpath"; then aix_libp
|
|
;;
|
|
esac
|
|
;;
|
|
- freebsd[12]*)
|
|
+ freebsd[12]|freebsd[12].*)
|
|
# C++ shared libraries reported to be fairly broken before switch to ELF
|
|
ld_shlibs_CXX=no
|
|
;;
|
|
@@ -115181,7 +115176,7 @@ dgux*)
|
|
shlibpath_var=LD_LIBRARY_PATH
|
|
;;
|
|
|
|
-freebsd1*)
|
|
+freebsd1|freebsd1.*)
|
|
dynamic_linker=no
|
|
;;
|
|
|
|
@@ -115192,7 +115187,7 @@ freebsd* | dragonfly*)
|
|
objformat=`/usr/bin/objformat`
|
|
else
|
|
case $host_os in
|
|
- freebsd[123]*) objformat=aout ;;
|
|
+ freebsd[123]|freebsd[123].*) objformat=aout ;;
|
|
*) objformat=elf ;;
|
|
esac
|
|
fi
|