Use linker scripts like e2fsprogs #225297 by Mart Raudsepp.

Package-Manager: portage-2.2_pre7-r1/cvs/Linux 2.6.25 AMD Athlon(tm) 64 X2 Dual Core Processor 4200+

3 files changed, 26 insertions, 4 deletions

diff --git a/sys-libs/ss/ChangeLog b/sys-libs/ss/ChangeLog
index d431b1b910f7..ee3a6241392a 100644
--- a/sys-libs/ss/ChangeLog
+++ b/sys-libs/ss/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sys-libs/ss
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/ss/ChangeLog,v 1.64 2008/06/08 12:13:10 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/ss/ChangeLog,v 1.65 2008/06/09 02:31:16 vapier Exp $
+
+  09 Jun 2008; Mike Frysinger <vapier@gentoo.org> ss-1.40.10.ebuild:
+  Use linker scripts like e2fsprogs #225297 by Mart Raudsepp.
 
   08 Jun 2008; nixnut <nixnut@gentoo.org> ss-1.40.9.ebuild:
   Stable on ppc wrt bug 225239
diff --git a/sys-libs/ss/Manifest b/sys-libs/ss/Manifest
index 7c2416e3e1e7..3b7a1c86fe22 100644
--- a/sys-libs/ss/Manifest
+++ b/sys-libs/ss/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX ss-1.39-makefile.patch 307 RMD160 1d0e083be1515512a1ebba6943ad5c6adcbe5efd SHA1 3a9e057d5b9e012eaa885db3ce83658a66ee7b4f SHA256 4a844e8ebb82fbaf528280b915067045b9906b423a6a9f3ef38046ade3667fd5
 AUX ss-1.40.3-check.patch 863 RMD160 71abaf5876650be3031d668fd534c22255ba1e0a SHA1 2ab5182403e6ac1162ce6e6568e1ea773320360b SHA256 faa9c41da76cf91c704220b6b293f2e8888ff65c615fe469ea6c12becc97b01c
 AUX ss-1.40.4-check.patch 382 RMD160 0bf0d8837b1c9491a6b722692f150718f3812542 SHA1 4e203f899553fadc30aedb8dbafb48279db66f1d SHA256 2c6723c583d0e1b2fb01b944bb61dcfe08024974b2cd0726c4b47bc32bd4c884
@@ -6,10 +9,17 @@ DIST e2fsprogs-1.40.4.tar.gz 4048867 RMD160 053556aab3de6ffffe5ab5981f436d4cdf9d
 DIST e2fsprogs-1.40.6.tar.gz 4072124 RMD160 deaa6e316efb5d91be42a8c1c21686203f5dd6a0 SHA1 b1f422a5527f437516d5b68a8fe9a3e398b66d2c SHA256 b5fb67fb6b4f85fdf3256b1c2f9d9473e018d4fd5af0c50b1030ad794160c11e
 DIST e2fsprogs-1.40.8.tar.gz 4102707 RMD160 6a212b0aaa3ae4f9b1ba99a914df5c688ad452f5 SHA1 9410c11fc8be1cba435f24d086d154526dc42a77 SHA256 38df70f8b5ba121b11b02101cc399306a199d3c66c8185d8a2c0d07f5688eead
 DIST e2fsprogs-1.40.9.tar.gz 4092812 RMD160 1cc51cb1b4bdcb338a2fdff50c79f38fb6e09eef SHA1 c584e9a8d3c444f42f4c0a786bb94f4a00ea2b48 SHA256 ab6852230dcb30d75f640125a5d0c7b496bbc31502afdb76528e3bcd4089c9e4
-EBUILD ss-1.40.10.ebuild 1826 RMD160 ab234389433ce5633a9642800de6814ad0ce511f SHA1 e4da2a3c694cb13bacb0aabc8f34bd04e603cf12 SHA256 fba0cf323948f11d0551197431c51a5d346595ebcd1c3ee40cee9cabcedaa85d
+EBUILD ss-1.40.10.ebuild 2201 RMD160 a8c02d6145a43b9118fc06a92712f38837839cc4 SHA1 2abdaa1c528a52251bf312f8903768e98918fd6b SHA256 fe4d3f6ef1930b0841e1f43000402df0e6ab2d65fb41f85c75a035beba377d8d
 EBUILD ss-1.40.4.ebuild 1843 RMD160 af9c68a2e3156df156543d5897c4e567f0f02d74 SHA1 5d1524483951d7051aefc66145784c9a99640e41 SHA256 5ff15d8cb90d0f8e289b0264112d19ed0bd3a0e22a11bad377c512e1be98fba8
 EBUILD ss-1.40.6.ebuild 1790 RMD160 e92e45c676b77ab767f757c5319455a58d8bffe8 SHA1 88517d37af2c6787a88a5a4c9efe46762f9cb001 SHA256 0d338433194e62d12b1f6239e47e23ec471bc377bc827a675a88af0d105afae7
 EBUILD ss-1.40.8.ebuild 2011 RMD160 d979a2d23b7e3b93687afbebb51874b701ac15ce SHA1 f185ea2f7dc40330fb69837640fce2882141cefc SHA256 a097b7d127d6d25171134caac0c6debc78d84e2bae753abf600347eac7f8b4c2
 EBUILD ss-1.40.9.ebuild 2013 RMD160 64a858be3039b23159b8bf09dbc2d91defcbe7e7 SHA1 b02b8524dd2ac34c374c3778f3090f0ec2c8b102 SHA256 7e873a22f1b6a541c3c98cd1ebf2d21cf6bd985eabcded963753386f6db7a164
-MISC ChangeLog 7277 RMD160 bcb82fe154dfb2e7592e89b8962efb96a8704789 SHA1 1e426a0fcbacc4af93927434442d327ed0297a40 SHA256 8fbd048ec613ee9236d93f5e161d6866e1f02ba2d8b6a06704657157fafca724
+MISC ChangeLog 7409 RMD160 0d7584e8349011e06ae0c6419587810dda2c9b8d SHA1 0873ebd6c18fd6074c45df9df470cf38ff2026c8 SHA256 f84069c5d8c3a7ffc0268217dcb529168306c1a427183c2c1f2079f83e8cfc21
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFITJX8j9hvisErhMIRAghSAKCc8w6nIanc8n6CoQivCaeI+c9XKACg0vxg
+o0HZ2prFxBmdE9ol5usXcIY=
+=etf+
+-----END PGP SIGNATURE-----
diff --git a/sys-libs/ss/ss-1.40.10.ebuild b/sys-libs/ss/ss-1.40.10.ebuild
index 601cc26aca60..37ad922cc5ab 100644
--- a/sys-libs/ss/ss-1.40.10.ebuild
+++ b/sys-libs/ss/ss-1.40.10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/ss/ss-1.40.10.ebuild,v 1.2 2008/06/07 16:39:18 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/ss/ss-1.40.10.ebuild,v 1.3 2008/06/09 02:31:16 vapier Exp $
 
 inherit eutils flag-o-matic toolchain-funcs multilib
 
@@ -32,6 +32,15 @@ src_unpack() {
 
 	# make sure we error out if com_err is attempted to be built
 	rm -f lib/et/*.c
+	# since we've split out com_err/ss into their own ebuilds, we
+	# need to fake out the local files.  let the toolchain find them.
+	mkdir tc || die
+	echo "GROUP ( libcom_err.a )" > tc/libcom_err.a
+	echo "GROUP ( libcom_err.so )" > tc/libcom_err.so
+	sed -i \
+		-e '/^LIBCOM_ERR/s:$(LIB):$(top_builddir)/tc:' \
+		MCONFIG.in || die
+	ln -s $(type -P compile_et) lib/et/compile_et
 }
 
 src_compile() {