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

[dmichelsen at users.sourceforge.net]

Revision: 15063
          http://gar.svn.sourceforge.net/gar/?rev=15063&view=rev
Author:   dmichelsen
Date:     2011-07-15 19:58:33 +0000 (Fri, 15 Jul 2011)

Log Message:
-----------
xapian-core: Final fixup

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

Added Paths:
-----------
    csw/mgar/pkg/xapian-core/trunk/files/0002-Do-not-strip-norunpath-on-libtool.patch

Modified: csw/mgar/pkg/xapian-core/trunk/Makefile
===================================================================
--- csw/mgar/pkg/xapian-core/trunk/Makefile	2011-07-15 16:04:06 UTC (rev 15062)
+++ csw/mgar/pkg/xapian-core/trunk/Makefile	2011-07-15 19:58:33 UTC (rev 15063)
@@ -14,37 +14,36 @@
 DISTFILES  = $(NAME)-$(VERSION).tar.gz
 
 PATCHFILES += 0001-Fix-include-issue-on-Solaris-9.patch
+PATCHFILES += 0002-Do-not-strip-norunpath-on-libtool.patch
 
+VENDOR_URL = http://xapian.org/
+
 PACKAGES += CSWxapian
 CATALOGNAME_CSWxapian = xapian
-SPKG_DESC_CSWxapian = An open source search engine library
-RUNTIME_DEP_PKGS_CSWxapian += CSWxapianrt
+SPKG_DESC_CSWxapian = Xapian search engine binaries
+RUNTIME_DEP_PKGS_CSWxapian += CSWlibxapian22
+RUNTIME_DEP_PKGS_CSWxapian += CSWstlport
+RUNTIME_DEP_PKGS_CSWxapian += CSWzlib
 
-PACKAGES += CSWxapianrt
-CATALOGNAME_CSWxapianrt = xapian_rt
-SPKG_DESC_CSWxapianrt = Xapian runtime libraries
-PKGFILES_CSWxapianrt = $(PKGFILES_RT)
-RUNTIME_DEP_PKGS_CSWxapianrt += CSWstlport
-RUNTIME_DEP_PKGS_CSWxapianrt += CSWzlib
+PACKAGES += CSWlibxapian22
+SPKG_DESC_CSWlibxapian22 = An open source search engine library, libxapian.so.22
+PKGFILES_CSWlibxapian22 = $(call pkgfiles_lib,libxapian.so.22)
+RUNTIME_DEP_PKGS_CSWlibxapian22 += CSWstlport
+RUNTIME_DEP_PKGS_CSWlibxapian22 += CSWzlib
 
 PACKAGES += CSWxapian-dev
 SPKG_DESC_CSWxapian-dev = Xapian development files
 PKGFILES_CSWxapian-dev = $(PKGFILES_DEVEL)
 PKGFILES_CSWxapian-dev += $(docdir)/xapian-core/apidoc/.*
-RUNTIME_DEP_PKGS_CSWxapian-dev += CSWxapian
+PKGFILES_CSWxapian-dev += .*\.cmake
+RUNTIME_DEP_PKGS_CSWxapian-dev += CSWlibxapian22
 
-# If we compile with Sun Studio it is impossible to build the Ruby bindings as
-# TBD: Still true?
+EXTRA_LD_FLAGS = -norunpath -lCrun
 
-# TBD: Is this necessary
-EXTRA_LD_FLAGS = -lm
-
 BUILD64 = 1
+ISAEXEC = 1
 
-# Can't we just pass this via EXTRA_CXXFLAGS?
-BUILD_ARGS = AM_CXXFLAGS="-library=stlport4 -features=tmplife"
+# This is just an example of the default install location
+CHECKPKG_OVERRIDES_CSWxapian += file-with-bad-content|/usr/local|root/opt/csw/share/doc/xapian-core/install.html
 
-# We need the .la-file, otherwise xapian-config doesn't work
-MERGE_EXCLUDE_LIBTOOL =
-
 include gar/category.mk

Added: csw/mgar/pkg/xapian-core/trunk/files/0002-Do-not-strip-norunpath-on-libtool.patch
===================================================================
--- csw/mgar/pkg/xapian-core/trunk/files/0002-Do-not-strip-norunpath-on-libtool.patch	                        (rev 0)
+++ csw/mgar/pkg/xapian-core/trunk/files/0002-Do-not-strip-norunpath-on-libtool.patch	2011-07-15 19:58:33 UTC (rev 15063)
@@ -0,0 +1,25 @@
+From 9cc62c92d2ba25839bf2c1277f00c8a1ff495ec6 Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Fri, 15 Jul 2011 21:41:19 +0200
+Subject: [PATCH] Do not strip -norunpath on libtool
+
+---
+ ltmain.sh |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/ltmain.sh b/ltmain.sh
+index 3061e3c..5817d54 100755
+--- a/ltmain.sh
++++ b/ltmain.sh
+@@ -5840,7 +5840,7 @@ func_mode_link ()
+       # -O*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization
+       -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
+       -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \
+-      -O*|-flto*|-fwhopr*|-fuse-linker-plugin)
++      -O*|-flto*|-fwhopr*|-fuse-linker-plugin|-norunpath)
+         func_quote_for_eval "$arg"
+ 	arg="$func_quote_for_eval_result"
+         func_append compile_command " $arg"
+-- 
+1.7.6
+


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