hasufell 14/04/18 15:52:32 Added: libcaca-0.99_beta18-fix-tests.patch Log: add multilib support wrt #497776, patches by Michael Mair-Keimberger (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key BDEED020)
Revision Changes Path 1.1 media-libs/libcaca/files/libcaca-0.99_beta18-fix-tests.patch file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libcaca/files/libcaca-0.99_beta18-fix-tests.patch?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libcaca/files/libcaca-0.99_beta18-fix-tests.patch?rev=1.1&content-type=text/plain Index: libcaca-0.99_beta18-fix-tests.patch =================================================================== --- libcaca-0.99.beta18/test/Makefile.am 2014-01-08 15:28:40.567140658 -0500 +++ libcaca-0.99.beta18.new/test/Makefile.am 2014-01-08 15:24:51.295134240 -0500 @@ -1,3 +1,5 @@ +AM_TESTS_ENVIRONMENT = \ + top_srcdir="$(top_srcdir)" AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/caca -I../caca --- libcaca-0.99.beta18/test/check-copyright 2010-02-15 18:36:37.000000000 -0500 +++ libcaca-0.99.beta18.new/test/check-copyright 2014-01-08 15:18:27.514123495 -0500 @@ -3,10 +3,11 @@ # # Check that the copyright information is valid # +echo "top srcdir: ${top_srcdir:=..}" nfails=0 nfiles=0 for dir in $(make -s echo-dirs -C ..); do - if [ ! -d "../$dir" ]; then continue; fi + if [ ! -d "$top_srcdir/$dir" ]; then continue; fi for x in $(make -s echo-sources -C ../$dir); do case "$x" in *.c|*.cpp|*.h|*.m|*.php|*.cs|*.java|.py|.pl) @@ -14,7 +15,7 @@ *) continue ;; esac - if ! grep 'Copyright *([cC])' "../$dir/$x" >/dev/null 2>&1; then + if ! grep 'Copyright *([cC])' "$top_srcdir/$dir/$x" >/dev/null 2>&1; then echo "error: $dir/$x lacks proper copyright information" nfails=$(($nfails + 1)) elif [ -d ../.git ]; then --- libcaca-0.99.beta18/test/check-source 2012-04-06 20:46:08.000000000 +0200 +++ libcaca-0.99.beta18-upd/test/check-source 2014-01-08 21:58:05.015389138 +0100 @@ -3,6 +3,7 @@ # # Check that we have no tabs or trailing spaces in the source code # +echo "top srcdir: ${top_srcdir:=..}" nfails=0 nfiles=0 nlines=0 @@ -12,15 +13,15 @@ case "$x" in *.c|*.cpp|*.h|*.m|*.php|*.cs|*.java|*.py|*.pl) nfiles=$(($nfiles + 1)); - nlines=$(($nlines + `grep -c . "../$dir/$x"`)) ;; + nlines=$(($nlines + `grep -c . "$top_srcdir/$dir/$x"`)) ;; *) continue ;; esac - if grep '[[:space:]]$' "../$dir/$x" >/dev/null 2>&1; then + if grep '[[:space:]]$' "$top_srcdir/$dir/$x" >/dev/null 2>&1; then echo "error: $dir/$x contains trailing spaces" nfails=$(($nfails + 1)) fi - if grep ' ' "../$dir/$x" >/dev/null 2>&1; then + if grep ' ' "$top_srcdir/$dir/$x" >/dev/null 2>&1; then echo "error: $dir/$x contains tabs" nfails=$(($nfails + 1)) fi
