SF.net SVN: gar:[22894] csw/mgar/pkg/libserf/trunk/Makefile

[chninkel at users.sourceforge.net]

Revision: 22894
          http://sourceforge.net/p/gar/code/22894
Author:   chninkel
Date:     2014-01-26 00:29:44 +0000 (Sun, 26 Jan 2014)
Log Message:
-----------
libserf/trunk: fix the bad-rpath-entry issue

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

Modified: csw/mgar/pkg/libserf/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libserf/trunk/Makefile	2014-01-25 18:53:34 UTC (rev 22893)
+++ csw/mgar/pkg/libserf/trunk/Makefile	2014-01-26 00:29:44 UTC (rev 22894)
@@ -33,8 +33,6 @@
 RUNTIME_DEP_PKGS_CSWlibserf1-3 += CSWlibaprutil1-0
 RUNTIME_DEP_PKGS_CSWlibserf1-3 += CSWlibssl1-0-0
 RUNTIME_DEP_PKGS_CSWlibserf1-3 += CSWlibz1
-CHECKPKG_OVERRIDES_CSWlibserf1-3 += bad-rpath-entry|/opt/csw/bdb48/lib/|opt/csw/lib/libserf-1.so.1.3.0
-CHECKPKG_OVERRIDES_CSWlibserf1-3 += bad-rpath-entry|/opt/csw/lib/|opt/csw/lib/libserf-1.so.1.3.0
 
 BUILD_DEP_PKGS += CSWscons
 BUILD_DEP_PKGS += CSWlibapr-dev
@@ -52,14 +50,23 @@
 SCONS_FLAGS += APR=$(bindir)/apr-1-config
 SCONS_FLAGS += APU=$(bindir)/apu-1-config
 
+# scons doesn't honor CFLAGS, LDFLAGS... environment variables
+# so we must explicitely pass them as arguments
+SCONS_FLAGS += CFLAGS="$(CFLAGS)" 
+
+# scons expands the $ISADIR variable, so we must do some more
+# escape magics to make sure it is passed as is to the linker
+SCONS_FLAGS += LINKFLAGS="$(subst $$,\\$$\\,$(LD_OPTIONS))"
+
 CHECKPKG_OVERRIDES_CSWlibserf1-3 += shared-lib-pkgname-mismatch|file=opt/csw/lib/libserf-1.so.1.3.0|soname=libserf-1.so.1|pkgname=CSWlibserf1-3|expected=CSWlibserf1-1
 
 include gar/category.mk
 
+
 build-serf:
 	(cd $(WORKSRC); \
 		scons \
-		$(SCONS_FLAGS) LINKFLAGS="$(LD_OPTIONS)" CFLAGS="$(CFLAGS)" PREFIX=$(prefix) )
+		$(SCONS_FLAGS) PREFIX="$(prefix)")
 	@$(MAKECOOKIE)
 
 install-serf:

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