Changes of Revision 13
| [-] | Changed | php4.spec |
|
x 1 2 Patch129: php-4.4.9-dba-x86_64.patch23 Patch130: php-4.4.9-gd-x86_64.patch4 Patch131: php-4.4.9-imap-x86_64.patch5 -6 +Patch132: php-4.4.9-krb-x86_64.patch7 BuildRoot: %{_tmppath}/%{name}-root8 9 BuildRequires: bzip2-devel, curl-devel >= 7.9, db4-devel, expat-devel10 11 %patch129 -p0 -b .dba-6412 %patch130 -p0 -b .gd-6413 %patch131 -p0 -b .imap-6414 +%patch132 -p0 -b .krb-6415 %endif16 17 # Prevent %%doc confusion over LICENSE files18 |
||
| [+] | Added | php-4.4.9-krb-x86_64.patch ^ |
| @@ -0,0 +1,52 @@ +--- php-4.3.11/acinclude.m4.lib64 ++++ php-4.3.11/acinclude.m4 +@@ -194,7 +194,7 @@ + unset ac_new_flags + for i in [$]$1; do + case [$]i in +- -L/usr/lib|-L/usr/lib/[)] ;; ++ -L/usr/lib|-L/usr/lib/|-L/usr/lib64|-L/usr/lib64/[)] ;; + *[)] ac_new_flags="[$]ac_new_flags [$]i" ;; + esac + done +@@ -856,7 +856,9 @@ + dnl add a library to linkpath/runpath + dnl + AC_DEFUN([PHP_ADD_LIBPATH],[ +- if test "$1" != "/usr/lib"; then ++ case x$1 in ++ x/usr/lib|x/usr/lib64) ;; ++ *) + PHP_EXPAND_PATH($1, ai_p) + ifelse([$2],,[ + _PHP_ADD_LIBPATH_GLOBAL([$ai_p]) +@@ -866,8 +868,8 @@ + else + _PHP_ADD_LIBPATH_GLOBAL([$ai_p]) + fi +- ]) +- fi ++ ]) ;; ++ esac + ]) + + dnl +@@ -1651,7 +1653,7 @@ + fi + + for i in $PHP_KERBEROS; do +- if test -f $i/lib/libkrb5.a || test -f $i/lib/libkrb5.$SHLIB_SUFFIX_NAME; then ++ if test -f $i/lib/libkrb5.a || test -f $i/lib/libkrb5.$SHLIB_SUFFIX_NAME || test -f $i/lib64/libkrb5.a || test -f $i/lib64/libkrb5.$SHLIB_SUFFIX_NAME; then + PHP_KERBEROS_DIR=$i + break + fi +@@ -1727,6 +1729,9 @@ + if test -r $i/lib/libssl.a -o -r $i/lib/libssl.$SHLIB_SUFFIX_NAME; then + OPENSSL_LIBDIR=$i/lib + fi ++ if test -r $i/lib64/libssl.a -o -r $i/lib64/libssl.$SHLIB_SUFFIX_NAME; then ++ OPENSSL_LIBDIR=$i/lib64 ++ fi + test -n "$OPENSSL_INCDIR" && test -n "$OPENSSL_LIBDIR" && break + done + | ||