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

dmichelsen at users.sourceforge.net dmichelsen at users.sourceforge.net
Thu Sep 26 14:15:55 CEST 2013


Revision: 22027
          http://gar.svn.sourceforge.net/gar/?rev=22027&view=rev
Author:   dmichelsen
Date:     2013-09-26 12:15:55 +0000 (Thu, 26 Sep 2013)
Log Message:
-----------
xapian-core/trunk: More patches towards 1.3.1

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

Added Paths:
-----------
    csw/mgar/pkg/xapian-core/trunk/files/0001-Force-float-to-disambiguise-float-double-invocation-.patch

Removed Paths:
-------------
    csw/mgar/pkg/xapian-core/trunk/files/0001-Check-for-explicit-value-or-HAVE_UUID_UNPARSE_LOWER-.patch

Modified: csw/mgar/pkg/xapian-core/trunk/Makefile
===================================================================
--- csw/mgar/pkg/xapian-core/trunk/Makefile	2013-09-26 11:11:19 UTC (rev 22026)
+++ csw/mgar/pkg/xapian-core/trunk/Makefile	2013-09-26 12:15:55 UTC (rev 22027)
@@ -17,7 +17,8 @@
 
 # Use patch until this is fixed:
 #   http://trac.xapian.org/ticket/626
-PATCHFILES += 0001-Check-for-explicit-value-or-HAVE_UUID_UNPARSE_LOWER-.patch
+#PATCHFILES += 0001-Check-for-explicit-value-or-HAVE_UUID_UNPARSE_LOWER-.patch
+# PATCHFILES += 0001-Do-not-make-uuid_unparse_lower-inline.patch
 
 # This is strange and needs further examination
 PATCHFILES += 0002-Somehow-round-is-missing-in-cmath.patch
@@ -26,7 +27,11 @@
 #   http://trac.xapian.org/ticket/627
 PATCHFILES += 0003-log-is-ambigous-to-float-and-double.patch
 
+PATCHFILES += 0001-Force-float-to-disambiguise-float-double-invocation-.patch
 
+#GARCOMPILER = GNU
+
+
 VENDOR_URL = http://xapian.org/
 
 PACKAGES += CSWxapian
@@ -48,12 +53,15 @@
 PKGFILES_CSWlibxapian-dev += .*\.cmake
 RUNTIME_DEP_PKGS_CSWlibxapian-dev += CSWlibxapian22
 
-EXTRA_LD_FLAGS += -norunpath -lCrun
+# EXTRA_LD_FLAGS += -norunpath -lCrun
 
 # We don't need it and if defined the test breaks
-LD_OPTIONS = $(LINKER_MAPS) $(LINKER_DIRECT) $(LINKER_IGNORE)
-EXTRA_LINKER_FLAGS = $(RUNPATH_LINKER_FLAGS)
+# LD_OPTIONS = $(LINKER_MAPS) $(LINKER_DIRECT) $(LINKER_IGNORE)
+# EXTRA_LINKER_FLAGS = $(RUNPATH_LINKER_FLAGS)
 
+# libuuid.so must be searched in /opt/csw/lib
+EXTRA_CXXFLAGS += -L$(libdir)
+
 BUILD64 = 1
 ISAEXEC = 1
 
@@ -62,6 +70,6 @@
 
 include gar/category.mk
 
-post-patch:
-	cd $(WORKSRC) && autoreconf -fi
-	@$(MAKECOOKIE)
+#post-patch:
+#	cd $(WORKSRC) && autoreconf -fi
+#	@$(MAKECOOKIE)

Deleted: csw/mgar/pkg/xapian-core/trunk/files/0001-Check-for-explicit-value-or-HAVE_UUID_UNPARSE_LOWER-.patch
===================================================================
--- csw/mgar/pkg/xapian-core/trunk/files/0001-Check-for-explicit-value-or-HAVE_UUID_UNPARSE_LOWER-.patch	2013-09-26 11:11:19 UTC (rev 22026)
+++ csw/mgar/pkg/xapian-core/trunk/files/0001-Check-for-explicit-value-or-HAVE_UUID_UNPARSE_LOWER-.patch	2013-09-26 12:15:55 UTC (rev 22027)
@@ -1,26 +0,0 @@
-From 83506df0b040989eda490611936319f6c9e80cf3 Mon Sep 17 00:00:00 2001
-From: Dagobert Michelsen <dam at opencsw.org>
-Date: Fri, 20 Sep 2013 21:10:21 +0200
-Subject: [PATCH] Check for explicit value or HAVE_UUID_UNPARSE_LOWER will
- always be set
-
----
- configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index e12b6a0..6542546 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -721,7 +721,7 @@ case $enable_backend_chert$enable_backend_brass in
-   dnl Older versions of libuuid (such as that on CentOS 4.7) don't have
-   dnl uuid_unparse_lower(), only uuid_unparse().
-   AC_LINK_IFELSE([AC_LANG_CALL([], [uuid_unparse_lower])], [found=true], [found=false])
--  if $found ; then
-+  if test $found = "true"; then
-     AC_DEFINE([HAVE_UUID_UNPARSE_LOWER], [1],
- 	      [Define to 1 if you have the 'uuid_unparse_lower' function.])
-   fi
--- 
-1.8.3.4
-

Added: csw/mgar/pkg/xapian-core/trunk/files/0001-Force-float-to-disambiguise-float-double-invocation-.patch
===================================================================
--- csw/mgar/pkg/xapian-core/trunk/files/0001-Force-float-to-disambiguise-float-double-invocation-.patch	                        (rev 0)
+++ csw/mgar/pkg/xapian-core/trunk/files/0001-Force-float-to-disambiguise-float-double-invocation-.patch	2013-09-26 12:15:55 UTC (rev 22027)
@@ -0,0 +1,45 @@
+From faeb07f303894b6be6234c7988fc7b358fd6d02f Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Wed, 25 Sep 2013 15:21:43 +0200
+Subject: [PATCH] Force float to disambiguise float/double invocation of log
+
+---
+ tests/api_weight.cc | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/tests/api_weight.cc b/tests/api_weight.cc
+index 792a7ae..b03d8c5 100644
+--- a/tests/api_weight.cc
++++ b/tests/api_weight.cc
+@@ -141,7 +141,7 @@ DEFINE_TESTCASE(tfidfweight3, backend) {
+     TEST_EQUAL(mset.size(), 2);
+     // doc 2 should have higher weight than 4 as only tf(wdf) will dominate.
+     mset_expect_order(mset, 2, 4);
+-    TEST_EQUAL_DOUBLE(mset[0].get_weight(), (8 * log(6 / 2)));
++    TEST_EQUAL_DOUBLE(mset[0].get_weight(), (8 * log((double)6.0 / 2)));
+ 
+     // Check for "bnn" and for both branches of 'b'.
+     enquire.set_query(Xapian::Query("test"));
+@@ -157,7 +157,7 @@ DEFINE_TESTCASE(tfidfweight3, backend) {
+     mset = enquire.get_mset(0, 10);
+     TEST_EQUAL(mset.size(), 2);
+     mset_expect_order(mset, 2, 4);
+-    TEST_EQUAL_DOUBLE(mset[0].get_weight(), (1 + log(8))); // idfn=1 and so wt=tfn=1+log(tf)
++    TEST_EQUAL_DOUBLE(mset[0].get_weight(), (1 + log((double)8.0))); // idfn=1 and so wt=tfn=1+log(tf)
+     TEST_EQUAL_DOUBLE(mset[1].get_weight(), 1.0);         // idfn=1 and wt=tfn=1+log(tf)=1+log(1)=1
+ 
+     // Check for "snn"
+@@ -194,8 +194,8 @@ DEFINE_TESTCASE(tfidfweight3, backend) {
+     mset = enquire.get_mset(0, 10);
+     TEST_EQUAL(mset.size(), 2);
+     mset_expect_order(mset, 2, 4);
+-    TEST_EQUAL_DOUBLE(mset[0].get_weight(), 8 * log((6 - 2) / 2));
+-    TEST_EQUAL_DOUBLE(mset[1].get_weight(), 1 * log((6 - 2) / 2));
++    TEST_EQUAL_DOUBLE(mset[0].get_weight(), 8 * log(((double)6.0 - 2) / 2));
++    TEST_EQUAL_DOUBLE(mset[1].get_weight(), 1 * log(((double)6.0 - 2) / 2));
+ 
+     return true;
+ }
+-- 
+1.8.3.4
+

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



More information about the devel mailing list