Fix test building/running #201762 by Andrej Kacian.

(Portage version: 2.1.4_rc4)

3 files changed, 46 insertions, 9 deletions

diff --git a/sys-libs/ss/ChangeLog b/sys-libs/ss/ChangeLog
index 73bb61e16788..7d924d46baf9 100644
--- a/sys-libs/ss/ChangeLog
+++ b/sys-libs/ss/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-libs/ss
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/ss/ChangeLog,v 1.36 2007/12/08 21:13:04 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/ss/ChangeLog,v 1.37 2007/12/09 23:00:58 vapier Exp $
+
+  09 Dec 2007; Mike Frysinger <vapier@gentoo.org>
+  +files/ss-1.40.3-check.patch, ss-1.40.3.ebuild:
+  Fix test building/running #201762 by Andrej Kacian.
 
 *ss-1.40.3 (08 Dec 2007)
 
diff --git a/sys-libs/ss/files/ss-1.40.3-check.patch b/sys-libs/ss/files/ss-1.40.3-check.patch
new file mode 100644
index 000000000000..779edb822ae6
--- /dev/null
+++ b/sys-libs/ss/files/ss-1.40.3-check.patch
@@ -0,0 +1,27 @@
+--- lib/ss/Makefile.in
++++ lib/ss/Makefile.in
+@@ -5,6 +5,7 @@
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
++builddir = @builddir@
+ top_builddir = ../..
+ my_dir = lib/ss
+ INSTALL = @INSTALL@
+@@ -163,14 +163,14 @@
+ 		$(DESTDIR)$(man1dir)/mk_cmds.1 
+ 	$(RM) -rf $(DESTDIR)$(includedir)/ss $(DESTDIR)$(datadir)/ss
+ 
+-test_ss: test_ss.o test_cmd.o $(LIBEXT2FS) $(LIBSS) $(LIBCOM_ERR)
++test_ss: test_ss.o test_cmd.o $(LIBSS) $(LIBCOM_ERR)
+ 	@echo "	LD $@"
+ 	@$(CC) -o $@ test_ss.o test_cmd.o $(ALL_CFLAGS) \
+ 		$(LIBSS) $(LIBCOM_ERR)
+ 
+ check:: all test_ss
+ 	@echo "	RUN TEST test_ss"
+-	@(test_ss -f $(srcdir)/test_script >& test_out; exit 0)
++	@($(builddir)/test_ss -f $(srcdir)/test_script >& test_out; exit 0)
+ 	@if ! diff test_out $(srcdir)/test_script_expected > test.diff; then \
+ 		echo "Regression test for ss library failed!"; exit 1 ; fi
+ 
diff --git a/sys-libs/ss/ss-1.40.3.ebuild b/sys-libs/ss/ss-1.40.3.ebuild
index b999446b49b1..8784c5941d08 100644
--- a/sys-libs/ss/ss-1.40.3.ebuild
+++ b/sys-libs/ss/ss-1.40.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/ss/ss-1.40.3.ebuild,v 1.1 2007/12/08 21:13:04 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/ss/ss-1.40.3.ebuild,v 1.2 2007/12/09 23:00:58 vapier Exp $
 
 inherit eutils flag-o-matic toolchain-funcs
 
@@ -19,16 +19,21 @@ DEPEND="${RDEPEND}
 
 S=${WORKDIR}/e2fsprogs-${PV}
 
+env_setup() {
+	export LDCONFIG=/bin/true
+	export CC=$(tc-getCC)
+	export STRIP=/bin/true
+}
+
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
 	epatch "${FILESDIR}"/${PN}-1.39-makefile.patch
+	epatch "${FILESDIR}"/${PN}-1.40.3-check.patch #201762
 }
 
 src_compile() {
-	export LDCONFIG=/bin/true
-	export CC=$(tc-getCC)
-	export STRIP=/bin/true
+	env_setup
 
 	# We want to use the "bsd" libraries while building on Darwin, but while
 	# building on other Gentoo/*BSD we prefer elf-naming scheme.
@@ -47,13 +52,14 @@ src_compile() {
 }
 
 src_test() {
-	make -C lib/ss check || die "make check failed"
+	env_setup
+
+	ln -s $(${CC} -print-file-name=libcom_err.so) lib/libcom_err.so
+	emake -j1 -C lib/ss check || die "make check failed"
 }
 
 src_install() {
-	export LDCONFIG=/bin/true
-	export CC=$(tc-getCC)
-	export STRIP=/bin/true
+	env_setup
 
 	dodir /usr/share/man/man1
 	make -C lib/ss DESTDIR="${D}" install || die