[csw-devel] SF.net SVN: gar:[3760] csw/mgar/pkg/php5/trunk/files
valholla at users.sourceforge.net
valholla at users.sourceforge.net
Sat Mar 14 04:13:45 CET 2009
Revision: 3760
http://gar.svn.sourceforge.net/gar/?rev=3760&view=rev
Author: valholla
Date: 2009-03-14 03:13:45 +0000 (Sat, 14 Mar 2009)
Log Message:
-----------
update to build php-5.2.9
Added Paths:
-----------
csw/mgar/pkg/php5/trunk/files/configure.diff
csw/mgar/pkg/php5/trunk/files/fixme.sh
csw/mgar/pkg/php5/trunk/files/pear.conf.CSW
Added: csw/mgar/pkg/php5/trunk/files/configure.diff
===================================================================
--- csw/mgar/pkg/php5/trunk/files/configure.diff (rev 0)
+++ csw/mgar/pkg/php5/trunk/files/configure.diff 2009-03-14 03:13:45 UTC (rev 3760)
@@ -0,0 +1,132 @@
+--- php-5.2.9/configure~ 2009-02-25 09:39:40.000000000 -0600
++++ php-5.2.9/configure 2009-03-13 20:43:49.996093631 -0500
+@@ -4744,7 +4744,7 @@
+ $APXS -q -S CFLAGS="$APXS_CFLAGS" CFLAGS >/dev/null 2>&1
+
+ if test "$?" != "0"; then
+- APACHE_INSTALL="$APXS -i -a -n php5 $SAPI_SHARED" # Old apxs does not have -S option
++ APACHE_INSTALL="$APXS -i -n php5 $SAPI_SHARED" # Old apxs does not have -S option
+ else
+ APXS_LIBEXECDIR='$(INSTALL_ROOT)'`$APXS -q LIBEXECDIR`
+ if test -z `$APXS -q SYSCONFDIR`; then
+@@ -4757,7 +4757,7 @@
+ \$(mkinstalldirs) '$APXS_SYSCONFDIR' && \
+ $APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \
+ -S SYSCONFDIR='$APXS_SYSCONFDIR' \
+- -i -a -n php5 $SAPI_SHARED"
++ -i -n php5 $SAPI_SHARED"
+ fi
+ fi
+
+@@ -5905,7 +5905,7 @@
+ \$(mkinstalldirs) '$APXS_SYSCONFDIR' && \
+ $APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \
+ -S SYSCONFDIR='$APXS_SYSCONFDIR' \
+- -i -a -n php5"
++ -i -n php5"
+ fi
+
+ case $host_alias in
+@@ -6753,7 +6753,7 @@
+ \$(mkinstalldirs) '$APXS_SYSCONFDIR' && \
+ $APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \
+ -S SYSCONFDIR='$APXS_SYSCONFDIR' \
+- -i -a -n php5"
++ -i -n php5"
+ fi
+
+ case $host_alias in
+@@ -7770,7 +7770,7 @@
+ $APXS -q -S CFLAGS="$APXS_CFLAGS" CFLAGS >/dev/null 2>&1
+
+ if test "$?" != "0"; then
+- APACHE_HOOKS_INSTALL="$APXS -i -a -n php5 $SAPI_SHARED" # Old apxs does not have -S option
++ APACHE_HOOKS_INSTALL="$APXS -i -n php5 $SAPI_SHARED" # Old apxs does not have -S option
+ else
+ APXS_LIBEXECDIR='$(INSTALL_ROOT)'`$APXS -q LIBEXECDIR`
+ if test -z `$APXS -q SYSCONFDIR`; then
+@@ -7783,7 +7783,7 @@
+ \$(mkinstalldirs) '$APXS_SYSCONFDIR' && \
+ $APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \
+ -S SYSCONFDIR='$APXS_SYSCONFDIR' \
+- -i -a -n php5 $SAPI_SHARED"
++ -i -n php5 $SAPI_SHARED"
+ fi
+ fi
+
+@@ -19951,7 +19951,7 @@
+ echo $ac_n "(cached) $ac_c" 1>&6
+ else
+
+- for i in $PHP_LIBXML_DIR /usr/local /usr; do
++ for i in $PHP_LIBXML_DIR /opt/csw /usr/local /usr; do
+ if test -x "$i/bin/xml2-config"; then
+ ac_cv_php_xml2_config_path="$i/bin/xml2-config"
+ break
+@@ -46061,7 +46061,7 @@
+
+ if test "$found_iconv" = "no"; then
+
+- for i in $PHP_ICONV /usr/local /usr; do
++ for i in $PHP_ICONV /opt/csw /usr/local /usr; do
+ if test -r $i/include/giconv.h; then
+ cat >> confdefs.h <<\EOF
+ #define HAVE_GICONV_H 1
+@@ -46542,7 +46542,7 @@
+
+ if test "$iconv_avail" != "no"; then
+ if test -z "$ICONV_DIR"; then
+- for i in /usr/local /usr; do
++ for i in /opt/csw /usr/local /usr; do
+ if test -f "$i/include/iconv.h" || test -f "$i/include/giconv.h"; then
+ PHP_ICONV_PREFIX="$i"
+ break
+@@ -68556,7 +68556,7 @@
+ echo $ac_n "checking for unixODBC support""... $ac_c" 1>&6
+ echo "configure:68558: checking for unixODBC support" >&5
+ if test "$PHP_UNIXODBC" = "yes"; then
+- PHP_UNIXODBC=/usr/local
++ PHP_UNIXODBC=/opt/csw
+ fi
+ ODBC_INCDIR=$PHP_UNIXODBC/include
+ ODBC_LIBDIR=$PHP_UNIXODBC/$PHP_LIBDIR
+@@ -77195,8 +77195,8 @@
+ echo $ac_n "checking for pg_config""... $ac_c" 1>&6
+ echo "configure:77197: checking for pg_config" >&5
+ for i in $PHP_PDO_PGSQL $PHP_PDO_PGSQL/bin /usr/local/pgsql/bin /usr/local/bin /usr/bin ""; do
+- if test -x $i/pg_config; then
+- PG_CONFIG="$i/pg_config"
++ if test -x $i/pg_config32; then
++ PG_CONFIG="$i/pg_config32"
+ break;
+ fi
+ done
+@@ -80000,8 +80000,8 @@
+ echo $ac_n "checking for pg_config""... $ac_c" 1>&6
+ echo "configure:80002: checking for pg_config" >&5
+ for i in $PHP_PGSQL $PHP_PGSQL/bin /usr/local/pgsql/bin /usr/local/bin /usr/bin ""; do
+- if test -x $i/pg_config; then
+- PG_CONFIG="$i/pg_config"
++ if test -x $i/pg_config32; then
++ PG_CONFIG="$i/pg_config32"
+ break;
+ fi
+ done
+@@ -83215,7 +83215,7 @@
+ echo $ac_n "(cached) $ac_c" 1>&6
+ else
+ ac_save_LIBS="$LIBS"
+-LIBS="-lreadline $LIBS"
++LIBS="-lreadline -lcurses $LIBS"
+ cat > conftest.$ac_ext <<EOF
+ #line 83221 "configure"
+ #include "confdefs.h"
+@@ -103440,7 +103440,7 @@
+ else
+ echo $ac_n "checking for XMLRPC-EPI in default path""... $ac_c" 1>&6
+ echo "configure:103443: checking for XMLRPC-EPI in default path" >&5
+- for i in /usr/local /usr; do
++ for i in /opt/csw /usr/local /usr; do
+ if test -r $i/include/xmlrpc.h; then
+ XMLRPC_DIR=$i/include
+ echo "$ac_t""found in $i" 1>&6
Added: csw/mgar/pkg/php5/trunk/files/fixme.sh
===================================================================
--- csw/mgar/pkg/php5/trunk/files/fixme.sh (rev 0)
+++ csw/mgar/pkg/php5/trunk/files/fixme.sh 2009-03-14 03:13:45 UTC (rev 3760)
@@ -0,0 +1,49 @@
+#!/bin/bash
+####################################################
+#
+# fixme.sh
+# Intended to remove the use of libtool's
+# pseudo-libraries for opencsw builds.
+#
+# Author: Mike Watters mwatters_at_opencsw.org
+# Initial Version: 0.1
+#
+####################################################
+
+umask 0022
+PATH=/opt/csw/bin
+
+if [ $# -ne 1 ]; then
+ gecho "USAGE: $(basename $0) WORKSRC"
+ exit 1
+fi
+BASEPATH=$1
+
+## Fix Makefiles
+for mk in $(gfind ${BASEPATH} -name Makefile -print); do
+ LT_FILES=$(ggrep '/opt/csw.*/lib/.*\.la' ${mk} | \
+ gsed "s/^.*\(\/opt\/csw.*\/lib\/.*\.la\).*$/\1/")
+
+ for file in ${LT_FILES}; do
+ LIB_NAME=$(ggrep 'dlname=' ${file} | \
+ gsed -e "s/.*'\(.*\)'/\1/" \
+ -e "s/^lib//" \
+ -e "s/\.so.*$//")
+ fixpath=$(gecho $file |gsed 's/\//\\\//g')
+ gsed "s/${fixpath}/-l${LIB_NAME}/g" ${mk} >Makefile.new
+ gmv Makefile.new ${mk}
+ done
+done
+
+## Fix libtool Script
+for lt in $(gfind ${BASEPATH} -name libtool -print); do
+ gsed "/for search_ext in .*\.la/s/\.la//" ${lt} >${lt}.new
+ gmv ${lt}.new ${lt}
+done
+
+LTMAIN=$(gfind ${BASEPATH} -name ltmain.sh -print)
+if [ -f ${LTMAIN} ]; then
+ gsed "/for search_ext in .*\.la/s/\.la//" ${LTMAIN} >${LTMAIN}.new
+ gmv ${LTMAIN}.new ${LTMAIN}
+fi
+
Property changes on: csw/mgar/pkg/php5/trunk/files/fixme.sh
___________________________________________________________________
Added: svn:executable
+ *
Added: csw/mgar/pkg/php5/trunk/files/pear.conf.CSW
===================================================================
--- csw/mgar/pkg/php5/trunk/files/pear.conf.CSW (rev 0)
+++ csw/mgar/pkg/php5/trunk/files/pear.conf.CSW 2009-03-14 03:13:45 UTC (rev 3760)
@@ -0,0 +1,2 @@
+#PEAR_Config 0.9
+a:29:{s:9:"cache_dir";s:15:"/tmp/pear/cache";s:15:"default_channel";s:12:"pear.php.net";s:16:"preferred_mirror";s:12:"pear.php.net";s:13:"remote_config";s:0:"";s:13:"auto_discover";i:0;s:13:"master_server";s:12:"pear.php.net";s:10:"http_proxy";s:0:"";s:7:"php_dir";s:21:"/opt/csw/php5/lib/php";s:7:"ext_dir";s:58:"/opt/csw/php5/lib/php/extensions/no-debug-non-zts-20060613";s:7:"doc_dir";s:25:"/opt/csw/php5/lib/php/doc";s:7:"bin_dir";s:17:"/opt/csw/php5/bin";s:8:"data_dir";s:26:"/opt/csw/php5/lib/php/data";s:7:"cfg_dir";s:25:"/opt/csw/php5/lib/php/cfg";s:7:"www_dir";s:25:"/opt/csw/php5/lib/php/www";s:8:"test_dir";s:26:"/opt/csw/php5/lib/php/test";s:8:"temp_dir";s:14:"/tmp/pear/temp";s:12:"download_dir";s:18:"/tmp/pear/download";s:7:"php_bin";s:21:"/opt/csw/php5/bin/php";s:7:"php_ini";s:0:"";s:8:"username";s:0:"";s:8:"password";s:0:"";s:7:"verbose";i:1;s:15:"preferred_state";s:6:"stable";s:5:"umask";i:18;s:9:"cache_ttl";i:3600;s:8:"sig_type";s:3:"gpg";s:7:"sig_bin";s:16:"/opt/cs
w/bin/gpg";s:9:"sig_keyid";s:0:"";s:10:"sig_keydir";s:26:"/opt/csw/php5/etc/pearkeys";}
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the devel
mailing list