[csw-devel] SF.net SVN: gar:[13861] csw/mgar/pkg/php5/trunk
bdwalton at users.sourceforge.net
bdwalton at users.sourceforge.net
Sat Mar 19 16:57:42 CET 2011
Revision: 13861
http://gar.svn.sourceforge.net/gar/?rev=13861&view=rev
Author: bdwalton
Date: 2011-03-19 15:57:41 +0000 (Sat, 19 Mar 2011)
Log Message:
-----------
php5/trunk: patch out some usr/ucblib stuff and correct a non-portable grep option in configure
Modified Paths:
--------------
csw/mgar/pkg/php5/trunk/Makefile
Added Paths:
-----------
csw/mgar/pkg/php5/trunk/files/0001-Strip-usr-ucblib-references.patch
csw/mgar/pkg/php5/trunk/files/0002-Correct-non-portable-use-of-grep-q-in-configure.patch
Modified: csw/mgar/pkg/php5/trunk/Makefile
===================================================================
--- csw/mgar/pkg/php5/trunk/Makefile 2011-03-19 15:28:05 UTC (rev 13860)
+++ csw/mgar/pkg/php5/trunk/Makefile 2011-03-19 15:57:41 UTC (rev 13861)
@@ -31,6 +31,9 @@
DISTFILES += $(DISTNAME).tar.bz2
DISTFILES += php.ini.CSW phpext pear.conf.CSW CSWphp5.postinstall
+PATCHFILES += 0001-Strip-usr-ucblib-references.patch
+PATCHFILES += 0002-Correct-non-portable-use-of-grep-q-in-configure.patch
+
PACKAGES = CSWphp5 CSWphp5-dev
PACKAGES += CSWap2-modphp5
PACKAGES += CSWphp5-bcmath
Added: csw/mgar/pkg/php5/trunk/files/0001-Strip-usr-ucblib-references.patch
===================================================================
--- csw/mgar/pkg/php5/trunk/files/0001-Strip-usr-ucblib-references.patch (rev 0)
+++ csw/mgar/pkg/php5/trunk/files/0001-Strip-usr-ucblib-references.patch 2011-03-19 15:57:41 UTC (rev 13861)
@@ -0,0 +1,114 @@
+From 4e2ddc9551f0ceb91f000463812b3c6ba6d395ec Mon Sep 17 00:00:00 2001
+From: Ben Walton <bwalton at opencsw.org>
+Date: Fri, 18 Mar 2011 01:43:02 +0100
+Subject: [PATCH] Strip /usr/ucblib references
+
+Remove all occurrences of /usr/ucblib that exist.
+
+Signed-off-by: Ben Walton <bwalton at opencsw.org>
+---
+ acinclude.m4 | 2 +-
+ aclocal.m4 | 2 +-
+ configure | 39 +--------------------------------------
+ configure.in | 2 --
+ 4 files changed, 3 insertions(+), 42 deletions(-)
+
+diff --git a/acinclude.m4 b/acinclude.m4
+index 557722f..28d8b1c 100644
+--- a/acinclude.m4
++++ b/acinclude.m4
+@@ -2051,7 +2051,7 @@ dnl
+ dnl Search for the sendmail binary
+ dnl
+ AC_DEFUN([PHP_PROG_SENDMAIL], [
+- PHP_ALT_PATH=/usr/bin:/usr/sbin:/usr/etc:/etc:/usr/ucblib:/usr/lib
++ PHP_ALT_PATH=/usr/bin:/usr/sbin:/usr/etc:/etc:/usr/lib
+ AC_PATH_PROG(PROG_SENDMAIL, sendmail,[], $PATH:$PHP_ALT_PATH)
+ PHP_SUBST(PROG_SENDMAIL)
+ ])
+diff --git a/aclocal.m4 b/aclocal.m4
+index cde7793..bb24bf9 100644
+--- a/aclocal.m4
++++ b/aclocal.m4
+@@ -2051,7 +2051,7 @@ dnl
+ dnl Search for the sendmail binary
+ dnl
+ AC_DEFUN([PHP_PROG_SENDMAIL], [
+- PHP_ALT_PATH=/usr/bin:/usr/sbin:/usr/etc:/etc:/usr/ucblib:/usr/lib
++ PHP_ALT_PATH=/usr/bin:/usr/sbin:/usr/etc:/etc:/usr/lib
+ AC_PATH_PROG(PROG_SENDMAIL, sendmail,[], $PATH:$PHP_ALT_PATH)
+ PHP_SUBST(PROG_SENDMAIL)
+ ])
+diff --git a/configure b/configure
+index 5658cd7..65da668 100755
+--- a/configure
++++ b/configure
+@@ -13963,7 +13963,7 @@ fi
+
+
+
+- PHP_ALT_PATH=/usr/bin:/usr/sbin:/usr/etc:/etc:/usr/ucblib:/usr/lib
++ PHP_ALT_PATH=/usr/bin:/usr/sbin:/usr/etc:/etc:/usr/lib
+ # Extract the first word of "sendmail", so it can be a program name with args.
+ set dummy sendmail; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+@@ -14166,43 +14166,6 @@ if test -d /usr/pkg/include -a -d /usr/pkg/lib ; then
+ CPPFLAGS="$CPPFLAGS -I/usr/pkg/include"
+ LDFLAGS="$LDFLAGS -L/usr/pkg/lib"
+ fi
+-test -d /usr/ucblib &&
+- if test "/usr/ucblib" != "/usr/$PHP_LIBDIR" && test "/usr/ucblib" != "/usr/lib"; then
+-
+- if test -z "/usr/ucblib" || echo "/usr/ucblib" | grep '^/' >/dev/null ; then
+- ai_p=/usr/ucblib
+- else
+-
+- ep_dir="`echo /usr/ucblib|$SED 's%/*[^/][^/]*/*$%%'`"
+-
+- ep_realdir="`(cd \"$ep_dir\" && pwd)`"
+- ai_p="$ep_realdir/`basename \"/usr/ucblib\"`"
+- fi
+-
+-
+-
+-
+-
+- unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
+-
+- cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
+- if test -n "$unique" && test "`eval $cmd`" = "" ; then
+- eval "LIBPATH$unique=set"
+-
+- test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
+- LDFLAGS="$LDFLAGS -L$ai_p"
+- PHP_RPATHS="$PHP_RPATHS $ai_p"
+-
+- fi
+-
+-
+-
+- fi
+-
+-
+-
+-
+-
+
+ unset ac_cv_func_socket
+ unset ac_cv_func___socket
+diff --git a/configure.in b/configure.in
+index 7b6e2a8..7568ed7 100644
+--- a/configure.in
++++ b/configure.in
+@@ -359,8 +359,6 @@ if test -d /usr/pkg/include -a -d /usr/pkg/lib ; then
+ CPPFLAGS="$CPPFLAGS -I/usr/pkg/include"
+ LDFLAGS="$LDFLAGS -L/usr/pkg/lib"
+ fi
+-test -d /usr/ucblib && PHP_ADD_LIBPATH(/usr/ucblib)
+-
+
+ dnl First, library checks.
+ dnl -------------------------------------------------------------------------
+--
+1.7.3.2
+
Added: csw/mgar/pkg/php5/trunk/files/0002-Correct-non-portable-use-of-grep-q-in-configure.patch
===================================================================
--- csw/mgar/pkg/php5/trunk/files/0002-Correct-non-portable-use-of-grep-q-in-configure.patch (rev 0)
+++ csw/mgar/pkg/php5/trunk/files/0002-Correct-non-portable-use-of-grep-q-in-configure.patch 2011-03-19 15:57:41 UTC (rev 13861)
@@ -0,0 +1,29 @@
+From 15a1fff863652aa6575aa1dcd44a5f31e4424873 Mon Sep 17 00:00:00 2001
+From: Ben Walton <bwalton at opencsw.org>
+Date: Sat, 19 Mar 2011 16:55:06 +0100
+Subject: [PATCH] Correct non-portable use of grep -q in configure
+
+Discard the stdout/stderr and test exit status instead.
+
+Signed-off-by: Ben Walton <bwalton at opencsw.org>
+---
+ configure | 3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+diff --git a/configure b/configure
+index 65da668..503369a 100755
+--- a/configure
++++ b/configure
+@@ -73068,7 +73068,8 @@ EOF
+
+ echo $ac_n "checking for openssl dependencies""... $ac_c" 1>&6
+ echo "configure:73108: checking for openssl dependencies" >&5
+- if grep -q openssl $PGSQL_INCLUDE/libpq-fe.h ; then
++grep openssl $PGSQL_INCLUDE/libpq-fe.h >/dev/null 2>&1
++ if [ $? -eq 0 ] ; then
+ echo "$ac_t""yes" 1>&6
+ # Extract the first word of "pkg-config", so it can be a program name with args.
+ set dummy pkg-config; ac_word=$2
+--
+1.7.3.2
+
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