| 1 |
dirtyepic 08/08/03 08:35:41 |
| 2 |
|
| 3 |
Added: ftjam-2.5.3-i-hate-yacc.patch |
| 4 |
Log: |
| 5 |
Fix build error on some systems caused by our bison/yacc collision |
| 6 |
workarounds by explictly calling bison always. Thanks to everyone on bug |
| 7 |
#213759 who provided info and testing. |
| 8 |
(Portage version: 2.2_rc6/cvs/Linux 2.6.26-gentoo x86_64) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.1 dev-util/ftjam/files/ftjam-2.5.3-i-hate-yacc.patch |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/ftjam/files/ftjam-2.5.3-i-hate-yacc.patch?rev=1.1&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/ftjam/files/ftjam-2.5.3-i-hate-yacc.patch?rev=1.1&content-type=text/plain |
| 15 |
|
| 16 |
Index: ftjam-2.5.3-i-hate-yacc.patch |
| 17 |
=================================================================== |
| 18 |
diff -Naurp ftjam-2.5.3rc2-orig/Jambase ftjam-2.5.3rc2/Jambase |
| 19 |
--- ftjam-2.5.3rc2-orig/Jambase 2007-06-05 08:20:19.000000000 -0600 |
| 20 |
+++ ftjam-2.5.3rc2/Jambase 2008-07-21 19:26:02.000000000 -0600 |
| 21 |
@@ -813,7 +813,7 @@ else if $(UNIX) |
| 22 |
LINKLIBS ?= ; |
| 23 |
OPTIM ?= -O ; |
| 24 |
RANLIB ?= ranlib ; |
| 25 |
- YACC ?= yacc ; |
| 26 |
+ YACC ?= bison -y ; |
| 27 |
YACCGEN ?= .c ; |
| 28 |
YACCFILES ?= y.tab ; |
| 29 |
YACCFLAGS ?= -d ; |
| 30 |
@@ -882,10 +882,10 @@ DC ?= dmd ; |
| 31 |
SUFLIB ?= .a ; |
| 32 |
SUFOBJ ?= .o ; |
| 33 |
UNDEFFLAG ?= "-u _" ; |
| 34 |
- YACC ?= ; |
| 35 |
- YACCGEN ?= ; |
| 36 |
- YACCFILES ?= ; |
| 37 |
- YACCFLAGS ?= ; |
| 38 |
+ YACC ?= bison -y ; |
| 39 |
+ YACCGEN ?= .c ; |
| 40 |
+ YACCFILES ?= y.tab ; |
| 41 |
+ YACCFLAGS ?= -d ; |
| 42 |
|
| 43 |
HDRPATTERN = |
| 44 |
"^[ ]*#[ ]*include[ ]*[<\"]([^\">]*)[\">].*$" ; |
| 45 |
diff -Naurp ftjam-2.5.3rc2-orig/jambase.c ftjam-2.5.3rc2/jambase.c |
| 46 |
--- ftjam-2.5.3rc2-orig/jambase.c 2007-06-05 08:31:08.000000000 -0600 |
| 47 |
+++ ftjam-2.5.3rc2/jambase.c 2008-07-21 19:27:55.000000000 -0600 |
| 48 |
@@ -632,7 +632,7 @@ const char *jambase[] = { |
| 49 |
"LINKLIBS ?= ;\n", |
| 50 |
"OPTIM ?= -O ;\n", |
| 51 |
"RANLIB ?= ranlib ;\n", |
| 52 |
-"YACC ?= yacc ;\n", |
| 53 |
+"YACC ?= bison -y ;\n", |
| 54 |
"YACCGEN ?= .c ;\n", |
| 55 |
"YACCFILES ?= y.tab ;\n", |
| 56 |
"YACCFLAGS ?= -d ;\n", |
| 57 |
@@ -695,10 +695,10 @@ const char *jambase[] = { |
| 58 |
"SUFLIB ?= .a ;\n", |
| 59 |
"SUFOBJ ?= .o ;\n", |
| 60 |
"UNDEFFLAG ?= \"-u _\" ;\n", |
| 61 |
-"YACC ?= ;\n", |
| 62 |
-"YACCGEN ?= ;\n", |
| 63 |
-"YACCFILES ?= ;\n", |
| 64 |
-"YACCFLAGS ?= ;\n", |
| 65 |
+"YACC ?= bison -y ;\n", |
| 66 |
+"YACCGEN ?= .c ;\n", |
| 67 |
+"YACCFILES ?= y.tab ;\n", |
| 68 |
+"YACCFLAGS ?= -d ;\n", |
| 69 |
"\n", |
| 70 |
"HDRPATTERN =\n", |
| 71 |
"\"^[ ]*#[ ]*include[ ]*[<\\\"]([^\\\">]*)[\\\">].*$\" ;\n", |
Archives