From: | "Mike Frysinger (vapier)" <vapier@g.o> |
---|---|
To: | gentoo-commits@l.g.o |
Subject: | [gentoo-commits] gentoo-x86 commit in media-sound/timidity++/files: timidity++-2.14.0-ar.patch |
Date: | Tue, 29 Apr 2014 01:40:47 |
Message-Id: | 20140429014040.149D22004B@flycatcher.gentoo.org |
1 | vapier 14/04/29 01:40:39 |
2 | |
3 | Added: timidity++-2.14.0-ar.patch |
4 | Log: |
5 | Fix AR handling #468176 by Agostino Sarubbo. |
6 | |
7 | (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key D2E96200) |
8 | |
9 | Revision Changes Path |
10 | 1.1 media-sound/timidity++/files/timidity++-2.14.0-ar.patch |
11 | |
12 | file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/timidity++/files/timidity++-2.14.0-ar.patch?rev=1.1&view=markup |
13 | plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/timidity++/files/timidity++-2.14.0-ar.patch?rev=1.1&content-type=text/plain |
14 | |
15 | Index: timidity++-2.14.0-ar.patch |
16 | =================================================================== |
17 | https://bugs.gentoo.org/468176 |
18 | |
19 | --- a/configure.in |
20 | +++ b/configure.in |
21 | @@ -167,6 +167,7 @@ AC_PROG_CC |
22 | AC_PROG_GCC_TRADITIONAL |
23 | AC_PROG_INSTALL |
24 | AC_PROG_AWK |
25 | +AC_CHECK_TOOL([AR], [ar], :) |
26 | AC_PROG_RANLIB |
27 | AC_PROG_LN_S |
28 | CHECK_COMPILER_OPTION(rdynamic) |
29 | --- a/timidity/Makefile.am |
30 | +++ b/timidity/Makefile.am |
31 | @@ -417,7 +417,7 @@ calcnewt$(EXEEXT): $(calcnewt_OBJECTS) $(calcnewt_DEPENDENCIES) |
32 | $(LINK) $(calcnewt_LDFLAGS) $(calcnewt_OBJECTS) $(calcnewt_LDADD) $(LIBS) |
33 | timidity$(EXEEXT): $(timidity_OBJECTS) $(timidity_DEPENDENCIES) |
34 | @rm -f timidity$(EXEEXT) |
35 | - ar -cru timidity.exe $(timidity_LDFLAGS) $(timidity_OBJECTS) $(timidity_LDADD) |
36 | + $(AR) -cru timidity.exe $(timidity_LDFLAGS) $(timidity_OBJECTS) $(timidity_LDADD) |
37 | else |
38 | calcnewt$(EXEEXT): $(calcnewt_OBJECTS) $(calcnewt_DEPENDENCIES) |
39 | @rm -f calcnewt$(EXEEXT) |