1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
|
$NetBSD: patch-configure,v 1.5.2.1 2014/06/01 13:20:22 spz Exp $
--- configure.orig 2014-04-30 08:40:22.000000000 +0000
+++ configure
@@ -23604,7 +23604,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
@@ -25754,7 +25754,7 @@ $as_echo "yes" >&6; }
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'`
@@ -36811,7 +36811,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
@@ -48213,7 +48213,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
@@ -65189,7 +65189,7 @@ rm -f core *.core core.conftest.* gmon.o
fi
-if test "$flock_type" == "unknown"; then
+if test "$flock_type" = "unknown"; then
as_fn_error $? "Don't know how to define struct flock on this system, set --enable-opcache=no" "$LINENO" 5
fi
@@ -104582,12 +104582,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
@@ -107701,7 +107696,7 @@ if test -z "$aix_libpath"; then aix_libp
hardcode_shlibpath_var=no
;;
- freebsd1*)
+ freebsd1|freebsd1.*)
ld_shlibs=no
;;
@@ -108350,7 +108345,7 @@ dgux*)
shlibpath_var=LD_LIBRARY_PATH
;;
-freebsd1*)
+freebsd1|freebsd1.*)
dynamic_linker=no
;;
@@ -108361,7 +108356,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
@@ -110441,7 +110436,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
;;
@@ -111987,7 +111982,7 @@ dgux*)
shlibpath_var=LD_LIBRARY_PATH
;;
-freebsd1*)
+freebsd1|freebsd1.*)
dynamic_linker=no
;;
@@ -111998,7 +111993,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
|
