[csw-devel] SF.net SVN: gar:[10821] csw/mgar/pkg/apr-util/trunk

[dmichelsen at users.sourceforge.net]

Revision: 10821
          http://gar.svn.sourceforge.net/gar/?rev=10821&view=rev
Author:   dmichelsen
Date:     2010-08-27 09:57:42 +0000 (Fri, 27 Aug 2010)

Log Message:
-----------
apr-util: More work towards 32/64

Modified Paths:
--------------
    csw/mgar/pkg/apr-util/trunk/Makefile
    csw/mgar/pkg/apr-util/trunk/checksums

Added Paths:
-----------
    csw/mgar/pkg/apr-util/trunk/files/0001-Make-sure-to-find-newly-built-libs-earlier.patch

Modified: csw/mgar/pkg/apr-util/trunk/Makefile
===================================================================
--- csw/mgar/pkg/apr-util/trunk/Makefile	2010-08-27 09:10:27 UTC (rev 10820)
+++ csw/mgar/pkg/apr-util/trunk/Makefile	2010-08-27 09:57:42 UTC (rev 10821)
@@ -11,29 +11,43 @@
 
 MASTER_SITES  = http://apache.crihan.fr/dist/apr/
 DISTFILES  = $(GARNAME)-$(GARVERSION).tar.gz
-LICENSE = LICENSE
+
+PATCHFILES = 0001-Make-sure-to-find-newly-built-libs-earlier.patch
+
+PACKAGES = CSWar-util
 CATALOGNAME = apr_util
 
+LICENSE = LICENSE
+
 RUNTIME_DEP_PKGS = CSWapr CSWiconv CSWsqlite3rt CSWunixodbc CSWexpat
-RUNTIME_DEP_PKGS += CSWbdb48 CSWoldaprt
+RUNTIME_DEP_PKGS += CSWbdb47 CSWoldaprt CSWosslrt CSWsasl CSWlibnet
 
 # We define upstream file regex so we can be notifed of new upstream software release
 UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz
 
-# We need this to get bdb48/lib into the runpath
-EXTRA_LIB = $(prefix)/bdb48/lib
+# We need this to get bdb47/lib into the runpath
+EXTRA_LIB = $(prefix)/bdb47/lib
 
+# It looks like Solars 9 x86 has a problem with libuuid, investigate later:
+# testing9x# cd /usr/lib
+# testing9x# ls -l libuuid*
+# -rwxr-xr-x   1 root     bin        22344 Dec 23  2004 libuuid.so.1
+# testing9x# ln -s libuuid.so.1 libuuid.so
+
+NOISALIST = 1
 CONFIGURE_ARGS = $(DIRPATHS)
-CONFIGURE_ARGS += --with-apr=$(prefix)/bin/apr-1-config
+CONFIGURE_ARGS += --with-apr=$(bindir)/apr-1-config
 CONFIGURE_ARGS += --with-ldap
-CONFIGURE_ARGS += --with-berkeley-db=/opt/csw/bdb48
+CONFIGURE_ARGS += --with-berkeley-db=/opt/csw/bdb47
 CONFIGURE_ARGS += --without-freetds --without-sqlite2
 
 #BUILD64 = 1
 #reason is that no sparcv9 binaries are built for some reason and checkpkg suggests:
 #CHECKPKG_OVERRIDES_CSWapr-util += binary-disallowed-placement|file=opt/csw/lib/sparcv9/libaprutil-1.so.0.3.9|arch_id=2|arch_name=sparcv8|bad_path=sparcv9
+# dam: The reason is the files are actually built as sparcv8, because we don't have a separate
+#   /opt/csw/share/build-1/apr_rules.mk
+# for 32 and 64 bit. We need to inspire us from
+#   http://cvs.opensolaris.org/source/xref/sfw/usr/src/cmd/apr/apr-1.3/Makefile.sfw
+# for some unification.
 
-
-STRIP_LIBTOOL = 1
-
 include gar/category.mk

Modified: csw/mgar/pkg/apr-util/trunk/checksums
===================================================================
--- csw/mgar/pkg/apr-util/trunk/checksums	2010-08-27 09:10:27 UTC (rev 10820)
+++ csw/mgar/pkg/apr-util/trunk/checksums	2010-08-27 09:57:42 UTC (rev 10821)
@@ -1,9 +1,2 @@
-d35666b332b173698383deec8e56e1b3  CSWaprutil-devel.depend
-963516b990780cf17616ba32673443a6  CSWaprutil-devel.gspec
-094f42b8b66199c1047d9828a82249e4  CSWaprutil-devel.prototype
-4447f1d66b43786a4c123f75c1d16962  CSWaprutil.depend
-1e0b81300c99eacfda07803e345ac3d7  CSWaprutil.gspec
-d1a6d531eef93140a3aebe1e96803b09  CSWaprutil.prototype
+aed0c105d6c9c1afb7a14bd80ed0c173  0001-Make-sure-to-find-newly-built-libs-earlier.patch
 cc2ec0ba4f01d88375f1170f762518fa  apr-util-1.3.9.tar.gz
-f25418280a6214bcf0af804fcef4c950  config.layout
-2aec82eff00f526a0f2e4c1380a3541e  iconv.diff

Added: csw/mgar/pkg/apr-util/trunk/files/0001-Make-sure-to-find-newly-built-libs-earlier.patch
===================================================================
--- csw/mgar/pkg/apr-util/trunk/files/0001-Make-sure-to-find-newly-built-libs-earlier.patch	                        (rev 0)
+++ csw/mgar/pkg/apr-util/trunk/files/0001-Make-sure-to-find-newly-built-libs-earlier.patch	2010-08-27 09:57:42 UTC (rev 10821)
@@ -0,0 +1,25 @@
+From 616e65579de39c6065233d09837bc84e747dd2b5 Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Mon, 23 Aug 2010 11:24:04 +0200
+Subject: [PATCH] Make sure to find newly built libs earlier
+
+---
+ test/Makefile.in |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/test/Makefile.in b/test/Makefile.in
+index 97ff49b..55d254a 100644
+--- a/test/Makefile.in
++++ b/test/Makefile.in
+@@ -73,7 +73,7 @@ check: $(TESTALL_COMPONENTS) $(STDTEST_PORTABLE) $(STDTEST_NONPORTABLE)
+ 				fi; \
+ 			done; \
+ 	        else \
+-			@apr_shlibpath_var@="`echo "../dbm/.libs:../dbd/.libs:../ldap/.libs:$$@apr_shlibpath_var@" | sed -e 's/::*$$//'`" \
++			@apr_shlibpath_var@="`echo "../.libs:../dbm/.libs:../dbd/.libs:../ldap/.libs:$$@apr_shlibpath_var@" | sed -e 's/::*$$//'`" \
+ 			./$$prog; \
+ 			status=$$?; \
+ 			if test $$status != 0; then \
+-- 
+1.7.1
+


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