[csw-devel] SF.net SVN: gar:[13018] csw/mgar/pkg/apache2/branches/open-bug-squash

[bdwalton at users.sourceforge.net]

Revision: 13018
          http://gar.svn.sourceforge.net/gar/?rev=13018&view=rev
Author:   bdwalton
Date:     2011-01-20 01:24:27 +0000 (Thu, 20 Jan 2011)

Log Message:
-----------
apache2/branches/open-bug-squash: patch around some libtool breakage (clean up later for upstream)

Modified Paths:
--------------
    csw/mgar/pkg/apache2/branches/open-bug-squash/Makefile

Added Paths:
-----------
    csw/mgar/pkg/apache2/branches/open-bug-squash/files/0001-Apply-a-large-hammer-to-buildconf-to-fix-libtool-set.patch

Modified: csw/mgar/pkg/apache2/branches/open-bug-squash/Makefile
===================================================================
--- csw/mgar/pkg/apache2/branches/open-bug-squash/Makefile	2011-01-20 01:20:43 UTC (rev 13017)
+++ csw/mgar/pkg/apache2/branches/open-bug-squash/Makefile	2011-01-20 01:24:27 UTC (rev 13018)
@@ -44,6 +44,8 @@
 DISTFILES += README.CSW.apache2 README.CSW.ap2_prefork
 DISTFILES += README.CSW.apache2rt
 
+PATCHFILES += 0001-Apply-a-large-hammer-to-buildconf-to-fix-libtool-set.patch
+
 UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz
 
 # The PACKAGES variable tell GAR which packages to build

Added: csw/mgar/pkg/apache2/branches/open-bug-squash/files/0001-Apply-a-large-hammer-to-buildconf-to-fix-libtool-set.patch
===================================================================
--- csw/mgar/pkg/apache2/branches/open-bug-squash/files/0001-Apply-a-large-hammer-to-buildconf-to-fix-libtool-set.patch	                        (rev 0)
+++ csw/mgar/pkg/apache2/branches/open-bug-squash/files/0001-Apply-a-large-hammer-to-buildconf-to-fix-libtool-set.patch	2011-01-20 01:24:27 UTC (rev 13018)
@@ -0,0 +1,33 @@
+From 386d1e486af82bffc18f4668a96565b892b1ae48 Mon Sep 17 00:00:00 2001
+From: Ben Walton <bwalton at opencsw.org>
+Date: Thu, 20 Jan 2011 02:16:26 +0100
+Subject: [PATCH] Apply a large hammer to buildconf to fix libtool setup
+
+The heuristics used in buildconf are broken with our newest version of
+the libtool stack.  For now, apply an ugly hack to the script to make
+it work.  Later, we'll polish it and make it general enough to submit
+upstream.
+
+Signed-off-by: Ben Walton <bwalton at opencsw.org>
+---
+ srclib/apr/buildconf |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/srclib/apr/buildconf b/srclib/apr/buildconf
+index 1041af4..f84e205 100755
+--- a/srclib/apr/buildconf
++++ b/srclib/apr/buildconf
+@@ -52,8 +52,8 @@ if [ -f libtool.m4 ]; then
+    ltfile=`pwd`/libtool.m4
+ elif grep all_pkgmacro_files $libtoolize > /dev/null; then
+     # libtool 2.x
+-   aclocal_dir=`sed -n '/^aclocaldir=/{s/.*=//;p;q;}' < $libtoolize`
+-   ltfiles=`sed -n '/^all_pkgmacro_files=/{s/.*=//;;s/"//;p;q;}' < $libtoolize`
++   aclocal_dir=/opt/csw/share/aclocal
++   ltfiles=`sed -n '/all_pkgmacro_files=/{s/.*=//;;s/"//;p;q;}' < $libtoolize`
+    for f in $ltfiles; do
+        test -f "$aclocal_dir/$f" && cp "$aclocal_dir/$f" build
+    done
+-- 
+1.7.3.2
+


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