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
|
diff -Nur php-5.0.5~/acinclude.m4 php-5.0.5/acinclude.m4
--- php-5.0.5~/acinclude.m4 2005-10-10 19:56:46.000000000 -0700
+++ php-5.0.5/acinclude.m4 2005-10-10 19:56:55.000000000 -0700
@@ -781,10 +781,10 @@
OVERALL_TARGET=[]ifelse($1,,php,$1)
php_c_pre='$(CC)'
php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
- php_c_post=' && echo > $[@]'
+ php_c_post=' && echo "[#] Generated by PHP badness - GNU libtool" > $[@] && echo "pic_object=none" >> $[@] && echo "non_pic_object=$[@]" | sed -e "s,=.*/,=,; s,\.lo,\.o,g" >> $[@]'
php_cxx_pre='$(CXX)'
php_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)'
- php_cxx_post=' && echo > $[@]'
+ php_cxx_post=' && echo "[#] Generated by PHP badness - GNU libtool" > $[@] && echo "pic_object=none" >> $[@] && echo "non_pic_object=$[@]" | sed -e "s,=.*/,=,; s,\.lo,\.o,g" >> $[@]'
php_lo=o
case $with_pic in
@@ -1531,6 +1531,7 @@
dnl even newer glibcs have a different seeker definition...
+ AC_CACHE_CHECK([if cookie io functions use off64_t], php_cv_lib_cookie_io_functions_use_off64_t,
AC_TRY_RUN([
#define _GNU_SOURCE
#include <stdio.h>
@@ -1560,8 +1561,8 @@
}
],
- [ cookie_io_functions_use_off64_t=yes ],
- [ ] )
+ [ php_cv_lib_cookie_io_functions_use_off64_t=yes ],
+ [ php_cv_lib_cookie_io_functions_use_off64_t=no ] ))
else
dnl older glibc versions (up to 2.1.2 ?)
diff -Nur php-5.0.5~/configure.in php-5.0.5/configure.in
--- php-5.0.5~/configure.in 2005-10-10 19:56:46.000000000 -0700
+++ php-5.0.5/configure.in 2005-10-10 19:56:55.000000000 -0700
@@ -247,7 +247,7 @@
sinclude(Zend/acinclude.m4)
sinclude(Zend/Zend.m4)
sinclude(TSRM/tsrm.m4)
-
+sinclude(TSRM/threads.m4)
divert(2)
diff -Nur php-5.0.5~/scripts/phpize.m4 php-5.0.5/scripts/phpize.m4
--- php-5.0.5~/scripts/phpize.m4 2005-10-10 19:56:46.000000000 -0700
+++ php-5.0.5/scripts/phpize.m4 2005-10-10 19:56:55.000000000 -0700
@@ -1,7 +1,5 @@
dnl This file becomes configure.in for self-contained extensions.
-AC_INIT(config.m4)
-
PHP_INIT_BUILD_SYSTEM
AC_DEFUN([PHP_WITH_PHP_CONFIG],[
@@ -55,8 +53,6 @@
PHP_PROG_RE2C
AC_PROG_AWK
-sinclude(config.m4)
-
enable_static=no
enable_shared=yes
diff -Nur php-5.0.5~/TSRM/threads.m4 php-5.0.5/TSRM/threads.m4
--- php-5.0.5~/TSRM/threads.m4 2005-10-10 19:56:40.000000000 -0700
+++ php-5.0.5/TSRM/threads.m4 2005-10-10 19:57:11.000000000 -0700
@@ -86,7 +86,7 @@
pthreads_working=no
], [
dnl For cross compiling running this test is of no use. NetWare supports pthreads
- pthreads_working=no
+ pthreads_working=yes
case $host_alias in
*netware*)
pthreads_working=yes
diff -Nur php-5.0.5~/TSRM/tsrm.m4 php-5.0.5/TSRM/tsrm.m4
--- php-5.0.5~/TSRM/tsrm.m4 2005-10-10 19:56:40.000000000 -0700
+++ php-5.0.5/TSRM/tsrm.m4 2005-10-10 19:56:55.000000000 -0700
@@ -68,7 +68,6 @@
])
sinclude(threads.m4)
-sinclude(TSRM/threads.m4)
AC_DEFUN([TSRM_CHECK_PTHREADS],[
|
