From: Michael Sterrett Date: Tue, 6 Oct 2015 18:47:54 +0000 (-0400) Subject: fix tests with patch from Dustin Polke (bug #527270) X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=fab1531be3c5fb51d0058c3b382000d13c3fc985;p=gentoo.git fix tests with patch from Dustin Polke (bug #527270) Package-Manager: portage-2.2.20.1 --- diff --git a/media-libs/devil/devil-1.7.8-r2.ebuild b/media-libs/devil/devil-1.7.8-r2.ebuild index c20974c63f48..43a592eb2b16 100644 --- a/media-libs/devil/devil-1.7.8-r2.ebuild +++ b/media-libs/devil/devil-1.7.8-r2.ebuild @@ -38,7 +38,7 @@ DEPEND="${RDEPEND} X? ( x11-proto/xextproto )" src_prepare() { - epatch "${FILESDIR}"/${P}-{CVE-2009-3994,libpng14,nvtt-glut,ILUT,restrict}.patch + epatch "${FILESDIR}"/${P}-{CVE-2009-3994,libpng14,nvtt-glut,ILUT,restrict,fix-test}.patch eautoreconf } diff --git a/media-libs/devil/files/devil-1.7.8-fix-test.patch b/media-libs/devil/files/devil-1.7.8-fix-test.patch new file mode 100644 index 000000000000..44af2fc71d64 --- /dev/null +++ b/media-libs/devil/files/devil-1.7.8-fix-test.patch @@ -0,0 +1,10 @@ +--- a/devil-1.7.8/test/Makefile.am ++++ b/devil-1.7.8/test/Makefile.am +@@ -12,5 +12,6 @@ else + testil_LDADD += ../lib/libIL.la + endif + +-TESTS_ENVIRONMENT = /bin/bash ++TESTS_ENVIRONMENT = + TESTS = $(check_SCRIPTS) ++LOG_COMPILER = $(SHELL)