| 1 |
serkan 09/03/29 23:29:15 |
| 2 |
|
| 3 |
Added: 2.7.7-makefixes.patch |
| 4 |
Log: |
| 5 |
Fix bug #256880. Thanks to Diego E. Pettenò <flameeyes@g.o> for help. |
| 6 |
(Portage version: 2.2_rc28/cvs/Linux x86_64) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.1 dev-java/antlr/files/2.7.7-makefixes.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/antlr/files/2.7.7-makefixes.patch?rev=1.1&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/antlr/files/2.7.7-makefixes.patch?rev=1.1&content-type=text/plain |
| 13 |
|
| 14 |
Index: 2.7.7-makefixes.patch |
| 15 |
=================================================================== |
| 16 |
diff -Nur antlr-2.7.7/examples/cpp/inherit.tinyc/Makefile.in antlr-2.7.7_patched/examples/cpp/inherit.tinyc/Makefile.in |
| 17 |
--- antlr-2.7.7/examples/cpp/inherit.tinyc/Makefile.in 2006-11-01 23:37:17.000000000 +0200 |
| 18 |
+++ antlr-2.7.7_patched/examples/cpp/inherit.tinyc/Makefile.in 2009-03-30 02:09:28.000000000 +0300 |
| 19 |
@@ -143,7 +143,7 @@ |
| 20 |
@abs_this_builddir@/examples/cpp/tinyc/TinyCLexer.cpp \ |
| 21 |
@abs_this_builddir@/examples/cpp/tinyc/TinyCLexer.hpp \ |
| 22 |
: |
| 23 |
- @ @MAKE@ -C @abs_this_builddir@/examples/cpp/tinyc |
| 24 |
+ @ $(MAKE) -C @abs_this_builddir@/examples/cpp/tinyc |
| 25 |
|
| 26 |
$(objdir)/.subc.g : $(srcdir)/subc.g $(objdir)/TinyCParserTokenTypes.txt @ANTLR_JAR@ |
| 27 |
@ANTLRFLAGS="-glib `@CYGPATH_W@ $(_srcdir)/../tinyc/tinyc.g` -o `@CYGPATH_W@ $(thisdir)`" @ANTLR_COMPILE_CMD@ $(srcdir)/subc.g |
| 28 |
diff -Nur antlr-2.7.7/examples/java/inherit.tinyc/Makefile.in antlr-2.7.7_patched/examples/java/inherit.tinyc/Makefile.in |
| 29 |
--- antlr-2.7.7/examples/java/inherit.tinyc/Makefile.in 2006-11-01 23:37:17.000000000 +0200 |
| 30 |
+++ antlr-2.7.7_patched/examples/java/inherit.tinyc/Makefile.in 2009-03-30 02:07:25.000000000 +0300 |
| 31 |
@@ -77,7 +77,7 @@ |
| 32 |
@ @CP@ $< $@ |
| 33 |
|
| 34 |
@abs_this_builddir@/examples/java/tinyc/TinyCParserTokenTypes.txt : |
| 35 |
- @ @MAKE@ -C @abs_this_builddir@/examples/java/tinyc test |
| 36 |
+ @ $(MAKE) -C @abs_this_builddir@/examples/java/tinyc test |
| 37 |
|
| 38 |
|
| 39 |
## How to generated *.java .. |
| 40 |
diff -Nur antlr-2.7.7/examples/python/inherit.tinyc/Makefile.in antlr-2.7.7_patched/examples/python/inherit.tinyc/Makefile.in |
| 41 |
--- antlr-2.7.7/examples/python/inherit.tinyc/Makefile.in 2006-11-01 23:37:18.000000000 +0200 |
| 42 |
+++ antlr-2.7.7_patched/examples/python/inherit.tinyc/Makefile.in 2009-03-30 02:09:07.000000000 +0300 |
| 43 |
@@ -61,11 +61,11 @@ |
| 44 |
## file resides. Therefore we are going to "make" the base |
| 45 |
## grammar first and then copy required vocabulary over .. |
| 46 |
TinyCTokenTypes.txt : |
| 47 |
- @MAKE@ -C ../tinyc |
| 48 |
+ $(MAKE) -C ../tinyc |
| 49 |
@CP@ ../tinyc/$@ $@ |
| 50 |
|
| 51 |
@abs_this_builddir@/examples/python/tinyc/%.py : |
| 52 |
- @MAKE@ -C ../tinyc |
| 53 |
+ $(MAKE) -C ../tinyc |
| 54 |
|
| 55 |
test :: test1 |
| 56 |
|
| 57 |
diff -Nur antlr-2.7.7/Makefile.in antlr-2.7.7_patched/Makefile.in |
| 58 |
--- antlr-2.7.7/Makefile.in 2006-11-01 23:37:18.000000000 +0200 |
| 59 |
+++ antlr-2.7.7_patched/Makefile.in 2009-03-30 02:05:41.000000000 +0300 |
| 60 |
@@ -31,7 +31,7 @@ |
| 61 |
|
| 62 |
test clean distclean install :: |
| 63 |
@ if test -f examples/Makefile ; then \ |
| 64 |
- @MAKE@ -C examples $@ ; \ |
| 65 |
+ $(MAKE) -C examples $@ ; \ |
| 66 |
fi |
| 67 |
|
| 68 |
# Rule to remove all objects, cores, ANTLR generated, |
| 69 |
diff -Nur antlr-2.7.7/scripts/config.make.in antlr-2.7.7_patched/scripts/config.make.in |
| 70 |
--- antlr-2.7.7/scripts/config.make.in 2006-11-01 23:37:18.000000000 +0200 |
| 71 |
+++ antlr-2.7.7_patched/scripts/config.make.in 2009-03-30 02:04:54.000000000 +0300 |
| 72 |
@@ -47,9 +47,9 @@ |
| 73 |
*) \ |
| 74 |
if test -f "$${d}/Makefile" ; then \ |
| 75 |
echo ">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>" ; \ |
| 76 |
- echo ">> @MAKE@ -C $(subdir)/$${d} $@ " ; \ |
| 77 |
+ echo ">> $(MAKE) -C $(subdir)/$${d} $@ " ; \ |
| 78 |
echo ">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>" ; \ |
| 79 |
- @MAKE@ -C "$$d" $@ || exit 1 ;\ |
| 80 |
+ $(MAKE) -C "$$d" $@ || exit 1 ;\ |
| 81 |
fi ; \ |
| 82 |
;; \ |
| 83 |
esac ; \ |
Archives