[gentoo-commits] gentoo-x86 commit in sys-libs/ss: ChangeLog ss-1.40.3.ebuild

[Mike Frysinger (vapier)]

vapier      07/12/09 23:00:58

  Modified:             ChangeLog ss-1.40.3.ebuild
  Log:
  Fix test building/running #201762 by Andrej Kacian.
  (Portage version: 2.1.4_rc4)

Revision  Changes    Path
1.37                 sys-libs/ss/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-libs/ss/ChangeLog?rev=1.37&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-libs/ss/ChangeLog?rev=1.37&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-libs/ss/ChangeLog?r1=1.36&r2=1.37

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-libs/ss/ChangeLog,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- ChangeLog	8 Dec 2007 21:13:04 -0000	1.36
+++ ChangeLog	9 Dec 2007 23:00:58 -0000	1.37
@@ -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@g.o>
+  +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)
 



1.2                  sys-libs/ss/ss-1.40.3.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-libs/ss/ss-1.40.3.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-libs/ss/ss-1.40.3.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-libs/ss/ss-1.40.3.ebuild?r1=1.1&r2=1.2

Index: ss-1.40.3.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-libs/ss/ss-1.40.3.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ss-1.40.3.ebuild	8 Dec 2007 21:13:04 -0000	1.1
+++ ss-1.40.3.ebuild	9 Dec 2007 23:00:58 -0000	1.2
@@ -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 @@
 
 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_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



-- 
gentoo-commits@g.o mailing list