/[gentoo-x86]/media-sound/mp3splt-gtk/files/mp3splt-gtk-0.8.2-automake-1.13.patch
Gentoo

Contents of /media-sound/mp3splt-gtk/files/mp3splt-gtk-0.8.2-automake-1.13.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 1.1 - (show annotations) (download)
Sat Jun 8 20:06:08 2013 UTC (5 years, 2 months ago) by sping
Branch: MAIN
CVS Tags: HEAD
media-sound/mp3splt-gtk: Automake 1.13 (bug #470802)

(Portage version: 2.1.11.62/cvs/Linux x86_64, signed Manifest commit with key 0x401A1600)

1 From cb38e44936aa6a923f9dedffb7084de657caa54f Mon Sep 17 00:00:00 2001
2 From: Sebastian Pipping <sebastian@pipping.org>
3 Date: Sat, 8 Jun 2013 21:44:45 +0200
4 Subject: [PATCH] Resolve use of $(top_srcdir) in TESTS to stop Automake 1.13.1
5 from erroring out
6
7 This is actually a cheap port of a fix to upstream bug #153
8 https://sourceforge.net/p/mp3splt/bugs/152/
9 https://sourceforge.net/p/mp3splt/code/1326/
10 ---
11 test/Makefile.am | 7 +++++--
12 test/run-tests.sh | 7 ++++++-
13 2 files changed, 11 insertions(+), 3 deletions(-)
14
15 diff --git a/test/Makefile.am b/test/Makefile.am
16 index bb77e86..81159e3 100644
17 --- a/test/Makefile.am
18 +++ b/test/Makefile.am
19 @@ -34,11 +34,14 @@ test_douglas_peucker_la_SOURCES = test_douglas_peucker.c tests.h \
20 $(top_srcdir)/src/douglas_peucker.c $(top_srcdir)/src/douglas_peucker.h \
21 $(top_srcdir)/src/utilities.c $(top_srcdir)/src/utilities.h
22
23 -TESTS = $(top_srcdir)/test/run-tests.sh
24 -TESTS_ENVIRONMENT = NO_MAKE=yes CUTTER="$(CUTTER)"
25 +TESTS = run-tests.sh
26 +TESTS_ENVIRONMENT = NO_MAKE=yes CUTTER="$(CUTTER)" TESTS_DIR="$(top_builddir)/test"
27
28 echo-cutter:
29 @echo $(CUTTER)
30
31 +echo-tests-dir:
32 + @echo $(top_builddir)/test
33 +
34 endif
35
36 diff --git a/test/run-tests.sh b/test/run-tests.sh
37 index a7bee7a..49ca19e 100755
38 --- a/test/run-tests.sh
39 +++ b/test/run-tests.sh
40 @@ -5,6 +5,11 @@ top_dir="$BASE_DIR/.."
41
42 if test -z "$NO_MAKE"; then
43 make -C $top_dir > /dev/null || exit 1
44 + TESTS_DIR=$BASE_DIR
45 +else
46 + if test -z "$TESTS_DIR"; then
47 + TESTS_DIR="`make -s -C $BASE_DIR echo-tests-dir`"
48 + fi
49 fi
50
51 if test -z "$CUTTER"; then
52 @@ -21,5 +26,5 @@ fi
53 exit 1
54 }
55
56 -$CUTTER -s $BASE_DIR "$@" $BASE_DIR
57 +$CUTTER -s $BASE_DIR "$@" $TESTS_DIR
58
59 --
60 1.8.2.1
61

  ViewVC Help
Powered by ViewVC 1.1.20