Magellan Linux

  • Back to homepage
    • /[pkg-src]/trunk/php5/patches/php5-5.2.3-multilib.patch

    Contents of /trunk/php5/patches/php5-5.2.3-multilib.patch

    Parent Directory Parent Directory | Revision Log Revision Log

    Revision 249 - (show annotations) (download)
    Sun Jul 8 13:32:20 2007 UTC (16 years, 10 months ago) by niro
    File size: 5758 byte(s) 
    -files for php-5.2.3-r1
    1 diff -u -r php-5.2.3-orig/acinclude.m4 php-5.2.3/acinclude.m4
    2 --- php-5.2.3-orig/acinclude.m4 2007-06-09 10:46:29.000000000 +0200
    3 +++ php-5.2.3/acinclude.m4 2007-06-09 10:51:28.000000000 +0200
    4 @@ -441,7 +441,7 @@
    5 dnl Adds a path to linkpath/runpath (LDFLAGS)
    6 dnl
    7 AC_DEFUN([PHP_ADD_LIBPATH],[
    8 - if test "$1" != "/usr/$PHP_LIBDIR" && test "$1" != "/usr/lib"; then
    9 + if test "$1" != "/usr/$PHP_LIBDIR" && test "$1" != "/usr/lib" && test "$1" != "/usr/lib64"; then
    10 PHP_EXPAND_PATH($1, ai_p)
    11 ifelse([$2],,[
    12 _PHP_ADD_LIBPATH_GLOBAL([$ai_p])
    13 @@ -1961,7 +1961,7 @@
    14 dnl Search for the sendmail binary
    15 dnl
    16 AC_DEFUN([PHP_PROG_SENDMAIL], [
    17 - PHP_ALT_PATH=/usr/bin:/usr/sbin:/usr/etc:/etc:/usr/ucblib:/usr/lib
    18 + PHP_ALT_PATH=/usr/bin:/usr/sbin:/usr/etc:/etc:/usr/ucblib:/usr/lib:/usr/lib64
    19 AC_PATH_PROG(PROG_SENDMAIL, sendmail,[], $PATH:$PHP_ALT_PATH)
    20 if test -n "$PROG_SENDMAIL"; then
    21 AC_DEFINE(HAVE_SENDMAIL,1,[whether you have sendmail])
    22 diff -u -r php-5.2.3-orig/ext/interbase/config.m4 php-5.2.3/ext/interbase/config.m4
    23 --- php-5.2.3-orig/ext/interbase/config.m4 2007-06-09 10:46:29.000000000 +0200
    24 +++ php-5.2.3/ext/interbase/config.m4 2007-06-09 10:51:28.000000000 +0200
    25 @@ -12,7 +12,7 @@
    26 IBASE_LIBDIR=/usr/interbase/lib
    27 else
    28 IBASE_INCDIR=$PHP_INTERBASE/include
    29 - IBASE_LIBDIR=$PHP_INTERBASE/lib
    30 + IBASE_LIBDIR=$PHP_INTERBASE/$PHP_LIBDIR
    31 fi
    32
    33 PHP_CHECK_LIBRARY(fbclient, isc_detach_database,
    34 diff -u -r php-5.2.3-orig/ext/mbstring/config.m4 php-5.2.3/ext/mbstring/config.m4
    35 --- php-5.2.3-orig/ext/mbstring/config.m4 2007-06-09 10:46:29.000000000 +0200
    36 +++ php-5.2.3/ext/mbstring/config.m4 2007-06-09 10:51:28.000000000 +0200
    37 @@ -270,7 +270,7 @@
    38 ],[
    39 AC_MSG_ERROR([Problem with libmbfl. Please check config.log for more information.])
    40 ], [
    41 - -LPHP_LIBMBFL/$PHP_LIBDIR
    42 + -L$PHP_LIBMBFL/$PHP_LIBDIR
    43 ])
    44 fi
    45 ])
    46 diff -u -r php-5.2.3-orig/ext/odbc/config.m4 php-5.2.3/ext/odbc/config.m4
    47 --- php-5.2.3-orig/ext/odbc/config.m4 2007-06-09 10:46:29.000000000 +0200
    48 +++ php-5.2.3/ext/odbc/config.m4 2007-06-09 10:51:28.000000000 +0200
    49 @@ -141,7 +141,7 @@
    50 fi
    51 if test "$withval" != "no"; then
    52 PHP_ADD_INCLUDE($withval/incl)
    53 - PHP_ADD_LIBPATH($withval/lib)
    54 + PHP_ADD_LIBPATH($withval/$PHP_LIBDIR)
    55 PHP_ADD_LIBRARY(sqlod)
    56 ODBC_TYPE=sapdb
    57 AC_DEFINE(HAVE_SAPDB,1,[ ])
    58 @@ -439,7 +439,7 @@
    59 withval=/usr/local
    60 fi
    61 if test "$withval" != "no"; then
    62 - PHP_ADD_LIBRARY_WITH_PATH(iodbc, $withval/lib)
    63 + PHP_ADD_LIBRARY_WITH_PATH(iodbc, $withval/$PHP_LIBDIR)
    64 PHP_ADD_INCLUDE($withval/include, 1)
    65 ODBC_TYPE=iodbc
    66 ODBC_INCLUDE=-I$withval/include
    67 diff -u -r php-5.2.3-orig/ext/pdo_firebird/config.m4 php-5.2.3/ext/pdo_firebird/config.m4
    68 --- php-5.2.3-orig/ext/pdo_firebird/config.m4 2007-06-09 10:46:29.000000000 +0200
    69 +++ php-5.2.3/ext/pdo_firebird/config.m4 2007-06-09 10:51:28.000000000 +0200
    70 @@ -14,7 +14,7 @@
    71 FIREBIRD_LIBDIR=/opt/firebird/lib
    72 else
    73 FIREBIRD_INCDIR=$PHP_PDO_FIREBIRD/include
    74 - FIREBIRD_LIBDIR=$PHP_PDO_FIREBIRD/lib
    75 + FIREBIRD_LIBDIR=$PHP_PDO_FIREBIRD/$PHP_LIBDIR
    76 fi
    77
    78 PHP_CHECK_LIBRARY(fbclient, isc_detach_database,
    79 diff -u -r php-5.2.3-orig/ext/pdo_mysql/config.m4 php-5.2.3/ext/pdo_mysql/config.m4
    80 --- php-5.2.3-orig/ext/pdo_mysql/config.m4 2007-06-09 10:46:29.000000000 +0200
    81 +++ php-5.2.3/ext/pdo_mysql/config.m4 2007-06-09 10:51:28.000000000 +0200
    82 @@ -78,10 +78,10 @@
    83 else
    84 PDO_MYSQL_INC_DIR=$PDO_MYSQL_DIR/include
    85 fi
    86 - if test -r $PDO_MYSQL_DIR/lib/mysql; then
    87 - PDO_MYSQL_LIB_DIR=$PDO_MYSQL_DIR/lib/mysql
    88 + if test -r $PDO_MYSQL_DIR/$PHP_LIBDIR/mysql; then
    89 + PDO_MYSQL_LIB_DIR=$PDO_MYSQL_DIR/$PHP_LIBDIR/mysql
    90 else
    91 - PDO_MYSQL_LIB_DIR=$PDO_MYSQL_DIR/lib
    92 + PDO_MYSQL_LIB_DIR=$PDO_MYSQL_DIR/$PHP_LIBDIR
    93 fi
    94
    95 if test -r "$PDO_MYSQL_LIB_DIR"; then
    96 diff -u -r php-5.2.3-orig/ext/pdo_odbc/config.m4 php-5.2.3/ext/pdo_odbc/config.m4
    97 --- php-5.2.3-orig/ext/pdo_odbc/config.m4 2007-06-09 10:46:29.000000000 +0200
    98 +++ php-5.2.3/ext/pdo_odbc/config.m4 2007-06-09 10:51:28.000000000 +0200
    99 @@ -99,7 +99,7 @@
    100
    101 if test -n "$pdo_odbc_dir"; then
    102 PDO_ODBC_INCDIR="$pdo_odbc_dir/include"
    103 - PDO_ODBC_LIBDIR="$pdo_odbc_dir/lib"
    104 + PDO_ODBC_LIBDIR="$pdo_odbc_dir/$PHP_LIBDIR"
    105 else
    106 PDO_ODBC_INCDIR="$pdo_odbc_def_incdir"
    107 PDO_ODBC_LIBDIR="$pdo_odbc_def_libdir"
    108 diff -u -r php-5.2.3-orig/ext/pdo_pgsql/config.m4 php-5.2.3/ext/pdo_pgsql/config.m4
    109 --- php-5.2.3-orig/ext/pdo_pgsql/config.m4 2007-06-09 10:46:29.000000000 +0200
    110 +++ php-5.2.3/ext/pdo_pgsql/config.m4 2007-06-09 10:51:28.000000000 +0200
    111 @@ -46,7 +46,7 @@
    112 fi
    113 done
    114
    115 - for j in lib lib/pgsql lib/postgres lib/postgresql ""; do
    116 + for j in $PHP_LIBDIR $PHP_LIBDIR/pgsql $PHP_LIBDIR/postgres $PHP_LIBDIR/postgresql ""; do
    117 if test -f "$i/$j/libpq.so" || test -f "$i/$j/libpq.a"; then
    118 PGSQL_LIBDIR=$i/$j
    119 fi
    120 diff -u -r php-5.2.3-orig/ext/snmp/config.m4 php-5.2.3/ext/snmp/config.m4
    121 --- php-5.2.3-orig/ext/snmp/config.m4 2007-06-09 10:46:29.000000000 +0200
    122 +++ php-5.2.3/ext/snmp/config.m4 2007-06-09 10:51:28.000000000 +0200
    123 @@ -45,8 +45,8 @@
    124 test -f $i/snmp/snmp.h && SNMP_INCDIR=$i/snmp
    125 test -f $i/snmp/include/ucd-snmp/snmp.h && SNMP_INCDIR=$i/snmp/include/ucd-snmp
    126 done
    127 - for i in /usr /usr/snmp /usr/local /usr/local/snmp; do
    128 - test -f $i/lib/libsnmp.a || test -f $i/lib/libsnmp.$SHLIB_SUFFIX_NAME && SNMP_LIBDIR=$i/lib
    129 + for i in /usr/$PHP_LIBDIR /usr/snmp/lib /usr/local/lib /usr/local/snmp/lib; do
    130 + test -f $i/libsnmp.a || test -f $i/libsnmp.$SHLIB_SUFFIX_NAME && SNMP_LIBDIR=$i
    131 done
    132 else
    133 SNMP_INCDIR=$PHP_SNMP/include