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

[dmichelsen at users.sourceforge.net]

Revision: 15165
          http://gar.svn.sourceforge.net/gar/?rev=15165&view=rev
Author:   dmichelsen
Date:     2011-07-20 14:44:30 +0000 (Wed, 20 Jul 2011)

Log Message:
-----------
apr: Rip out old stuff, split packages

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

Removed Paths:
-------------
    csw/mgar/pkg/apr/trunk/files/0001-Force-newly-built-libs-in-testsuite.patch

Modified: csw/mgar/pkg/apr/trunk/Makefile
===================================================================
--- csw/mgar/pkg/apr/trunk/Makefile	2011-07-20 14:35:43 UTC (rev 15164)
+++ csw/mgar/pkg/apr/trunk/Makefile	2011-07-20 14:44:30 UTC (rev 15165)
@@ -12,41 +12,29 @@
 MASTER_SITES = http://apache.crihan.fr/dist/apr/
 DISTFILES  = $(NAME)-$(VERSION).tar.gz
 LICENSE = LICENSE
-PATCHFILES = 0001-Force-newly-built-libs-in-testsuite.patch
 
+PACKAGES += CSWlibapr1-0
+SPKG_DESC_CSWlibapr1-0 = Apache portable runtime, libapr-1.so.0
+PKGFILES_CSWlibapr1-0 += $(call pkgfiles_lib,libapr-1.so.0)
+OBSOLETED_BY_CSWlibapr1-0 = CSWapr
+
+PACKAGES += CSWlibapr-dev
+SPKG_DESC_CSWlibapr-dev = Development file for libapr-1.so.0
+# PKGFILES is catchall
+RUNTIME_DEP_PKGS_CSWlibapr-dev += CSWlibapr1-0
+
+# We don't need it and if defined the test breaks
+LD_OPTIONS =
+EXTRA_LINKER_FLAGS = $(RUNPATH_LINKER_FLAGS)
+
 BUILD64 = 1
 
 CONFIGURE_ARGS = $(DIRPATHS)
 CONFIGURE_ARGS += --enable-threads
 CONFIGURE_ARGS += --enable-other-child
 
-TEST_TARGET = check
-
-# Make sure for the tests the local libs are preferred, especially for 'testall'.
-# Otherwise these tests are failing:
-#
-# testfmt             : \Line 52: expected <0>, but saw <%ld>
-# \Line 74: expected <0>, but saw <%ld>
-# /Line 85: expected <14000000>, but saw <%lu>
-# \Line 96: expected <d59f80>, but saw <%lx>
-# |Line 108: expected <-42>, but saw <%ld>
-# FAILED 5 of 9
-
-LD_LIBRARY_PATH=../.lib
-export LD_LIBRARY_PATH
-EXTRA_TEST_EXPORTS = LD_LIBRARY_PATH
-
-# TBD: This is dependent on 32/64, make sure to have both in separate pathes:
-#   /opt/csw/share/build-1/apr_rules.mk
-
-CHECKPKG_OVERRIDES_CSWapr += shared-lib-package-contains-so-symlink|file=/opt/csw/lib/sparcv9/libapr-1.so
-CHECKPKG_OVERRIDES_CSWapr += shared-lib-package-contains-so-symlink|file=/opt/csw/lib/libapr-1.so
-CHECKPKG_OVERRIDES_CSWapr += shared-lib-pkgname-mismatch
-CHECKPKG_OVERRIDES_CSWapr += shared-lib-package-contains-so-symlink|file=/opt/csw/lib/sparcv9/libapr-1.so
-CHECKPKG_OVERRIDES_CSWapr += shared-lib-package-contains-so-symlink|file=/opt/csw/lib/libapr-1.so
-CHECKPKG_OVERRIDES_CSWapr += file-with-bad-content|/usr/local|root/opt/csw/share/build-1/libtool
-CHECKPKG_OVERRIDES_CSWapr += shared-lib-package-contains-so-symlink|file=/opt/csw/lib/amd64/libapr-1.so
-CHECKPKG_OVERRIDES_CSWapr += shared-lib-package-contains-so-symlink|file=/opt/csw/lib/amd64/libapr-1.so
-
 include gar/category.mk
 
+post-install-modulated:
+	perl -pi -e 's,/usr/local/lib,$(libdir),g' \
+		$(DESTDIR)/opt/csw/share/build-1/libtool

Deleted: csw/mgar/pkg/apr/trunk/files/0001-Force-newly-built-libs-in-testsuite.patch
===================================================================
--- csw/mgar/pkg/apr/trunk/files/0001-Force-newly-built-libs-in-testsuite.patch	2011-07-20 14:35:43 UTC (rev 15164)
+++ csw/mgar/pkg/apr/trunk/files/0001-Force-newly-built-libs-in-testsuite.patch	2011-07-20 14:44:30 UTC (rev 15165)
@@ -1,25 +0,0 @@
-From 7cb4c8dbf352acddec4c68d53cfa4633ba80c61d Mon Sep 17 00:00:00 2001
-From: Dagobert Michelsen <dam at opencsw.org>
-Date: Sat, 14 Aug 2010 23:27:50 +0200
-Subject: [PATCH] Force newly built libs in testsuite
-
----
- test/Makefile.in |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/test/Makefile.in b/test/Makefile.in
-index b371074..63b3d35 100644
---- a/test/Makefile.in
-+++ b/test/Makefile.in
-@@ -162,7 +162,7 @@ check: $(TESTALL_COMPONENTS) $(STDTEST_PORTABLE) $(STDTEST_NONPORTABLE)
- 	teststatus=0; \
- 	progfailed=""; \
- 	for prog in $(STDTEST_PORTABLE) $(STDTEST_NONPORTABLE); do \
--		./$$prog; \
-+		LD_LIBRARY_PATH=../.libs ./$$prog; \
- 		status=$$?; \
- 		if test $$status != 0; then \
- 			teststatus=$$status; \
--- 
-1.7.1
-


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