[csw-devel] SF.net SVN: gar:[8059] csw/mgar/pkg/subversion/trunk

[skayser at users.sourceforge.net]

Revision: 8059
          http://gar.svn.sourceforge.net/gar/?rev=8059&view=rev
Author:   skayser
Date:     2010-01-17 22:42:37 +0000 (Sun, 17 Jan 2010)

Log Message:
-----------
subversion: dropped explicit LDFLAGS in favor of EXTRA_LIB and EXTRA_LINKER_FLAGS, added $ISALIST, updated changelog.CSW

Modified Paths:
--------------
    csw/mgar/pkg/subversion/trunk/Makefile
    csw/mgar/pkg/subversion/trunk/files/changelog.CSW

Modified: csw/mgar/pkg/subversion/trunk/Makefile
===================================================================
--- csw/mgar/pkg/subversion/trunk/Makefile	2010-01-17 22:11:26 UTC (rev 8058)
+++ csw/mgar/pkg/subversion/trunk/Makefile	2010-01-17 22:42:37 UTC (rev 8059)
@@ -7,6 +7,13 @@
 #   list, but they also link against the main libsvn_client-1.so which in
 #   turn pulls in the rest. Can this be tweaked?
 #
+# Known build issues/facts:
+#
+# * Build takes about 50 mins on build8x/build8s
+# * checkpkg suggests CSWbdb over CSWbdb47, because it picks up the
+#   libdb-4.7.so symlink in $(libdir) which belongs to the stub CSWbdb. As
+#   the lib itself belongs to CSWbdb47, the CSWbdb47 dep is completely fine.
+#
 GARNAME = subversion
 GARVERSION = 1.6.6
 CATEGORIES = utils
@@ -116,19 +123,22 @@
 PATCHFILES += subversion161.diff
 PATCHFILES += 0001-make-subversion-sysconfigdir-as-it-should-be-for-csw.patch
 
-EXTRA_LIB = $(SVNLIB) $(prefix)/apache2/lib
-EXTRA_INC = $(prefix)/apache2/include
+SVNLIB     = $(prefix)/lib/svn
+JDK        = /usr/jdk1.5.0_15
 
-JDK = /usr/jdk1.5.0_15
-EXTRA_INC += $(JDK)/include
-SVNLIB = $(prefix)/lib/svn
+EXTRA_INC  = $(JDK)/include
+EXTRA_INC += $(prefix)/apache2/include
 
-NOISALIST = 1
-LDFLAGS  = -R/opt/csw/lib -L/opt/csw/lib -R/opt/csw/apache2/lib 
-LDFLAGS += -L/opt/csw/apache2/lib -L$(SVNLIB) -lintl -liconv 
-LDFLAGS += -R/opt/csw/bdb47/lib -L/opt/csw/bdb47/lib
-export LDFLAGS
+EXTRA_LIB  = /opt/csw/bdb47/lib
+EXTRA_LIB += /opt/csw/apache2/lib
+EXTRA_LIB += $(SVNLIB)
+EXTRA_LINKER_FLAGS = -lintl -liconv
 
+# Only add $ISALIST to dirs which ship optimized versions (done by explicitly
+# excluding those lib dirs which are known not to ship optimized versions).
+RUNPATH_ISALIST  = $(libdir)
+RUNPATH_ISALIST += $(filter-out /opt/csw/apache2/lib $(SVNLIB),$(EXTRA_LIB)) 
+
 EXTRA_MERGE_EXCLUDE_FILES += .*\.pyo .*\.pyc
 PROTOTYPE_MODIFIERS += cswpycompile
 PROTOTYPE_FILES_cswpycompile = $(libdir)/python/.*\.py

Modified: csw/mgar/pkg/subversion/trunk/files/changelog.CSW
===================================================================
--- csw/mgar/pkg/subversion/trunk/files/changelog.CSW	2010-01-17 22:11:26 UTC (rev 8058)
+++ csw/mgar/pkg/subversion/trunk/files/changelog.CSW	2010-01-17 22:42:37 UTC (rev 8059)
@@ -5,5 +5,6 @@
   * Dropped openssl_rt dependency (neon with SSL support is built separately).
   * Dropped kerberos dependency (neon comes with Kerberos support).
   * Dropped libnet dependency (not required).
+  * Re-ordered RUNPATH and introduced $ISALIB for /opt/csw/lib/, /opt/csw/bdb47.
 
  -- Sebastian Kayser <skayser at opencsw.org>  Sun, 17 Jan 2010 02:39:59 +0100


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