From d12f6a04a01e44db808515ab50867b5ce6f28a32 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Adam=20Go=C5=82=C4=99biowski?= Date: Mon, 13 Dec 2004 00:47:04 +0000 Subject: [PATCH] - reverted last commit (it was for DEVEL) Changed files: php-lib64.patch -> 1.8 --- php-lib64.patch | 132 +++++++++++++++++++++++++++--------------------- 1 file changed, 75 insertions(+), 57 deletions(-) diff --git a/php-lib64.patch b/php-lib64.patch index 9dfe62d..17a8a5c 100644 --- a/php-lib64.patch +++ b/php-lib64.patch @@ -1,6 +1,6 @@ -diff -burN php-5.0.3RC2.orig/acinclude.m4 php-5.0.3RC2/acinclude.m4 ---- php-5.0.3RC2.orig/acinclude.m4 2004-12-13 01:37:56.473084112 +0100 -+++ php-5.0.3RC2/acinclude.m4 2004-12-13 01:38:35.794106408 +0100 +diff -urN php-5.0.0.org/acinclude.m4 php-5.0.0/acinclude.m4 +--- php-5.0.0.org/acinclude.m4 2004-08-04 15:01:43.643552344 +0200 ++++ php-5.0.0/acinclude.m4 2004-08-04 15:01:59.341165944 +0200 @@ -1625,6 +1625,9 @@ if test -r $i/lib/libssl.a -o -r $i/lib/libssl.$SHLIB_SUFFIX_NAME; then OPENSSL_LIBDIR=$i/lib @@ -11,9 +11,9 @@ diff -burN php-5.0.3RC2.orig/acinclude.m4 php-5.0.3RC2/acinclude.m4 test -n "$OPENSSL_INCDIR" && test -n "$OPENSSL_LIBDIR" && break done -diff -burN php-5.0.3RC2.orig/ext/cpdf/config.m4 php-5.0.3RC2/ext/cpdf/config.m4 ---- php-5.0.3RC2.orig/ext/cpdf/config.m4 2004-12-13 01:37:51.975767808 +0100 -+++ php-5.0.3RC2/ext/cpdf/config.m4 2004-12-13 01:38:35.817102912 +0100 +diff -urN php-5.0.0.org/ext/cpdf/config.m4 php-5.0.0/ext/cpdf/config.m4 +--- php-5.0.0.org/ext/cpdf/config.m4 2004-08-04 15:01:42.782683216 +0200 ++++ php-5.0.0/ext/cpdf/config.m4 2004-08-04 15:04:14.265654304 +0200 @@ -4,7 +4,7 @@ AC_ARG_WITH(jpeg-dir, [ --with-jpeg-dir[=DIR] CPDF: Set the path to libjpeg install prefix.],[ @@ -75,10 +75,10 @@ diff -burN php-5.0.3RC2.orig/ext/cpdf/config.m4 php-5.0.3RC2/ext/cpdf/config.m4 ]) break fi -diff -burN php-5.0.3RC2.orig/ext/dba/config.m4 php-5.0.3RC2/ext/dba/config.m4 ---- php-5.0.3RC2.orig/ext/dba/config.m4 2004-12-13 01:37:51.825790608 +0100 -+++ php-5.0.3RC2/ext/dba/config.m4 2004-12-13 01:40:42.094905768 +0100 -@@ -21,7 +21,7 @@ +diff -urN php-5.0.0.org/ext/dba/config.m4 php-5.0.0/ext/dba/config.m4 +--- php-5.0.0.org/ext/dba/config.m4 2004-08-04 15:01:42.730691120 +0200 ++++ php-5.0.0/ext/dba/config.m4 2004-08-04 15:01:59.343165640 +0200 +@@ -18,7 +18,7 @@ dnl Assign INCLUDE/LFLAGS from PREFIX AC_DEFUN(PHP_DBA_STD_ASSIGN,[ if test -n "$THIS_PREFIX" && test "$THIS_PREFIX" != "/usr"; then @@ -87,7 +87,7 @@ diff -burN php-5.0.3RC2.orig/ext/dba/config.m4 php-5.0.3RC2/ext/dba/config.m4 fi ]) -@@ -121,7 +121,7 @@ +@@ -118,7 +118,7 @@ AC_DEFINE_UNQUOTED(GDBM_INCLUDE_FILE, "$THIS_INCLUDE", [ ]) AC_DEFINE(DBA_GDBM, 1, [ ]) THIS_LIBS=gdbm @@ -96,7 +96,7 @@ diff -burN php-5.0.3RC2.orig/ext/dba/config.m4 php-5.0.3RC2/ext/dba/config.m4 fi PHP_DBA_STD_ASSIGN -@@ -153,7 +153,7 @@ +@@ -150,7 +150,7 @@ AC_DEFINE_UNQUOTED(NDBM_INCLUDE_FILE, "$THIS_INCLUDE", [ ]) AC_DEFINE(DBA_NDBM, 1, [ ]) THIS_LIBS=$LIB @@ -105,18 +105,18 @@ diff -burN php-5.0.3RC2.orig/ext/dba/config.m4 php-5.0.3RC2/ext/dba/config.m4 if test -n "$THIS_LIBS"; then break fi -@@ -171,8 +171,8 @@ +@@ -168,8 +168,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,[ +- 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,[ ++ PHP_TEMP_LDFLAGS(-L$THIS_PREFIX/lib64 -l$LIB,[ AC_TRY_LINK([ #include "$THIS_INCLUDE" ],[ -@@ -367,7 +367,7 @@ +@@ -364,7 +364,7 @@ fi AC_DEFINE(DBA_DBM, 1, [ ]) THIS_LIBS=$LIB @@ -125,7 +125,7 @@ diff -burN php-5.0.3RC2.orig/ext/dba/config.m4 php-5.0.3RC2/ext/dba/config.m4 if test -n "$THIS_LIBS"; then break fi -@@ -409,7 +409,7 @@ +@@ -406,7 +406,7 @@ AC_DEFINE_UNQUOTED(CDB_INCLUDE_FILE, "$THIS_INCLUDE", [ ]) AC_DEFINE(DBA_CDB, 1, [ ]) THIS_LIBS=$LIB @@ -134,9 +134,9 @@ diff -burN php-5.0.3RC2.orig/ext/dba/config.m4 php-5.0.3RC2/ext/dba/config.m4 if test -n "$THIS_LIBS"; then break fi -diff -burN php-5.0.3RC2.orig/ext/gd/config.m4 php-5.0.3RC2/ext/gd/config.m4 ---- php-5.0.3RC2.orig/ext/gd/config.m4 2004-12-13 01:37:51.804793800 +0100 -+++ php-5.0.3RC2/ext/gd/config.m4 2004-12-13 01:38:35.838099720 +0100 +diff -urN php-5.0.0.org/ext/gd/config.m4 php-5.0.0/ext/gd/config.m4 +--- php-5.0.0.org/ext/gd/config.m4 2004-08-04 15:01:42.698695984 +0200 ++++ php-5.0.0/ext/gd/config.m4 2004-08-04 15:01:59.344165488 +0200 @@ -51,7 +51,7 @@ if test "$PHP_JPEG_DIR" != "no"; then @@ -242,7 +242,7 @@ diff -burN php-5.0.3RC2.orig/ext/gd/config.m4 php-5.0.3RC2/ext/gd/config.m4 ]) fi ]) -@@ -363,7 +363,7 @@ +@@ -360,7 +360,7 @@ done dnl Library path @@ -251,9 +251,9 @@ diff -burN php-5.0.3RC2.orig/ext/gd/config.m4 php-5.0.3RC2/ext/gd/config.m4 test -f "$PHP_GD/$i/libgd.$SHLIB_SUFFIX_NAME" -o -f "$PHP_GD/$i/libgd.a" && GD_LIB="$PHP_GD/$i" done -diff -burN php-5.0.3RC2.orig/ext/imap/config.m4 php-5.0.3RC2/ext/imap/config.m4 ---- php-5.0.3RC2.orig/ext/imap/config.m4 2004-12-13 01:37:52.002763704 +0100 -+++ php-5.0.3RC2/ext/imap/config.m4 2004-12-13 01:38:35.839099568 +0100 +diff -urN php-5.0.0.org/ext/imap/config.m4 php-5.0.0/ext/imap/config.m4 +--- php-5.0.0.org/ext/imap/config.m4 2004-08-04 15:01:42.787682456 +0200 ++++ php-5.0.0/ext/imap/config.m4 2004-08-04 15:01:59.345165336 +0200 @@ -59,7 +59,7 @@ fi @@ -303,9 +303,9 @@ diff -burN php-5.0.3RC2.orig/ext/imap/config.m4 php-5.0.3RC2/ext/imap/config.m4 IMAP_LIB_CHK(c-client) done -diff -burN php-5.0.3RC2.orig/ext/ldap/config.m4 php-5.0.3RC2/ext/ldap/config.m4 ---- php-5.0.3RC2.orig/ext/ldap/config.m4 2004-12-13 01:37:52.016761576 +0100 -+++ php-5.0.3RC2/ext/ldap/config.m4 2004-12-13 01:38:35.840099416 +0100 +diff -urN php-5.0.0.org/ext/ldap/config.m4 php-5.0.0/ext/ldap/config.m4 +--- php-5.0.0.org/ext/ldap/config.m4 2004-08-04 15:01:42.791681848 +0200 ++++ php-5.0.0/ext/ldap/config.m4 2004-08-04 15:01:59.345165336 +0200 @@ -6,15 +6,15 @@ if test -f $1/include/ldap.h; then LDAP_DIR=$1 @@ -325,9 +325,9 @@ diff -burN php-5.0.3RC2.orig/ext/ldap/config.m4 php-5.0.3RC2/ext/ldap/config.m4 fi ]) -diff -burN php-5.0.3RC2.orig/ext/ming/config.m4 php-5.0.3RC2/ext/ming/config.m4 ---- php-5.0.3RC2.orig/ext/ming/config.m4 2004-12-13 01:37:52.027759904 +0100 -+++ php-5.0.3RC2/ext/ming/config.m4 2004-12-13 01:38:35.841099264 +0100 +diff -urN php-5.0.0.org/ext/ming/config.m4 php-5.0.0/ext/ming/config.m4 +--- php-5.0.0.org/ext/ming/config.m4 2004-08-04 15:01:42.793681544 +0200 ++++ php-5.0.0/ext/ming/config.m4 2004-08-04 15:01:59.346165184 +0200 @@ -9,7 +9,7 @@ AC_CHECK_LIB(m, sin) @@ -351,9 +351,28 @@ diff -burN php-5.0.3RC2.orig/ext/ming/config.m4 php-5.0.3RC2/ext/ming/config.m4 AC_MSG_CHECKING([for destroySWFBlock]) AC_TRY_RUN([ -diff -burN php-5.0.3RC2.orig/ext/mysql/config.m4 php-5.0.3RC2/ext/mysql/config.m4 ---- php-5.0.3RC2.orig/ext/mysql/config.m4 2004-12-13 01:37:52.295719168 +0100 -+++ php-5.0.3RC2/ext/mysql/config.m4 2004-12-13 01:38:35.844098808 +0100 +diff -urN php-5.0.0.org/ext/mssql/config.m4 php-5.0.0/ext/mssql/config.m4 +--- php-5.0.0.org/ext/mssql/config.m4 2004-08-04 15:01:42.850672880 +0200 ++++ php-5.0.0/ext/mssql/config.m4 2004-08-04 15:01:59.346165184 +0200 +@@ -32,12 +32,12 @@ + fi + fi + +- if test ! -r "$FREETDS_INSTALLATION_DIR/lib/libtds.so"; then +- AC_MSG_ERROR(Could not find $FREETDS_INSTALLATION_DIR/lib/libtds.so) ++ if test ! -r "$FREETDS_INSTALLATION_DIR/lib64/libtds.so"; then ++ AC_MSG_ERROR(Could not find $FREETDS_INSTALLATION_DIR/lib64/libtds.so) + fi + + MSSQL_INCDIR=$FREETDS_INSTALLATION_DIR/include +- MSSQL_LIBDIR=$FREETDS_INSTALLATION_DIR/lib ++ MSSQL_LIBDIR=$FREETDS_INSTALLATION_DIR/lib64 + + PHP_ADD_INCLUDE($MSSQL_INCDIR) + PHP_ADD_LIBRARY_WITH_PATH(sybdb, $MSSQL_LIBDIR, MSSQL_SHARED_LIBADD) +diff -urN php-5.0.0.org/ext/mysql/config.m4 php-5.0.0/ext/mysql/config.m4 +--- php-5.0.0.org/ext/mysql/config.m4 2004-08-04 15:01:42.851672728 +0200 ++++ php-5.0.0/ext/mysql/config.m4 2004-08-04 15:01:59.347165032 +0200 @@ -17,7 +17,7 @@ /var/run/mysqld/mysqld.sock \ /var/tmp/mysql.sock \ @@ -384,9 +403,9 @@ diff -burN php-5.0.3RC2.orig/ext/mysql/config.m4 php-5.0.3RC2/ext/mysql/config.m else PHP_ADD_LIBRARY(z,, MYSQL_SHARED_LIBADD) PHP_CHECK_LIBRARY(mysqlclient, mysql_errno, [], [ -diff -burN php-5.0.3RC2.orig/ext/pgsql/config.m4 php-5.0.3RC2/ext/pgsql/config.m4 ---- php-5.0.3RC2.orig/ext/pgsql/config.m4 2004-12-13 01:37:52.315716128 +0100 -+++ php-5.0.3RC2/ext/pgsql/config.m4 2004-12-13 01:38:35.845098656 +0100 +diff -urN php-5.0.0.org/ext/pgsql/config.m4 php-5.0.0/ext/pgsql/config.m4 +--- php-5.0.0.org/ext/pgsql/config.m4 2004-08-04 15:01:42.857671816 +0200 ++++ php-5.0.0/ext/pgsql/config.m4 2004-08-04 15:09:33.020196248 +0200 @@ -44,7 +44,7 @@ fi done @@ -396,9 +415,9 @@ diff -burN php-5.0.3RC2.orig/ext/pgsql/config.m4 php-5.0.3RC2/ext/pgsql/config.m if test -f "$i/$j/libpq.so" || test -f "$i/$j/libpq.a"; then PGSQL_LIBDIR=$i/$j fi -diff -burN php-5.0.3RC2.orig/ext/xml/config.m4 php-5.0.3RC2/ext/xml/config.m4 ---- php-5.0.3RC2.orig/ext/xml/config.m4 2004-12-13 01:37:51.961769936 +0100 -+++ php-5.0.3RC2/ext/xml/config.m4 2004-12-13 01:38:35.856096984 +0100 +diff -urN php-5.0.0.org/ext/xml/config.m4 php-5.0.0/ext/xml/config.m4 +--- php-5.0.0.org/ext/xml/config.m4 2004-08-04 15:01:42.778683824 +0200 ++++ php-5.0.0/ext/xml/config.m4 2004-08-04 15:08:03.649782616 +0200 @@ -30,7 +30,7 @@ dnl if test "$PHP_LIBEXPAT_DIR" != "no"; then @@ -417,9 +436,9 @@ diff -burN php-5.0.3RC2.orig/ext/xml/config.m4 php-5.0.3RC2/ext/xml/config.m4 AC_DEFINE(HAVE_LIBEXPAT, 1, [ ]) fi -diff -burN php-5.0.3RC2.orig/ext/xmlrpc/config.m4 php-5.0.3RC2/ext/xmlrpc/config.m4 ---- php-5.0.3RC2.orig/ext/xmlrpc/config.m4 2004-12-13 01:37:53.630516248 +0100 -+++ php-5.0.3RC2/ext/xmlrpc/config.m4 2004-12-13 01:38:35.863095920 +0100 +diff -urN php-5.0.0.org/ext/xmlrpc/config.m4 php-5.0.0/ext/xmlrpc/config.m4 +--- php-5.0.0.org/ext/xmlrpc/config.m4 2004-08-04 15:01:43.127630776 +0200 ++++ php-5.0.0/ext/xmlrpc/config.m4 2004-08-04 15:01:59.350164576 +0200 @@ -23,9 +23,9 @@ testval=no @@ -440,21 +459,9 @@ diff -burN php-5.0.3RC2.orig/ext/xmlrpc/config.m4 php-5.0.3RC2/ext/xmlrpc/config + PHP_ADD_LIBRARY_WITH_PATH(xmlrpc, $XMLRPC_DIR/lib64, XMLRPC_SHARED_LIBADD) fi -diff -burN php-5.0.3RC2.orig/php.ini php-5.0.3RC2/php.ini ---- php-5.0.3RC2.orig/php.ini 2004-12-13 01:37:56.510078488 +0100 -+++ php-5.0.3RC2/php.ini 2004-12-13 01:38:35.866095464 +0100 -@@ -514,7 +514,7 @@ - user_dir = - - ; Directory in which the loadable extensions (modules) reside. --extension_dir = "/usr/lib/php" -+extension_dir = "/usr/lib64/php" - - ; Whether or not to enable the dl() function. The dl() function does NOT work - ; properly in multithreaded servers, such as IIS or Zeus, and is automatically -diff -burN php-5.0.3RC2.orig/scripts/Makefile.frag php-5.0.3RC2/scripts/Makefile.frag ---- php-5.0.3RC2.orig/scripts/Makefile.frag 2004-12-13 01:37:56.267115424 +0100 -+++ php-5.0.3RC2/scripts/Makefile.frag 2004-12-13 01:38:35.864095768 +0100 +diff -urN php-5.0.0.org/scripts/Makefile.frag php-5.0.0/scripts/Makefile.frag +--- php-5.0.0.org/scripts/Makefile.frag 2004-08-04 15:01:43.632554016 +0200 ++++ php-5.0.0/scripts/Makefile.frag 2004-08-04 15:37:06.942761800 +0200 @@ -4,7 +4,7 @@ # @@ -464,3 +471,14 @@ diff -burN php-5.0.3RC2.orig/scripts/Makefile.frag php-5.0.3RC2/scripts/Makefile BUILD_FILES = \ scripts/phpize.m4 \ +--- php-5.0.2/php.ini.orig 2004-10-25 11:51:41.000000000 +0200 ++++ php-5.0.2/php.ini 2004-10-25 11:56:54.000000000 +0200 +@@ -514,7 +514,7 @@ + user_dir = + + ; Directory in which the loadable extensions (modules) reside. +-extension_dir = "/usr/lib/php" ++extension_dir = "/usr/lib64/php" + + ; Whether or not to enable the dl() function. The dl() function does NOT work + ; properly in multithreaded servers, such as IIS or Zeus, and is automatically -- 2.44.0