@@ -68,6 +68,7 @@
export objdump := @OBJDUMP@
export readelf := @READELF@
export patch := @PATCH@
+export gperf := @GPERF@
export CC := @CC@
export CPP := @CPP@
export CPPFLAGS := @CPPFLAGS@
@@ -212,6 +213,7 @@
echo 'export objdump=$(objdump)'; \
echo 'export readelf=$(readelf)'; \
echo 'export patch=$(patch)'; \
+ echo 'export gperf=$(gperf)'; \
) >$@
paths.sh: FORCE
@@ -228,6 +230,7 @@
echo 'export objdump="$(objdump)"'; \
echo 'export readelf="$(readelf)"'; \
echo 'export patch="$(patch)"'; \
+ echo 'export gperf="$(gperf)"'; \
) >$@
config/configure.in: FORCE
@@ -143,15 +143,19 @@
AS_HELP_STRING([--with-readelf=PATH],
[Specify the full PATH to GNU readelf]),
[READELF=$withval])
+AC_ARG_WITH([gperf],
+ AS_HELP_STRING([--with-gperf=PATH],
+ [Specify the full PATH to GNU gperf]),
+ [GPERF=$withval])
AC_PROG_RANLIB
ACX_PATH_TOOL_REQ([OBJCOPY], [objcopy])
ACX_PATH_TOOL_REQ([OBJDUMP], [objdump])
ACX_PATH_TOOL_REQ([READELF], [readelf])
+ACX_PATH_TOOL_REQ([GPERF], [gperf])
ACX_CHECK_PROGS_REQ([bison], [bison])
ACX_CHECK_PROGS_REQ([flex], [flex])
-ACX_CHECK_PROGS_REQ([gperf], [gperf])
ACX_CHECK_PROGS_REQ([makeinfo], [makeinfo])
ACX_CHECK_PROGS_REQ([cut], [cut])
ACX_CHECK_PROGS_REQ([stat], [stat])
@@ -84,7 +84,7 @@
zconf.hash.c: zconf.gperf
@echo " GPERF '$@'"
- @gperf < $< > $@
+ @$(gperf) < $< > $@
lex.zconf.c: zconf.l
@echo " LEX '$@'"
# HG changeset patch # User Ray Donnelly <mingw.android@gmail.com> # Date 1379123123 -3600 # Sat Sep 14 02:45:23 2013 +0100 # Node ID 39ad31b0cb08687792b868ed1397360d4b6ba322 # Parent 86a8d1d467c86f962033fab6a63f5cae1524c621 Add --with-gperf=<PATH> option On OS X, Apple supply an old gperf (3.0.3) with xcode and xcode commandline tools which causes build failures: ./zconf.hash.c:183:17: error: expected expression {offsetof(struct kconf_id_strings_t, kconf_id_strings_str2), .. upgrading to gperf 3.0.4 was sufficient to fix this, so this option allows the user to specify the gperf program that they wish to use. To install gperf 3.0.4 from homebrew, I did: brew tap homebrew/dupes brew install homebrew/dupes/gperf .. then passed --with-gperf=$BREWFIX/Cellar/gperf/3.0.4/bin/gperf to configure Signed-off-by: Ray Donnelly <mingw.android@gmail.com> -- For unsubscribe information see http://sourceware.org/lists.html#faq