Add -Wl,-rpath-link,. to LDFLAGS (bug 167939 comment 11).

Package-Manager: portage-2.1.2.2

3 files changed, 25 insertions, 12 deletions

diff --git a/net-libs/wvstreams/ChangeLog b/net-libs/wvstreams/ChangeLog
index 06412d14f4ec..dcad19c1aae2 100644
--- a/net-libs/wvstreams/ChangeLog
+++ b/net-libs/wvstreams/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-libs/wvstreams
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/wvstreams/ChangeLog,v 1.99 2007/03/12 15:54:55 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/wvstreams/ChangeLog,v 1.100 2007/03/14 11:11:19 mrness Exp $
+
+  14 Mar 2007; Alin Năstac <mrness@gentoo.org>
+  files/wvstreams-4.3-as-needed.patch:
+  Add -Wl,-rpath-link,. to LDFLAGS (bug 167939 comment 11).
 
 *wvstreams-4.3 (12 Mar 2007)
 
diff --git a/net-libs/wvstreams/Manifest b/net-libs/wvstreams/Manifest
index 7e46e9aac865..cb015c4dded6 100644
--- a/net-libs/wvstreams/Manifest
+++ b/net-libs/wvstreams/Manifest
@@ -45,10 +45,10 @@ AUX wvstreams-4.3-MOC-fix.patch 488 RMD160 94b8dea2b2bf2c634173906e29b4bb1a7f4a5
 MD5 aecda7bb5ad7f28ad2a12e4c10bb84d7 files/wvstreams-4.3-MOC-fix.patch 488
 RMD160 94b8dea2b2bf2c634173906e29b4bb1a7f4a51d8 files/wvstreams-4.3-MOC-fix.patch 488
 SHA256 f80cb4f43c80bcf256d397e72d0bf45f98e3bc93d93c2b37d0eb98caacfc94be files/wvstreams-4.3-MOC-fix.patch 488
-AUX wvstreams-4.3-as-needed.patch 1805 RMD160 05b70f9280a0592bd2effcf60988d3c7732df447 SHA1 ba428bbfc676b3059bbbcbfded294c5d540ef741 SHA256 147ddb92fc82ff034d5d2e896b9db897b6c4bbcd8e176dcc68729af624a51025
-MD5 d556456abed0a55f709b1ab7810047dd files/wvstreams-4.3-as-needed.patch 1805
-RMD160 05b70f9280a0592bd2effcf60988d3c7732df447 files/wvstreams-4.3-as-needed.patch 1805
-SHA256 147ddb92fc82ff034d5d2e896b9db897b6c4bbcd8e176dcc68729af624a51025 files/wvstreams-4.3-as-needed.patch 1805
+AUX wvstreams-4.3-as-needed.patch 2138 RMD160 605dd8ff79c14eb5e02e38a8396fec8928ed290b SHA1 9f63e284fb6cd0927e726c99440dfe2e4a6719f6 SHA256 414bb5c1608b416a6f18b1a7b661fbe384b54e6fe8b1033c95b5ea655bc6785b
+MD5 07d91169f43ae96adf919c3e1f19a1a3 files/wvstreams-4.3-as-needed.patch 2138
+RMD160 605dd8ff79c14eb5e02e38a8396fec8928ed290b files/wvstreams-4.3-as-needed.patch 2138
+SHA256 414bb5c1608b416a6f18b1a7b661fbe384b54e6fe8b1033c95b5ea655bc6785b files/wvstreams-4.3-as-needed.patch 2138
 AUX wvstreams-4.3-external-xplc.patch 1205 RMD160 9f6097f47c234b3ce2adc0f1b667fab4d8a31520 SHA1 265e6f194d45292c9a23a6aacb695ea628ab333f SHA256 e369bb507059aa6087b42ccfc2bee7f8c9a6b9a7872f71a6f4296836f453930a
 MD5 11211b97d0560d12f76b5431a95e9c95 files/wvstreams-4.3-external-xplc.patch 1205
 RMD160 9f6097f47c234b3ce2adc0f1b667fab4d8a31520 files/wvstreams-4.3-external-xplc.patch 1205
@@ -87,10 +87,10 @@ EBUILD wvstreams-4.3.ebuild 2428 RMD160 1df38d7e78513f7f9c0c3e31759a30a263305c70
 MD5 849b876072d6d716c619cbab4fccf7a8 wvstreams-4.3.ebuild 2428
 RMD160 1df38d7e78513f7f9c0c3e31759a30a263305c70 wvstreams-4.3.ebuild 2428
 SHA256 b55462b31f24f96222c42d6375c4a4b5121d95b6762923d758e1f3bcc33b14b0 wvstreams-4.3.ebuild 2428
-MISC ChangeLog 16523 RMD160 3bdaefec89a22cabe05bd36bd2efde85c6081463 SHA1 74c68cdacedaadb28a5a491d937ac324a0b82f2e SHA256 8b63a84dd389bd275aa6ca7b18eea04c8509ab1a1fba758776fa64c04a03cfb2
-MD5 3c984cfeef5c55e8cb73f0b6e05b51b2 ChangeLog 16523
-RMD160 3bdaefec89a22cabe05bd36bd2efde85c6081463 ChangeLog 16523
-SHA256 8b63a84dd389bd275aa6ca7b18eea04c8509ab1a1fba758776fa64c04a03cfb2 ChangeLog 16523
+MISC ChangeLog 16672 RMD160 bcdfe36f4a06699289e8a2623c08e18ddabaf605 SHA1 2a59453d1d088c25817b975632076ec1a8ec7acc SHA256 f324c0ce34024d32006fdbfafdec7c7a5da02156633f498faffacf0bdae369cc
+MD5 ea8e14313c6a3db1a4eae32407a893b3 ChangeLog 16672
+RMD160 bcdfe36f4a06699289e8a2623c08e18ddabaf605 ChangeLog 16672
+SHA256 f324c0ce34024d32006fdbfafdec7c7a5da02156633f498faffacf0bdae369cc ChangeLog 16672
 MISC metadata.xml 313 RMD160 e543c31d8ddc948a387dcdcc8638a848c587177b SHA1 a40d5fd17e50dc9f983efc63e5cbb8b407b95c7a SHA256 1ec30d4508abc443f3e9c4829b0e7d7e5c588419344203476818a29f71b98a37
 MD5 227de7f678ad662524292836709de75f metadata.xml 313
 RMD160 e543c31d8ddc948a387dcdcc8638a848c587177b metadata.xml 313
@@ -110,7 +110,7 @@ SHA256 e3bb902f085262bd9e556d98911fdf2940e54befc15a71c88e4eb726df6a1692 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.3 (GNU/Linux)
 
-iD8DBQFF9XfdJnxX6mF440QRAjHoAKC6WbJLmcm39vh1o0MlPdAkDNtckACg61hm
-uKIGZdcUuaLfqMvTuIUxV/Q=
-=sLWd
+iD8DBQFF99hjJnxX6mF440QRAhYSAJ90Z1TyYTGzwpYl7xVOgtrBUxArxACfTF1U
+tbFBNTvHBItR9ELsWO+KwoI=
+=bDGv
 -----END PGP SIGNATURE-----
diff --git a/net-libs/wvstreams/files/wvstreams-4.3-as-needed.patch b/net-libs/wvstreams/files/wvstreams-4.3-as-needed.patch
index 3e1f205a73c4..3088abc72f0f 100644
--- a/net-libs/wvstreams/files/wvstreams-4.3-as-needed.patch
+++ b/net-libs/wvstreams/files/wvstreams-4.3-as-needed.patch
@@ -25,6 +25,15 @@ diff -Nru wvstreams-4.3.orig/configure.ac wvstreams-4.3/configure.ac
 diff -Nru wvstreams-4.3.orig/wvrules.mk wvstreams-4.3/wvrules.mk
 --- wvstreams-4.3.orig/wvrules.mk	2007-02-07 21:06:17.000000000 +0200
 +++ wvstreams-4.3/wvrules.mk	2007-03-12 13:59:25.000000000 +0200
+@@ -60,7 +60,7 @@
+                  -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
+ CFLAGS += $(COPTS) $(C_AND_CXX_FLAGS)
+ CXXFLAGS += $(CXXOPTS) $(C_AND_CXX_FLAGS)
+-LDFLAGS += $(LDOPTS) -L$(WVSTREAMS_LIB)
++LDFLAGS += $(LDOPTS) -L$(WVSTREAMS_LIB) -Wl,-rpath-link,$(WVSTREAMS_LIB)
+
+ # Default compiler we use for linking
+ WVLINK_CC = gcc
 @@ -272,7 +272,7 @@
  %.so: SONAME=$@$(if $(SO_VERSION),.$(SO_VERSION))
  wvsoname=$(if $($1-SONAME),$($1-SONAME),$(if $(SONAME),$(SONAME),$1))