Kill gperf vestiges

Generate paths.sh by configure, do away with paths.mk.

Signed-off-by: Alexey Neyman <stilor@att.net>
This commit is contained in:
Alexey Neyman 2018-03-17 17:41:36 -07:00
parent 0dc8565c4f
commit 5b95b81ea9
7 changed files with 33 additions and 4 deletions

2
.gitignore vendored
View File

@ -10,7 +10,7 @@ Makefile.in
ct-ng ct-ng
!ct-ng.comp !ct-ng.comp
!ct-ng.in !ct-ng.in
paths.* paths.sh
config/configure.in config/configure.in
config/gen/ config/gen/
config/versions/ config/versions/

View File

@ -23,7 +23,6 @@ addons:
packages: packages:
- bison - bison
- flex - flex
- gperf
- libncurses5-dev - libncurses5-dev
- texinfo - texinfo
- help2man - help2man

View File

@ -740,6 +740,7 @@ gen_selection menu comp_libs "Companion libraries"
msg "*** Gathering the list of data files to install" msg "*** Gathering the list of data files to install"
{ {
declare -A seen_files
echo -n "verbatim_data =" echo -n "verbatim_data ="
find config contrib packages samples scripts -type f | LANG=C sort | while read f; do find config contrib packages samples scripts -type f | LANG=C sort | while read f; do
case "${f}" in case "${f}" in
@ -754,8 +755,13 @@ msg "*** Gathering the list of data files to install"
f=config/configure.in f=config/configure.in
;; ;;
esac esac
# Checks & substitutions above may result in duplicate files
if [ -n "${seen_files[${f}]}" ]; then
continue
fi
echo " \\" echo " \\"
echo -n " ${f}" echo -n " ${f}"
seen_files[${f}]=y
done done
} > verbatim-data.mk } > verbatim-data.mk

View File

@ -297,6 +297,7 @@ AS_IF(
AC_CONFIG_FILES([ AC_CONFIG_FILES([
Makefile Makefile
paths.sh
kconfig/Makefile kconfig/Makefile
config/configure.in config/configure.in
]) ])

View File

@ -27,7 +27,18 @@ CT_WGET := @wget@
CT_CURL := @curl@ CT_CURL := @curl@
# Paths found by ./configure # Paths found by ./configure
include $(CT_LIB_DIR)/paths.mk export install = @INSTALL@
export bash = @BASH_SHELL@
export awk = @AWK@
export grep = @GREP@
export make = @MAKE@
export sed = @SED@
export libtool = @LIBTOOL@
export libtoolize = @LIBTOOLIZE@
export objcopy = @OBJCOPY@
export objdump = @OBJDUMP@
export readelf = @READELF@
export patch = @PATCH@
# Some distributions (eg. Ubuntu) thought it wise to point /bin/sh to # Some distributions (eg. Ubuntu) thought it wise to point /bin/sh to
# a truly POSIX-conforming shell, ash in this case. This is not so good # a truly POSIX-conforming shell, ash in this case. This is not so good

2
debian/control vendored
View File

@ -3,7 +3,7 @@ Section: devel
Priority: optional Priority: optional
Maintainer: Multiple Candidates <open@example.com> Maintainer: Multiple Candidates <open@example.com>
Build-Depends: debhelper (>= 9), autoconf, automake, autotools-dev, Build-Depends: debhelper (>= 9), autoconf, automake, autotools-dev,
libncursesw5-dev, libncurses5-dev, gperf, bison, flex, libncursesw5-dev, libncurses5-dev, bison, flex,
texinfo, help2man, gawk, git, subversion, bzip2, libtool-bin texinfo, help2man, gawk, git, subversion, bzip2, libtool-bin
Standards-Version: 3.9.8 Standards-Version: 3.9.8
Homepage: http://crosstool-ng.org/ Homepage: http://crosstool-ng.org/

12
paths.sh.in Normal file
View File

@ -0,0 +1,12 @@
export install="@INSTALL@"
export bash="@BASH_SHELL@"
export awk="@AWK@"
export grep="@GREP@"
export make="@MAKE@"
export sed="@SED@"
export libtool="@LIBTOOL@"
export libtoolize="@LIBTOOLIZE@"
export objcopy="@OBJCOPY@"
export objdump="@OBJDUMP@"
export readelf="@READELF@"
export patch="@PATCH@"