[csw-devel] SF.net SVN: gar:[15501] csw/mgar/pkg/php5/trunk

[bdwalton at users.sourceforge.net]

Revision: 15501
          http://gar.svn.sourceforge.net/gar/?rev=15501&view=rev
Author:   bdwalton
Date:     2011-09-03 02:27:41 +0000 (Sat, 03 Sep 2011)
Log Message:
-----------
php5/trunk: update the pg_config patch to work on the modified configure script

Modified Paths:
--------------
    csw/mgar/pkg/php5/trunk/Makefile

Added Paths:
-----------
    csw/mgar/pkg/php5/trunk/files/0002-Force-the-PDO-pgsql-checks-to-use-32-bit-pg_config.patch

Removed Paths:
-------------
    csw/mgar/pkg/php5/trunk/files/0003-Force-the-PDO-pgsql-checks-to-use-32-bit-pg_config.patch

Modified: csw/mgar/pkg/php5/trunk/Makefile
===================================================================
--- csw/mgar/pkg/php5/trunk/Makefile	2011-09-03 02:17:19 UTC (rev 15500)
+++ csw/mgar/pkg/php5/trunk/Makefile	2011-09-03 02:27:41 UTC (rev 15501)
@@ -48,8 +48,8 @@
 PATCHFILES += 0001-Strip-usr-ucblib-references.patch
 # technically this is only required in the ap2 modulation where we build the
 # postgres stuff, but protect the cgi modulation too
-PATCHFILES_isa-sparcv8-sapi-cgi += 0003-Force-the-PDO-pgsql-checks-to-use-32-bit-pg_config.patch
-PATCHFILES_isa-sparcv8-sapi-ap2 += 0003-Force-the-PDO-pgsql-checks-to-use-32-bit-pg_config.patch
+PATCHFILES_isa-sparcv8-sapi-cgi += 0002-Force-the-PDO-pgsql-checks-to-use-32-bit-pg_config.patch
+PATCHFILES_isa-sparcv8-sapi-ap2 += 0002-Force-the-PDO-pgsql-checks-to-use-32-bit-pg_config.patch
 
 
 BUILD_DEP_PKGS += CSWlibgdbm-dev CSWlibidn-dev CSWlibgd-dev CSWcoreutils

Added: csw/mgar/pkg/php5/trunk/files/0002-Force-the-PDO-pgsql-checks-to-use-32-bit-pg_config.patch
===================================================================
--- csw/mgar/pkg/php5/trunk/files/0002-Force-the-PDO-pgsql-checks-to-use-32-bit-pg_config.patch	                        (rev 0)
+++ csw/mgar/pkg/php5/trunk/files/0002-Force-the-PDO-pgsql-checks-to-use-32-bit-pg_config.patch	2011-09-03 02:27:41 UTC (rev 15501)
@@ -0,0 +1,35 @@
+From 03f791ec352a08721208ff22aa1b70d4ccfd8b7a Mon Sep 17 00:00:00 2001
+From: Ben Walton <bwalton at opencsw.org>
+Date: Sat, 3 Sep 2011 04:22:44 +0200
+Subject: [PATCH] Force the PDO pgsql checks to use 32-bit pg_config
+
+On sparc, we have 32 and 64-bit pg_config binaries.  On i386, we only
+have 32-bit.  We need to force the use of 32-bit for sparc so it uses
+the correct path when linking the test binaries, etc.
+
+This patch should not be applied on i386 as it will break pg_config
+detection there.
+
+Signed-off-by: Ben Walton <bwalton at opencsw.org>
+---
+ configure |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/configure b/configure
+index f3772a5..5aa29c9 100755
+--- a/configure
++++ b/configure
+@@ -73177,8 +73177,8 @@ if test "$PHP_PDO_PGSQL" != "no"; then
+   echo $ac_n "checking for pg_config""... $ac_c" 1>&6
+ echo "configure:73216: 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
+-- 
+1.7.6
+

Deleted: csw/mgar/pkg/php5/trunk/files/0003-Force-the-PDO-pgsql-checks-to-use-32-bit-pg_config.patch
===================================================================
--- csw/mgar/pkg/php5/trunk/files/0003-Force-the-PDO-pgsql-checks-to-use-32-bit-pg_config.patch	2011-09-03 02:17:19 UTC (rev 15500)
+++ csw/mgar/pkg/php5/trunk/files/0003-Force-the-PDO-pgsql-checks-to-use-32-bit-pg_config.patch	2011-09-03 02:27:41 UTC (rev 15501)
@@ -1,35 +0,0 @@
-From f90347108abfe42140e3a87c5a5e6c364bc34625 Mon Sep 17 00:00:00 2001
-From: Ben Walton <bwalton at opencsw.org>
-Date: Sat, 23 Apr 2011 23:52:16 +0200
-Subject: [PATCH] Force the PDO pgsql checks to use 32-bit pg_config
-
-On sparc, we have 32 and 64-bit pg_config binaries.  On i386, we only
-have 32-bit.  We need to force the use of 32-bit for sparc so it uses
-the correct path when linking the test binaries, etc.
-
-This patch should not be applied on i386 as it will break pg_config
-detection there.
-
-Signed-off-by: Ben Walton <bwalton at opencsw.org>
----
- configure |    4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/configure b/configure
-index 503369a..753536e 100755
---- a/configure
-+++ b/configure
-@@ -73005,8 +73005,8 @@ if test "$PHP_PDO_PGSQL" != "no"; then
-   echo $ac_n "checking for pg_config""... $ac_c" 1>&6
- echo "configure:73044: 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
--- 
-1.7.3.2
-

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.