Make sure splash_util.static is linked against nptl libs. Should fix bug #140511.

Package-Manager: portage-2.1.1_pre4-r4

3 files changed, 29 insertions, 13 deletions

diff --git a/media-gfx/splashutils/ChangeLog b/media-gfx/splashutils/ChangeLog
index 2a162c35f97a..09e8d2d6365c 100644
--- a/media-gfx/splashutils/ChangeLog
+++ b/media-gfx/splashutils/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-gfx/splashutils
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/splashutils/ChangeLog,v 1.63 2006/08/08 22:01:02 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/splashutils/ChangeLog,v 1.64 2006/08/10 22:52:46 spock Exp $
+
+  10 Aug 2006; Michał Januszewski <spock@gentoo.org>
+  splashutils-1.3-r2.ebuild:
+  Make sure splash_util.static is linked against nptl libs. Should fix bug
+  #140511.
 
 *splashutils-1.3-r2 (08 Aug 2006)
 
diff --git a/media-gfx/splashutils/Manifest b/media-gfx/splashutils/Manifest
index 05062ad6a053..6a7584ecd297 100644
--- a/media-gfx/splashutils/Manifest
+++ b/media-gfx/splashutils/Manifest
@@ -53,14 +53,14 @@ EBUILD splashutils-1.3-r1.ebuild 6431 RMD160 e5620426f5de102e33783e7ce5c6c2fd644
 MD5 c555d3074cf41827dd5acd4ab5c1f92c splashutils-1.3-r1.ebuild 6431
 RMD160 e5620426f5de102e33783e7ce5c6c2fd644866c0 splashutils-1.3-r1.ebuild 6431
 SHA256 2f4e18c940ab901db9651a09b720bf0de839f4d9dd988f8ec3a9b9b692d53580 splashutils-1.3-r1.ebuild 6431
-EBUILD splashutils-1.3-r2.ebuild 6421 RMD160 131dd1094e43a1f95378c796b08b938ebd84cc73 SHA1 29b5c848641acec297bd67aad13b09808df9f9ec SHA256 6ea820cc746d79e828720d724c5c295dee4f38d75f712825a4d5cc1a2b33f827
-MD5 a8e60d7f8963cb4cbec729cd8595b821 splashutils-1.3-r2.ebuild 6421
-RMD160 131dd1094e43a1f95378c796b08b938ebd84cc73 splashutils-1.3-r2.ebuild 6421
-SHA256 6ea820cc746d79e828720d724c5c295dee4f38d75f712825a4d5cc1a2b33f827 splashutils-1.3-r2.ebuild 6421
-MISC ChangeLog 13472 RMD160 255046c82e54436733cbe4609fef2521b599a3d1 SHA1 907143aeb69984e0ca03b3cd62a8eec9bb6977ac SHA256 3b3449ec317a77d24ca42d153e2a29133139081831585aaea6a7fad25a32f9af
-MD5 73e07f984f3bf98bbac86401324bca45 ChangeLog 13472
-RMD160 255046c82e54436733cbe4609fef2521b599a3d1 ChangeLog 13472
-SHA256 3b3449ec317a77d24ca42d153e2a29133139081831585aaea6a7fad25a32f9af ChangeLog 13472
+EBUILD splashutils-1.3-r2.ebuild 6934 RMD160 c7c04675cc48fbd5dc647bf140b9205912db11ad SHA1 634d4fc654376a098ab17c05c3e1dcf044e76fe0 SHA256 35984e5d09834f8658bb9e688dfafb39d95141c560bfa21f5ace7f8332373789
+MD5 61379212b01cbdd149b86df0524cadcb splashutils-1.3-r2.ebuild 6934
+RMD160 c7c04675cc48fbd5dc647bf140b9205912db11ad splashutils-1.3-r2.ebuild 6934
+SHA256 35984e5d09834f8658bb9e688dfafb39d95141c560bfa21f5ace7f8332373789 splashutils-1.3-r2.ebuild 6934
+MISC ChangeLog 13642 RMD160 3564bcbb4e43a24dda3d6622259515a1e7ad1805 SHA1 d46fe8eb945f9f3ae381ad3036d83343134388e0 SHA256 bc836bccc5fcb2ab931feb212a3bf53b992bf77d4641174db8aa479f3869c3ea
+MD5 6944b4332b28286ee7ab779ef54ff0b9 ChangeLog 13642
+RMD160 3564bcbb4e43a24dda3d6622259515a1e7ad1805 ChangeLog 13642
+SHA256 bc836bccc5fcb2ab931feb212a3bf53b992bf77d4641174db8aa479f3869c3ea ChangeLog 13642
 MISC metadata.xml 220 RMD160 6bb03cb6947aadf2672a58c61c1fb7aa405eaf86 SHA1 7810907f03c5a3ee23eeaa4b42699ce17bc5c3a7 SHA256 969b4125e7620e2fe0d616cb3cabbe52bd79e6c4bdd725ce807d5f4c7c1ad75d
 MD5 87131e5c56922624f8a0c7fe61cd28da metadata.xml 220
 RMD160 6bb03cb6947aadf2672a58c61c1fb7aa405eaf86 metadata.xml 220
@@ -80,7 +80,7 @@ SHA256 11721d4526a8e9b47e1c29ec0d99ee2862e7543b1b0968aeba30e331acf70e2a files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFE2Qmschej4aZK9/cRAtw3AJsHCS6cmqM4BMnnn4ka63YImzpMVQCeMA3x
-awU8sP8r41FwYFo2m4/Ywm0=
-=rz4O
+iD8DBQFE27jXchej4aZK9/cRApCBAJ9BR8vlsg8XvteWLmsoXLwj7I7sIACfc4FB
+jpUXLWrCDw76MyAZbycskMw=
+=DN9I
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/splashutils/splashutils-1.3-r2.ebuild b/media-gfx/splashutils/splashutils-1.3-r2.ebuild
index 3046a24f869a..dca526361d35 100644
--- a/media-gfx/splashutils/splashutils-1.3-r2.ebuild
+++ b/media-gfx/splashutils/splashutils-1.3-r2.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/media-gfx/splashutils/splashutils-1.3-r2.ebuild,v 1.1 2006/08/08 22:01:02 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/splashutils/splashutils-1.3-r2.ebuild,v 1.2 2006/08/10 22:52:46 spock Exp $
 
 inherit eutils multilib toolchain-funcs
 
@@ -67,6 +67,10 @@ src_unpack() {
 
 	epatch ${FILESDIR}/splashutils-1.3-r2.patch
 
+	# Make sure the static version of splash_util is linked against the nptl
+	# libraries and not the linuxthreads ones.
+	sed -i -e 's#$(LDLIBS) -static#$(LDLIBS) -L/usr/lib/nptl -static#' Makefile
+
 	# Check whether the kernel tree has been patched with fbsplash.
 	if [[ ! -e ${ROOT}/usr/$(get_libdir)/klibc/include/linux/console_splash.h ]]; then
 		ewarn "The kernel tree against which dev-libs/klibc was built was not patched"
@@ -74,6 +78,13 @@ src_unpack() {
 		ewarn "without fbsplash support (ie. verbose mode will not work)."
 	fi
 
+	if has_version sys-libs/glibc && ! built_with_use sys-libs/glibc nptl ; then
+		eerror "Your sys-libs/glibc has been built with support for linuxthreads only."
+		eerror "This package requires nptl to work correctly. Please recompile glibc"
+		eerror "with the 'nptl' USE flag enabled."
+		die "nptl not available"
+	fi
+
 	if built_with_use sys-devel/gcc vanilla ; then
 		ewarn "Your GCC was built with the 'vanilla' flag set. If you can't compile"
 		ewarn "splashutils, you're on your own, as this configuration is not supported."