cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

retweak the evil bison hack to use our m4.

Browse Source 
decide anything called "m4" is ours, so that gcc,-java builds consistently
again.
This commit is contained in:
espie 2012-04-14 12:22:25 +00:00
parent 559816c5cc
commit 982bd4d9e4
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
devel/bison/Makefile
View File

@ -1,10 +1,11 @@
# $OpenBSD: Makefile,v 1.44 2010/11/15 19:45:56 espie Exp $
# $OpenBSD: Makefile,v 1.45 2012/04/14 12:22:25 espie Exp $
COMMENT= GNU parser generator
DISTNAME= bison-2.3
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GNU:=bison/}
REVISION = 0
HOMEPAGE= http://www.gnu.org/software/bison/

15
devel/bison/patches/patch-src_output_c
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-src_output_c,v 1.4 2008/07/08 00:24:17 brad Exp $
--- src/output.c.orig Sun May 14 16:40:35 2006
+++ src/output.c Sun Jun 29 22:15:11 2008
$OpenBSD: patch-src_output_c,v 1.5 2012/04/14 12:22:25 espie Exp $
--- src/output.c.orig Sun May 14 22:40:35 2006
+++ src/output.c Fri Apr 13 20:38:39 2012
@@ -501,7 +501,8 @@ output_skeleton (void)
FILE *in;
FILE *out;
@ -20,7 +20,7 @@ $OpenBSD: patch-src_output_c,v 1.4 2008/07/08 00:24:17 brad Exp $
char const *pkgdatadir = (p = getenv ("BISON_PKGDATADIR")) ? p : PKGDATADIR;
size_t skeleton_size = strlen (skeleton) + 1;
size_t pkgdatadirlen = strlen (pkgdatadir);
@@ -534,12 +535,16 @@ output_skeleton (void)
@@ -534,12 +535,21 @@ output_skeleton (void)
fprintf (stderr, "running: %s %s - %s\n",
m4, full_m4sugar, full_skeleton);
@ -32,7 +32,12 @@ $OpenBSD: patch-src_output_c,v 1.4 2008/07/08 00:24:17 brad Exp $
- argv[5] = NULL;
+ i = 0;
+ argv[i++] = m4;
+ if (strcmp(m4, "/usr/bin/m4") == 0) {
+ p = strrchr(m4, '/');
+ if (p)
+ p++;
+ else
+ p = m4;
+ if (strcmp(p, "m4") == 0) {
+ argv[i++] = "-g";
+ }
+ argv[i++] = full_m4sugar;