ExternalVendorCode/crosstool-ng
1
0
Fork 0
mirror of https://github.com/crosstool-ng/crosstool-ng.git synced 2025-06-02 07:40:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

configure: Add --with-gperf option

Browse Source 
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>
Message-Id: <CAOYw7dtCmcJ9WiqmQ81MmZeRPcV-tDOqe9=kRDW4uQGuZNd2Ng@mail.gmail.com>
Patchwork-Id: 274892
This commit is contained in:
Ray Donnelly 2013-09-14 02:45:23 +01:00
parent c0c6db07fe
commit d2bc2be8db
3 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile.in
View File

@ -68,6 +68,7 @@ export objcopy := @OBJCOPY@
export objdump := @OBJDUMP@ export objdump := @OBJDUMP@
export readelf := @READELF@ export readelf := @READELF@
export patch := @PATCH@ export patch := @PATCH@
export gperf := @GPERF@
export CC := @CC@ export CC := @CC@
export CPP := @CPP@ export CPP := @CPP@
export CPPFLAGS := @CPPFLAGS@ export CPPFLAGS := @CPPFLAGS@
@ -212,6 +213,7 @@ paths.mk: FORCE
echo 'export objdump=$(objdump)'; \ echo 'export objdump=$(objdump)'; \
echo 'export readelf=$(readelf)'; \ echo 'export readelf=$(readelf)'; \
echo 'export patch=$(patch)'; \ echo 'export patch=$(patch)'; \
echo 'export gperf=$(gperf)'; \
) >$@ ) >$@
paths.sh: FORCE paths.sh: FORCE
@ -228,6 +230,7 @@ paths.sh: FORCE
echo 'export objdump="$(objdump)"'; \ echo 'export objdump="$(objdump)"'; \
echo 'export readelf="$(readelf)"'; \ echo 'export readelf="$(readelf)"'; \
echo 'export patch="$(patch)"'; \ echo 'export patch="$(patch)"'; \
echo 'export gperf="$(gperf)"'; \
) >$@ ) >$@
config/configure.in: FORCE config/configure.in: FORCE

6
configure.ac
View File

@ -143,15 +143,19 @@ AC_ARG_WITH([readelf],
AS_HELP_STRING([--with-readelf=PATH], AS_HELP_STRING([--with-readelf=PATH],
[Specify the full PATH to GNU readelf]), [Specify the full PATH to GNU readelf]),
[READELF=$withval]) [READELF=$withval])
AC_ARG_WITH([gperf],
AS_HELP_STRING([--with-gperf=PATH],
[Specify the full PATH to GNU gperf]),
[GPERF=$withval])
AC_PROG_RANLIB AC_PROG_RANLIB
ACX_PATH_TOOL_REQ([OBJCOPY], [objcopy]) ACX_PATH_TOOL_REQ([OBJCOPY], [objcopy])
ACX_PATH_TOOL_REQ([OBJDUMP], [objdump]) ACX_PATH_TOOL_REQ([OBJDUMP], [objdump])
ACX_PATH_TOOL_REQ([READELF], [readelf]) ACX_PATH_TOOL_REQ([READELF], [readelf])
ACX_PATH_TOOL_REQ([GPERF], [gperf])
ACX_CHECK_PROGS_REQ([bison], [bison]) ACX_CHECK_PROGS_REQ([bison], [bison])
ACX_CHECK_PROGS_REQ([flex], [flex]) ACX_CHECK_PROGS_REQ([flex], [flex])
ACX_CHECK_PROGS_REQ([gperf], [gperf])
ACX_CHECK_PROGS_REQ([makeinfo], [makeinfo]) ACX_CHECK_PROGS_REQ([makeinfo], [makeinfo])
ACX_CHECK_PROGS_REQ([cut], [cut]) ACX_CHECK_PROGS_REQ([cut], [cut])
ACX_CHECK_PROGS_REQ([stat], [stat]) ACX_CHECK_PROGS_REQ([stat], [stat])

2
kconfig/Makefile
View File

@ -84,7 +84,7 @@ zconf.tab.c: zconf.y
zconf.hash.c: zconf.gperf zconf.hash.c: zconf.gperf
@echo " GPERF '$@'" @echo " GPERF '$@'"
@gperf < $< > $@ @$(gperf) < $< > $@
lex.zconf.c: zconf.l lex.zconf.c: zconf.l
@echo " LEX '$@'" @echo " LEX '$@'"