Changes of Revision 9
| [-] | Changed | php4.spec |
|
x 1 2 3 # Added for PHP 4.4.94 Patch128: php-4.4.9-pcre-x86_64.patch5 -Patch129: php-4.4.9-dba-x86_64.patch6 +Patch129: php-4.4.9-dba-x86_64.patch27 BuildRoot: %{_tmppath}/%{name}-root8 9 BuildRequires: bzip2-devel, curl-devel >= 7.9, db4-devel, expat-devel10 11 --enable-mbstr-enc-trans \12 --enable-mbregex \13 --with-mime-magic=%{_libdir}/rpm/magic.mime \14 - $* || tail -300 config.log && rpm --queryformat %{arch} -q db4-devel15 + $* || tail -300 config.log16 17 make %{?_smp_mflags}18 }19 |
||
| [+] | Added | php-4.4.9-dba-x86_64.patch2 ^ |
| @@ -0,0 +1,58 @@ +--- ext/dba/config.m4.orig 2009-08-08 15:38:46.000000000 +0200 ++++ ext/dba/config.m4 2009-08-08 15:40:04.000000000 +0200 +@@ -21,7 +21,7 @@ + dnl Assign INCLUDE/LFLAGS from PREFIX + AC_DEFUN([PHP_DBA_STD_ASSIGN],[ + if test -n "$THIS_PREFIX" && test "$THIS_PREFIX" != "/usr"; then +- THIS_LFLAGS=$THIS_PREFIX/lib ++ THIS_LFLAGS=$THIS_PREFIX/lib64 + fi + ]) + +@@ -85,7 +85,7 @@ + AC_DEFINE_UNQUOTED(GDBM_INCLUDE_FILE, "$THIS_INCLUDE", [ ]) + AC_DEFINE(DBA_GDBM, 1, [ ]) + THIS_LIBS=gdbm +- ], [], [-L$THIS_PREFIX/lib]) ++ ], [], [-L$THIS_PREFIX/lib64]) + fi + + PHP_DBA_STD_ASSIGN +@@ -117,7 +117,7 @@ + AC_DEFINE_UNQUOTED(NDBM_INCLUDE_FILE, "$THIS_INCLUDE", [ ]) + AC_DEFINE(DBA_NDBM, 1, [ ]) + THIS_LIBS=$LIB +- ], [], [-L$THIS_PREFIX/lib]) ++ ], [], [-L$THIS_PREFIX/lib64]) + if test -n "$THIS_LIBS"; then + break + fi +@@ -135,8 +135,8 @@ + dnl parameters(version, library list, function) + AC_DEFUN([PHP_DBA_DB_CHECK],[ + for LIB in $2; do +- if test -f $THIS_PREFIX/lib/lib$LIB.a -o -f $THIS_PREFIX/lib/lib$LIB.$SHLIB_SUFFIX_NAME; then +- PHP_TEMP_LDFLAGS(-L$THIS_PREFIX/lib, -l$LIB,[ ++ if test -f $THIS_PREFIX/lib64/lib$LIB.a -o -f $THIS_PREFIX/lib64/lib$LIB.$SHLIB_SUFFIX_NAME; then ++ PHP_TEMP_LDFLAGS(-L$THIS_PREFIX/lib64, -l$LIB,[ + AC_TRY_LINK([ + #include "$THIS_INCLUDE" + ],[ +@@ -328,7 +328,7 @@ + fi + AC_DEFINE(DBA_DBM, 1, [ ]) + THIS_LIBS=$LIB +- ], [], [-L$THIS_PREFIX/lib]) ++ ], [], [-L$THIS_PREFIX/lib64]) + if test -n "$THIS_LIBS"; then + break + fi +@@ -370,7 +370,7 @@ + AC_DEFINE_UNQUOTED(CDB_INCLUDE_FILE, "$THIS_INCLUDE", [ ]) + AC_DEFINE(DBA_CDB, 1, [ ]) + THIS_LIBS=$LIB +- ], [], [-L$THIS_PREFIX/lib]) ++ ], [], [-L$THIS_PREFIX/lib64]) + if test -n "$THIS_LIBS"; then + break + fi | ||