Add linker script to fix newer gcc only linking to static lib if .so's in

/lib and .a in /usr/lib, bug #4411. Do not use absolute symlink for libtool
linker script.

Package-Manager: portage-2.0.51.22-r1

4 files changed, 72 insertions, 17 deletions

diff --git a/sys-fs/sysfsutils/ChangeLog b/sys-fs/sysfsutils/ChangeLog
index 2373abf6053e..10ffe91fc597 100644
--- a/sys-fs/sysfsutils/ChangeLog
+++ b/sys-fs/sysfsutils/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-fs/sysfsutils
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/sysfsutils/ChangeLog,v 1.21 2005/07/03 13:15:22 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/sysfsutils/ChangeLog,v 1.22 2005/07/03 15:30:49 azarah Exp $
+
+*sysfsutils-1.2.0-r3 (03 Jul 2005)
+
+  03 Jul 2005; Martin Schlemmer <azarah@gentoo.org>
+  +sysfsutils-1.2.0-r3.ebuild:
+  Add linker script to fix newer gcc only linking to static lib if .so's in
+  /lib and .a in /usr/lib, bug #4411. Do not use absolute symlink for libtool
+  linker script.
 
   03 Jul 2005; Diego Pettenò <flameeyes@gentoo.org>
   sysfsutils-1.2.0-r2.ebuild:
diff --git a/sys-fs/sysfsutils/Manifest b/sys-fs/sysfsutils/Manifest
index 8a42ddcad854..fe0333807fd3 100644
--- a/sys-fs/sysfsutils/Manifest
+++ b/sys-fs/sysfsutils/Manifest
@@ -1,28 +1,30 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 f3517e90c1481db0a878b403648b61d6 ChangeLog 3129
-MD5 075d5a933d6175160a02ddf15bd4f454 metadata.xml 260
-MD5 3090a149b97070cb953800ed13e16f89 sysfsutils-0.2.0.ebuild 968
-MD5 91867476ef02cbfbbe71fe37f8518a83 sysfsutils-0.3.0.ebuild 987
-MD5 ea883f19a1a1c2dd7768d2fc272b9c97 sysfsutils-0.4.0.ebuild 1009
-MD5 a828cb4b6a8eafcb5d09183b4c19324f sysfsutils-1.0.0.ebuild 1163
 MD5 5bad6609c165bea1fa4f294f84195d08 sysfsutils-1.2.0.ebuild 707
-MD5 7e7075f23dac634652d9ba42796bba14 sysfsutils-1.2.0-r1.ebuild 801
 MD5 910f877229e04dc8393952b7bcf9a9dc sysfsutils-1.2.0-r2.ebuild 1045
-MD5 3aeda907194d0ce63ad841586ea3187f files/digest-sysfsutils-0.2.0 67
-MD5 0384b6e5908a20cdcd66447733b28194 files/digest-sysfsutils-0.3.0 68
-MD5 ae9dcbf820cd304b04eb37505fbc3831 files/digest-sysfsutils-0.4.0 68
-MD5 e3fe8d4ec06f785ffc6cf54df2ca4599 files/digest-sysfsutils-1.0.0 68
-MD5 f258b9fe54d64e883cd7cb0e8bcf7a27 files/digest-sysfsutils-1.2.0 68
-MD5 5a161d5fa015560dcecb0f489399350d files/sysfsutils-1.0.0-dont-check-for-libsysfs.patch 386
+MD5 430a40d47c755fd06b072a76d87e4186 sysfsutils-1.2.0-r3.ebuild 1262
+MD5 d15778f09c8e7d9ce07143c2531779d9 ChangeLog 3417
+MD5 91867476ef02cbfbbe71fe37f8518a83 sysfsutils-0.3.0.ebuild 987
+MD5 3090a149b97070cb953800ed13e16f89 sysfsutils-0.2.0.ebuild 968
+MD5 7e7075f23dac634652d9ba42796bba14 sysfsutils-1.2.0-r1.ebuild 801
+MD5 a828cb4b6a8eafcb5d09183b4c19324f sysfsutils-1.0.0.ebuild 1163
+MD5 075d5a933d6175160a02ddf15bd4f454 metadata.xml 260
+MD5 ea883f19a1a1c2dd7768d2fc272b9c97 sysfsutils-0.4.0.ebuild 1009
 MD5 f258b9fe54d64e883cd7cb0e8bcf7a27 files/digest-sysfsutils-1.2.0-r1 68
+MD5 f258b9fe54d64e883cd7cb0e8bcf7a27 files/digest-sysfsutils-1.2.0-r3 68
+MD5 3aeda907194d0ce63ad841586ea3187f files/digest-sysfsutils-0.2.0 67
 MD5 7816e44cfd51440f0f295ccdd7103856 files/sysfsutils-1.2.0-write-attribute.patch 998
+MD5 5a161d5fa015560dcecb0f489399350d files/sysfsutils-1.0.0-dont-check-for-libsysfs.patch 386
+MD5 ae9dcbf820cd304b04eb37505fbc3831 files/digest-sysfsutils-0.4.0 68
 MD5 f258b9fe54d64e883cd7cb0e8bcf7a27 files/digest-sysfsutils-1.2.0-r2 68
+MD5 f258b9fe54d64e883cd7cb0e8bcf7a27 files/digest-sysfsutils-1.2.0 68
+MD5 0384b6e5908a20cdcd66447733b28194 files/digest-sysfsutils-0.3.0 68
+MD5 e3fe8d4ec06f785ffc6cf54df2ca4599 files/digest-sysfsutils-1.0.0 68
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.1 (GNU/Linux)
 
-iD8DBQFCx+UPj5H05b2HAEkRAkiNAJ9EuTcni9/QGB1Anigu/2ymhFa8EQCgkpFU
-C19wuEX6SSuiD4W4zL0riYs=
-=pEy9
+iD8DBQFCyAUe1ZcsMnZjRyIRAsyWAKCqNModY4BrrbP+xdIAAxav8EbHzwCfc43Y
+4JFSa+z0xdEct44ifycG83o=
+=OgYg
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/sysfsutils/files/digest-sysfsutils-1.2.0-r3 b/sys-fs/sysfsutils/files/digest-sysfsutils-1.2.0-r3
new file mode 100644
index 000000000000..a159531192f3
--- /dev/null
+++ b/sys-fs/sysfsutils/files/digest-sysfsutils-1.2.0-r3
@@ -0,0 +1 @@
+MD5 a690216709d1e129c04057a93970996b sysfsutils-1.2.0.tar.gz 284227
diff --git a/sys-fs/sysfsutils/sysfsutils-1.2.0-r3.ebuild b/sys-fs/sysfsutils/sysfsutils-1.2.0-r3.ebuild
new file mode 100644
index 000000000000..6ec7353db219
--- /dev/null
+++ b/sys-fs/sysfsutils/sysfsutils-1.2.0-r3.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/sysfsutils/sysfsutils-1.2.0-r3.ebuild,v 1.1 2005/07/03 15:30:49 azarah Exp $
+
+inherit eutils libtool
+
+DESCRIPTION="System Utilities Based on Sysfs"
+HOMEPAGE="http://linux-diag.sourceforge.net/Sysfsutils.html"
+SRC_URI="mirror://sourceforge/linux-diag/${P}.tar.gz"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ia64 ~mips ~ppc ppc64 ~sparc ~x86"
+IUSE=""
+
+DEPEND=""
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${P}-write-attribute.patch
+}
+
+src_compile() {
+	econf --libdir=/$(get_libdir) || die "econf failed"
+	emake || die "emake failed"
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die
+
+	# We do not distribute this
+	rm -f "${D}"/usr/bin/dlist_test
+
+	# Move static libs to /usr/lib - no reason to have then in /lib
+	dodir /usr/$(get_libdir)
+	mv -f "${D}"/$(get_libdir)/*.a  "${D}"/usr/$(get_libdir)/
+	dosym ../../$(get_libdir)/libsysfs.la /usr/$(get_libdir)/libsysfs.la
+	# We need a linker script in /usr/lib, else all apps just links against
+	# the static library .. bug #4411
+	gen_usr_ldscript libsysfs.so
+
+	dodoc AUTHORS ChangeLog NEWS README TODO docs/libsysfs.txt
+}