diff options
author | sbd <sbd> | 2011-10-17 07:56:57 +0000 |
---|---|---|
committer | sbd <sbd> | 2011-10-17 07:56:57 +0000 |
commit | 2f8e3ee25c4cf3c1b8b7048a27a701ddd4c041ce (patch) | |
tree | d8c2ccbb6508af2516d5504f7479a974b64a39ed /devel/poco | |
parent | fecff9d8ce00f40430386f11b236ab0947827493 (diff) | |
download | pkgsrc-2f8e3ee25c4cf3c1b8b7048a27a701ddd4c041ce.tar.gz |
Build a full set of shared library search paths on Linux just like "FreeBSD".
Diffstat (limited to 'devel/poco')
-rw-r--r-- | devel/poco/distinfo | 3 | ||||
-rw-r--r-- | devel/poco/patches/patch-build_config_Linux | 34 |
2 files changed, 36 insertions, 1 deletions
diff --git a/devel/poco/distinfo b/devel/poco/distinfo index 09a32cb1900..e3665d2e003 100644 --- a/devel/poco/distinfo +++ b/devel/poco/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.4 2011/10/17 02:10:31 schnoebe Exp $ +$NetBSD: distinfo,v 1.5 2011/10/17 07:56:57 sbd Exp $ SHA1 (poco-1.4.2p1-all.tar.gz) = ef1bc69812179b7856c88aa4b5c157747c0a0e48 RMD160 (poco-1.4.2p1-all.tar.gz) = 8288c10e3e96de26f56296da0bbbebff58b8b424 @@ -13,3 +13,4 @@ SHA1 (patch-af) = 50a86be83634ede278f7a8463423e2f88a1741a7 SHA1 (patch-ag) = 945a594376393462e1cc0f881532d2294adf5816 SHA1 (patch-ah) = f8debbf7b416fc562f5af321be739e0d4481a130 SHA1 (patch-ai) = 9feef00a05372578d957c68b53657e6468f65f6a +SHA1 (patch-build_config_Linux) = ba79d12efeea09e0e24e0d95a457dcbce265cd75 diff --git a/devel/poco/patches/patch-build_config_Linux b/devel/poco/patches/patch-build_config_Linux new file mode 100644 index 00000000000..7aafe174432 --- /dev/null +++ b/devel/poco/patches/patch-build_config_Linux @@ -0,0 +1,34 @@ +$NetBSD: patch-build_config_Linux,v 1.1 2011/10/17 07:56:57 sbd Exp $ + +# Build a full set of shared library search paths, rather than +# *assuming* everything is under PREFIX. + +--- build/config/Linux.orig 2010-12-16 05:43:24.000000000 +0000 ++++ build/config/Linux +@@ -21,6 +21,8 @@ LINK = $(CXX) + LIB = ar -cr + RANLIB = ranlib + SHLIB = $(CXX) -shared -Wl,-soname,$(notdir $@) -o $@ ++SHLIBFLAGS = $(LDFLAGS) -Wl,-R$(POCO_PREFIX)/lib \ ++ $(foreach p,$(sort $(POCO_ADD_LIBRARY)),-L$(p) -Wl,-R$(p)) + SHLIBLN = $(POCO_BASE)/build/script/shlibln + STRIP = strip + DEP = $(POCO_BASE)/build/script/makedepend.gcc +@@ -44,7 +46,7 @@ CFLAGS64 = + CXXFLAGS = -Wall -Wno-sign-compare + CXXFLAGS32 = + CXXFLAGS64 = +-LINKFLAGS = ++LINKFLAGS = $(LDFLAGS) + LINKFLAGS32 = + LINKFLAGS64 = + STATICOPT_CC = +@@ -52,7 +54,7 @@ STATICOPT_CXX = + STATICOPT_LINK = -static + SHAREDOPT_CC = -fPIC + SHAREDOPT_CXX = -fPIC +-SHAREDOPT_LINK = -Wl,-rpath,$(LIBPATH) ++SHAREDOPT_LINK = -Wl,-rpath,$(POCO_PREFIX)/lib -L$(LIBPATH) + DEBUGOPT_CC = -g -D_DEBUG + DEBUGOPT_CXX = -g -D_DEBUG + DEBUGOPT_LINK = -g |