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

[dmichelsen at users.sourceforge.net]

Revision: 15073
          http://gar.svn.sourceforge.net/gar/?rev=15073&view=rev
Author:   dmichelsen
Date:     2011-07-16 21:27:15 +0000 (Sat, 16 Jul 2011)

Log Message:
-----------
xapian-bindings: Update to 1.2.6, general rework, still some bindings left to do

Modified Paths:
--------------
    csw/mgar/pkg/xapian-bindings/trunk/Makefile
    csw/mgar/pkg/xapian-bindings/trunk/checksums

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

Modified: csw/mgar/pkg/xapian-bindings/trunk/Makefile
===================================================================
--- csw/mgar/pkg/xapian-bindings/trunk/Makefile	2011-07-16 20:50:13 UTC (rev 15072)
+++ csw/mgar/pkg/xapian-bindings/trunk/Makefile	2011-07-16 21:27:15 UTC (rev 15073)
@@ -1,10 +1,10 @@
 NAME = xapian-bindings
-VERSION = 1.0.11
+VERSION = 1.2.6
 CATEGORIES = lib
 
-EXTRA_MODULATORS = BINDING
+#EXTRA_MODULATORS = BINDING
 #MODULATIONS_BINDING = ruby python
-MODULATIONS_BINDING = ruby
+#MODULATIONS_BINDING = ruby
 
 DESCRIPTION = Xapian bindings for SWIG and JNI
 define BLURB
@@ -14,44 +14,36 @@
 endef
 
 MASTER_SITES = http://oligarchy.co.uk/xapian/$(VERSION)/
+DISTFILES  = $(DISTNAME).tar.gz
 
-DISTFILES  = $(NAME)-$(VERSION).tar.gz
+PATCHFILES += 0001-Do-not-strip-norunpath-on-libtool.patch
 
-# We define upstream file regex so we can be notifed of new upstream software release
-UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz
+BUILD_DEP_PKGS += CSWpython-dev
+BUILD_DEP_PKGS += CSWruby18-dev
 
-PACKAGES = CSWpyxapian CSWrbxapian
-CATALOGNAME_CSWpyxapian = py_xapian
-CATALOGNAME_CSWrbxapian = rb_xapian
+PACKAGES += CSWpy-xapian
+SPKG_DESC_CSWpy-xapian = Xapian bindings for Python
+RUNTIME_DEP_PKGS_CSWpy-xapian += CSWstlport
+RUNTIME_DEP_PKGS_CSWpy-xapian += CSWpython
+RUNTIME_DEP_PKGS_CSWpy-xapian += CSWlibxapian22
+PYCOMPILE = 1
 
-SPKG_DESC_CSWpyxapian = Xapian bindings for Python
-SPKG_DESC_CSWrbxapian = Xapian bindings for Ruby
+PACKAGES += CSWrb-xapian
+SPKG_DESC_CSWrb-xapian = Xapian bindings for Ruby
+PKGFILES_CSWrb-xapian = $(libdir)/ruby/.*
+PKGFILES_CSWrb-xapian += $(docdir)/xapian-bindings/ruby/.*
+RUNTIME_DEP_PKGS_CSWrb-xapian += CSWstlport
+RUNTIME_DEP_PKGS_CSWrb-xapian += CSWruby18
+RUNTIME_DEP_PKGS_CSWrb-xapian += CSWlibxapian22
 
-BUILD_DEP_PKGS = CSWrubydev
-RUNTIME_DEP_PKGS_CSWpyxapian = CSWpython CSWxapianrt
-RUNTIME_DEP_PKGS_CSWrbxapian = CSWruby CSWxapianrt CSWgcc3corert
-# This should be CSWgcc3g++rt, but the lib is actually in CSWgcc3g++
-RUNTIME_DEP_PKGS_CSWrbxapian += CSWgcc3g++
+EXTRA_LINKER_FLAGS = -norunpath
 
-GARCOMPILER_ruby = GCC3
-GARCOMPILER_python = SOS11
-GARCOMPILER = $(if $(GARCOMPILER_$(BINDING)),$(GARCOMPILER_$(BINDING)),SOS11)
+CONFIGURE_ARGS += $(DIRPATHS)
+CONFIGURE_ARGS += --with-python
+CONFIGURE_ARGS += --with-php
+CONFIGURE_ARGS += --with-ruby
+CONFIGURE_ARGS += --without-tcl
+CONFIGURE_ARGS += --without-csharp
+CONFIGURE_ARGS += --without-java
 
-CONFIGURE_ARGS_ruby = --without-python --without-php --with-ruby --without-tcl --without-csharp --without-java
-CONFIGURE_ARGS_python = --with-python --without-php --without-ruby --without-tcl --without-csharp --without-java
-
-CONFIGURE_ARGS = $(DIRPATHS)
-CONFIGURE_ARGS += $(CONFIGURE_ARGS_$(BINDING))
-
-TEST_TARGET = check
-
-MERGE_SCRIPTS_isa-sparcv8-binding-ruby = copy-all
-MERGE_SCRIPTS_isa-sparcv8-binding-python = copy-all
-
-MERGE_SCRIPTS_isa-i386-binding-ruby = copy-all
-MERGE_SCRIPTS_isa-i386-binding-python = copy-all
-
-PKGFILES_CSWrbxapian = $(libdir)/ruby/.*
-PKGFILES_CSWrbxapian += $(docdir)/xapian-bindings/ruby/.*
-
 include gar/category.mk

Modified: csw/mgar/pkg/xapian-bindings/trunk/checksums
===================================================================
--- csw/mgar/pkg/xapian-bindings/trunk/checksums	2011-07-16 20:50:13 UTC (rev 15072)
+++ csw/mgar/pkg/xapian-bindings/trunk/checksums	2011-07-16 21:27:15 UTC (rev 15073)
@@ -1 +1 @@
-7297a1d09564fe31b768fe58eabd219d  download/xapian-bindings-1.0.11.tar.gz
+a323fc86444dd23cc5db23e96e5b0116  xapian-bindings-1.2.6.tar.gz

Added: csw/mgar/pkg/xapian-bindings/trunk/files/0001-Do-not-strip-norunpath-on-libtool.patch
===================================================================
--- csw/mgar/pkg/xapian-bindings/trunk/files/0001-Do-not-strip-norunpath-on-libtool.patch	                        (rev 0)
+++ csw/mgar/pkg/xapian-bindings/trunk/files/0001-Do-not-strip-norunpath-on-libtool.patch	2011-07-16 21:27:15 UTC (rev 15073)
@@ -0,0 +1,25 @@
+From 2a615d0232a1e307391956b69f03dfa2a8cb261d Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Sat, 16 Jul 2011 23:12:42 +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.