[csw-devel] SF.net SVN: gar:[9473] csw/mgar/pkg/neon/trunk/Makefile

[dmichelsen at users.sourceforge.net]

Revision: 9473
          http://gar.svn.sourceforge.net/gar/?rev=9473&view=rev
Author:   dmichelsen
Date:     2010-03-30 14:23:59 +0000 (Tue, 30 Mar 2010)

Log Message:
-----------
neon: Readd runtime path

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

Modified: csw/mgar/pkg/neon/trunk/Makefile
===================================================================
--- csw/mgar/pkg/neon/trunk/Makefile	2010-03-30 13:57:07 UTC (rev 9472)
+++ csw/mgar/pkg/neon/trunk/Makefile	2010-03-30 14:23:59 UTC (rev 9473)
@@ -121,12 +121,6 @@
 FEATURES_libneon64.27 += libneon-minimal.so.27.2.3
 FEATURES_libneon64.27 += libneon-full.so.27.2.3
 
-# This is ok as the AUX pulls in the specific lib which returns the generic SONAME
-CHECKPKG_OVERRIDES_CSWneon += soname-not-found|libneon-minimal.so.27.2.3
-CHECKPKG_OVERRIDES_CSWneon += soname-not-found|libneon-minimal.so.27.2.3
-CHECKPKG_OVERRIDES_CSWneon += soname-not-found|libneon-minimal.so.26.0.4
-CHECKPKG_OVERRIDES_CSWneon += soname-not-found|libneon-minimal.so.26.0.4
-
 # This comes from krb5-config --libs
 CHECKPKG_OVERRIDES_CSWneonfull += bad-rpath-entry|/opt/csw/lib/
 
@@ -156,6 +150,7 @@
 		ld $(_LDFLAGS-$(MEMORYMODEL_$(lastword $(subst /, ,$(dir $(firstword $(FEATURES_$L))))))) \
 			-G -h $(word 2,$(FEATURES_$L)) -o $(WORKDIR)/stub-$(notdir $(firstword $(FEATURES_$L))) $(WORKDIR)/empty$(MEMORYMODEL_$(lastword $(subst /, ,$(dir $(firstword $(FEATURES_$L)))))).o;\
 		ld $(_LDFLAGS-$(MEMORYMODEL_$(lastword $(subst /, ,$(dir $(firstword $(FEATURES_$L))))))) \
+			-R $(patsubst %/,%,$(dir $(firstword $(FEATURES_$L)))) \
 			-G -h `/usr/ccs/bin/dump -Lv $(dir $(firstword $(FEATURES_$L)))/$(word 2,$(FEATURES_$L)) | awk '$$2 == "SONAME" { print $$3 }'` \
 			-o $(PKGROOT)$(firstword $(FEATURES_$L)) \
 			$(foreach F,$(wordlist 3,$(words $(FEATURES_$L)),$(FEATURES_$L)),-f $F) \


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