[csw-devel] SF.net SVN: gar:[15072] csw/mgar/pkg/xapian-core/trunk

[dmichelsen at users.sourceforge.net]

Revision: 15072
          http://gar.svn.sourceforge.net/gar/?rev=15072&view=rev
Author:   dmichelsen
Date:     2011-07-16 20:50:13 +0000 (Sat, 16 Jul 2011)

Log Message:
-----------
xapian-core: Fix xapian-config to not rely on .la

Modified Paths:
--------------
    csw/mgar/pkg/xapian-core/trunk/Makefile

Added Paths:
-----------
    csw/mgar/pkg/xapian-core/trunk/files/0003-Do-not-bail-out-on-missing-.la.patch

Modified: csw/mgar/pkg/xapian-core/trunk/Makefile
===================================================================
--- csw/mgar/pkg/xapian-core/trunk/Makefile	2011-07-16 19:23:10 UTC (rev 15071)
+++ csw/mgar/pkg/xapian-core/trunk/Makefile	2011-07-16 20:50:13 UTC (rev 15072)
@@ -15,6 +15,7 @@
 
 PATCHFILES += 0001-Fix-include-issue-on-Solaris-9.patch
 PATCHFILES += 0002-Do-not-strip-norunpath-on-libtool.patch
+PATCHFILES += 0003-Do-not-bail-out-on-missing-.la.patch
 
 VENDOR_URL = http://xapian.org/
 

Added: csw/mgar/pkg/xapian-core/trunk/files/0003-Do-not-bail-out-on-missing-.la.patch
===================================================================
--- csw/mgar/pkg/xapian-core/trunk/files/0003-Do-not-bail-out-on-missing-.la.patch	                        (rev 0)
+++ csw/mgar/pkg/xapian-core/trunk/files/0003-Do-not-bail-out-on-missing-.la.patch	2011-07-16 20:50:13 UTC (rev 15072)
@@ -0,0 +1,27 @@
+From ae30dfc8465c8bbd628d18ee5f7d175cba0ea3ef Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Sat, 16 Jul 2011 22:47:51 +0200
+Subject: [PATCH] Do not bail out on missing .la
+
+---
+ xapian-config.in |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/xapian-config.in b/xapian-config.in
+index 7fdd2ea..6ad567b 100644
+--- a/xapian-config.in
++++ b/xapian-config.in
+@@ -281,8 +281,8 @@ for arg in $actions ; do
+ 		continue
+ 	    fi
+ 
+-	    echo "$0: Can't find libxapian at LIBRARY_VERSION_SUFFIX@.la to link against." 1>&2
+-	    exit 1
++#	    echo "$0: Can't find libxapian at LIBRARY_VERSION_SUFFIX@.la to link against." 1>&2
++#	    exit 1
+ 	fi
+ 
+ 	set_L_to_library_path
+-- 
+1.7.6
+


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