Changes - j0ke.net Open Build Service

Changes of Revision 4

[-] [+]	Changed	php4.spec
@@ -116,7 +116,7 @@ # Added for PHP 4.4.9 Patch128: php-4.4.9-pcre-x86_64.patch - +Patch129: php-4.4.9-dba-x86_64.patch BuildRoot: %{_tmppath}/%{name}-root BuildRequires: bzip2-devel, curl-devel >= 7.9, db4-devel, expat-devel @@ -451,6 +451,7 @@ # php 4.4.9 patches %ifarch x86_64 %patch128 -p0 -b .pcre-64 +%patch129 -p0 -b .dba-64 %endif # Prevent %%doc confusion over LICENSE files x 1 @@ -116,7 +116,7 @@ 2 3 # Added for PHP 4.4.9 4 Patch128: php-4.4.9-pcre-x86_64.patch 5 - 6 +Patch129: php-4.4.9-dba-x86_64.patch 7 BuildRoot: %{_tmppath}/%{name}-root 8 9 BuildRequires: bzip2-devel, curl-devel >= 7.9, db4-devel, expat-devel 10 @@ -451,6 +451,7 @@ 11 # php 4.4.9 patches 12 %ifarch x86_64 13 %patch128 -p0 -b .pcre-64 14 +%patch129 -p0 -b .dba-64 15 %endif 16 17 # Prevent %%doc confusion over LICENSE files 18
[-] [+]	Added	php-4.4.9-dba-x86_64.patch ^
@@ -0,0 +1,56 @@ +--- ext/dba/config.m4.orig 2008-10-29 13:02:39.000000000 +0100 ++++ ext/dba/config.m4 2008-10-29 13:03:32.000000000 +0100 +@@ -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 +@@ -136,7 +136,7 @@ + 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,[ ++ 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