Fixed linking problems with as-needed. See bug #151908.

Package-Manager: portage-2.1.2_pre3-r7

diff --git a/dev-lang/R/ChangeLog b/dev-lang/R/ChangeLog
index bc7d647113098c8a3294d1d191f05a4e4806fcd9..41bf5b963ce5d7cddb0dc7da7db3e83a9355297f 100644 (file)
--- a/dev-lang/R/ChangeLog
+++ b/dev-lang/R/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-lang/R
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/R/ChangeLog,v 1.79 2006/10/22 18:26:25 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/R/ChangeLog,v 1.80 2006/10/24 03:24:26 markusle Exp $
+
+  24 Oct 2006; Markus Dittrich <markusle@gentoo.org>
+  +files/R-2.4.0-as-needed-gentoo.patch, R-2.4.0.ebuild:
+  Fixed linking problems with as-needed. See bug #151908.
 
   22 Oct 2006; Markus Dittrich <markusle@gentoo.org> R-2.4.0.ebuild:
   Append -std=gnu99 to CFLAGS since it is needed to compile

diff --git a/dev-lang/R/Manifest b/dev-lang/R/Manifest
index dd35823252107b977a2cd4175665f05f9b923bed..3bda59aaf3966e3c8cf31ebba0b1e96f090c0274 100644 (file)
--- a/dev-lang/R/Manifest
+++ b/dev-lang/R/Manifest
@@ -2,6 +2,10 @@ AUX R-2.2.0-ifc-configure.patch 524 RMD160 0e56229f6e68c2a6c23d3f8104ae924f7b530
 MD5 8f28d07ba48615d7a496f31db3e9bf4d files/R-2.2.0-ifc-configure.patch 524
 RMD160 0e56229f6e68c2a6c23d3f8104ae924f7b5307b5 files/R-2.2.0-ifc-configure.patch 524
 SHA256 6a255a8f92b9e38619210b78ed26288db6d7177ff1eb47f12ab9528f2ce461e8 files/R-2.2.0-ifc-configure.patch 524
+AUX R-2.4.0-as-needed-gentoo.patch 619 RMD160 54d7a7805e323507f5548c4adcd74cfaeaf9d7a5 SHA1 6c163b049db15d41bd65c31b34f3fd2563b92cf0 SHA256 2e60e38fc66bb1d002fd0cff217ac1b2bbbb1562d5a7db4e5f3af3fcf197cc34
+MD5 32a45e62cfb5d208ce35a4150e2bc6b6 files/R-2.4.0-as-needed-gentoo.patch 619
+RMD160 54d7a7805e323507f5548c4adcd74cfaeaf9d7a5 files/R-2.4.0-as-needed-gentoo.patch 619
+SHA256 2e60e38fc66bb1d002fd0cff217ac1b2bbbb1562d5a7db4e5f3af3fcf197cc34 files/R-2.4.0-as-needed-gentoo.patch 619
 AUX R-logo.png 4867 RMD160 f33e75036a19b78b5bc96124484a750881a9e703 SHA1 6454501d5082e0d6c05f5eaa30922c60ee619d07 SHA256 c022525d4d9303423a2b8b392c21dfe0f9f77f1d5a9b0c135aafb1a832a8595a
 MD5 44015fe4137f1326769e89f2c2c2eda7 files/R-logo.png 4867
 RMD160 f33e75036a19b78b5bc96124484a750881a9e703 files/R-logo.png 4867
@@ -36,14 +40,14 @@ EBUILD R-2.3.1.ebuild 3265 RMD160 bf542f1974c80581c1f7ceb1e7111353082c2561 SHA1
 MD5 74c788e42b171c636dcd8104acf4759c R-2.3.1.ebuild 3265
 RMD160 bf542f1974c80581c1f7ceb1e7111353082c2561 R-2.3.1.ebuild 3265
 SHA256 90387275e9cbe4b9d86e71dcd65df3df674fcfae45aaf2ee6d8f6292a033c1bf R-2.3.1.ebuild 3265
-EBUILD R-2.4.0.ebuild 3373 RMD160 c69501d442fd7c970e8a34ca4287642e329eb833 SHA1 25dd7f8393902db440327311c6b7a38f2503c3a9 SHA256 f9266af58f4ee118bea5e59072a63e67d5a739d159e017bbeac9bd077b80c128
-MD5 ad52c411e9e67186c121cb5a9cf55eeb R-2.4.0.ebuild 3373
-RMD160 c69501d442fd7c970e8a34ca4287642e329eb833 R-2.4.0.ebuild 3373
-SHA256 f9266af58f4ee118bea5e59072a63e67d5a739d159e017bbeac9bd077b80c128 R-2.4.0.ebuild 3373
-MISC ChangeLog 12136 RMD160 6b47d8d1f163d431986672c82b33de93b5ca91cf SHA1 2a2160f6442538d405757ec071383efb9e3f8a19 SHA256 52eefb948de9a3846941136e0941d34170ef48ee6abec4efe3e9885c761c319c
-MD5 07ad148f4bf3741c22308728c74a7dd3 ChangeLog 12136
-RMD160 6b47d8d1f163d431986672c82b33de93b5ca91cf ChangeLog 12136
-SHA256 52eefb948de9a3846941136e0941d34170ef48ee6abec4efe3e9885c761c319c ChangeLog 12136
+EBUILD R-2.4.0.ebuild 3423 RMD160 b0e2d589c510ffd5e5b8a16e3e60dc4b2be40ba8 SHA1 a9e000e3c62216d66df32ff4ec1d9d5820647e81 SHA256 ceeb716a013fd9960583f4df99fd249bdfb9b2db714727ea84d82fdd8a5ad09d
+MD5 b041e3faa8a2eddce9de803a5b98dfb3 R-2.4.0.ebuild 3423
+RMD160 b0e2d589c510ffd5e5b8a16e3e60dc4b2be40ba8 R-2.4.0.ebuild 3423
+SHA256 ceeb716a013fd9960583f4df99fd249bdfb9b2db714727ea84d82fdd8a5ad09d R-2.4.0.ebuild 3423
+MISC ChangeLog 12305 RMD160 e334d56ecf592fb780b88d57625f4aea1a09ffb0 SHA1 3a39edc6be0b715a196aad67b5c4c390f7b9d61a SHA256 f7f8f4bd48740e347acccd049758cacb0a56f57b677162be438ab292a642b267
+MD5 91a757872be786c0ba96d48795d4509e ChangeLog 12305
+RMD160 e334d56ecf592fb780b88d57625f4aea1a09ffb0 ChangeLog 12305
+SHA256 f7f8f4bd48740e347acccd049758cacb0a56f57b677162be438ab292a642b267 ChangeLog 12305
 MISC metadata.xml 156 RMD160 dc078172bfebcb25d69bdf8731714f9cce9d3e36 SHA1 da2b240a255820145b7c83a5c48e45b96b7e9ee6 SHA256 5d22100902db7507a5b5493dd4a66cdb08025faf80a2c0b75e6392315c47f900
 MD5 8c623e53daafa025137077c6b65815bd metadata.xml 156
 RMD160 dc078172bfebcb25d69bdf8731714f9cce9d3e36 metadata.xml 156

diff --git a/dev-lang/R/R-2.4.0.ebuild b/dev-lang/R/R-2.4.0.ebuild
index ba1fdf9df8fc6a397f1f640bd579ec88bf178894..da14bd294e3429ada24e7c85915165b37595b906 100644 (file)
--- a/dev-lang/R/R-2.4.0.ebuild
+++ b/dev-lang/R/R-2.4.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/R/R-2.4.0.ebuild,v 1.2 2006/10/22 18:26:25 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/R/R-2.4.0.ebuild,v 1.3 2006/10/24 03:24:26 markusle Exp $
 
 inherit fortran toolchain-funcs flag-o-matic
 
@@ -55,6 +55,7 @@ pkg_setup() {
 src_unpack() {
        unpack ${A}
        sed -i -e "s:-fpic:-fPIC:g" ${S}/configure
+       epatch "${FILESDIR}"/${P}-as-needed-gentoo.patch
 }
 
 src_compile() {

diff --git a/dev-lang/R/files/R-2.4.0-as-needed-gentoo.patch b/dev-lang/R/files/R-2.4.0-as-needed-gentoo.patch
new file mode 100644 (file)
index 0000000..ececae4
--- /dev/null
+++ b/dev-lang/R/files/R-2.4.0-as-needed-gentoo.patch
@@ -0,0 +1,12 @@
+diff -Naur R-2.4.0/src/modules/lapack/Makefile.in R-2.4.0-new/src/modules/lapack/Makefile.in
+--- R-2.4.0/src/modules/lapack/Makefile.in     2006-09-04 10:41:35.000000000 -0400
++++ R-2.4.0-new/src/modules/lapack/Makefile.in 2006-10-23 22:40:05.000000000 -0400
+@@ -78,7 +78,7 @@
+ ## Include BLAS here, as with (static) ATLAS that pulls all the
+ ## BLAS routines into one place.
+ $(Rlapack_la): $(LIBOBJECTS)
+-      $(DYLIB_LINK) -o $@ $(LIBOBJECTS) @BLAS_LIBS@ $(Rlapack_la_LIBADD)
++      $(DYLIB_LINK) -o $@ $(LIBOBJECTS) @BLAS_LIBS@ $(Rlapack_la_LIBADD) $(FLIBS)
+ 
+ Rlapack_install: $(Rlapack_la) 
+       @$(MKINSTALLDIRS) $(Rexeclibdir)