SF.net SVN: gar:[22602] csw/mgar/pkg/apr/trunk

[dmichelsen at users.sourceforge.net]

Revision: 22602
          http://gar.svn.sourceforge.net/gar/?rev=22602&view=rev
Author:   dmichelsen
Date:     2013-11-28 14:27:08 +0000 (Thu, 28 Nov 2013)
Log Message:
-----------
apr/trunk: Update to 1.5.0

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

Modified: csw/mgar/pkg/apr/trunk/Makefile
===================================================================
--- csw/mgar/pkg/apr/trunk/Makefile	2013-11-28 14:18:44 UTC (rev 22601)
+++ csw/mgar/pkg/apr/trunk/Makefile	2013-11-28 14:27:08 UTC (rev 22602)
@@ -1,5 +1,5 @@
 NAME = apr
-VERSION = 1.4.6
+VERSION = 1.5.0
 GARTYPE = v2
 
 DESCRIPTION = Apache Portable Runtime
@@ -16,16 +16,21 @@
 PACKAGES += CSWlibapr1-0
 SPKG_DESC_CSWlibapr1-0 = Apache portable runtime, libapr-1.so.0
 PKGFILES_CSWlibapr1-0 += $(call pkgfiles_lib,libapr-1.so.0)
+RUNTIME_DEP_PKGS_CSWlibapr1-0 += CSWlibuuid1
 OBSOLETED_BY_CSWlibapr1-0 = CSWapr
 
+# This is due to different interpretation of -z ignore
+CHECKPKG_OVERRIDES_CSWlibapr1-0 += surplus-dependency|CSWlibuuid1
+
 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)
+# We must not include -I/opt/csw/include here or the build of apr-util breaks as the system headers
+# are included before the locally build headers.
+# This value goes into /opt/csw/libexec/apr/build-1/apr_rules.mk
+CPPFLAGS =
 
 BUILD64 = 1
 NOISALIST = 1
@@ -35,6 +40,9 @@
 CONFIGURE_ARGS += --enable-other-child
 CONFIGURE_ARGS += --with-installbuilddir=$(libexecdir)/apr/build-1
 
+# Make sure to not link the tests against the installed libraries
+NO_TEST_EXPORTS += LD_OPTIONS
+
 EXTRA_MERGE_DIRS_isa-extra = $(libexecdir)
 
 include gar/category.mk

Modified: csw/mgar/pkg/apr/trunk/checksums
===================================================================
--- csw/mgar/pkg/apr/trunk/checksums	2013-11-28 14:18:44 UTC (rev 22601)
+++ csw/mgar/pkg/apr/trunk/checksums	2013-11-28 14:27:08 UTC (rev 22602)
@@ -1 +1 @@
-76cc4457fbb71eefdafa27dba8f511fb  apr-1.4.6.tar.gz
+6419a8f7e89ad51b5bad7b0c84cc818c  apr-1.5.0.tar.gz

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