Browse Source

Kill gperf vestiges

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

Signed-off-by: Alexey Neyman <stilor@att.net>
dev-linux
Alexey Neyman 5 years ago
parent
commit
5b95b81ea9
  1. 2
      .gitignore
  2. 1
      .travis.yml
  3. 6
      bootstrap
  4. 1
      configure.ac
  5. 13
      ct-ng.in
  6. 2
      debian/control
  7. 12
      paths.sh.in

2
.gitignore vendored

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

1
.travis.yml

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

6
bootstrap

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

1
configure.ac

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

13
ct-ng.in

@ -27,7 +27,18 @@ CT_WGET := @wget@
CT_CURL := @curl@
# 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
# a truly POSIX-conforming shell, ash in this case. This is not so good

2
debian/control vendored

@ -3,7 +3,7 @@ Section: devel
Priority: optional
Maintainer: Multiple Candidates <open@example.com>
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
Standards-Version: 3.9.8
Homepage: http://crosstool-ng.org/

12
paths.sh.in

@ -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@"
Loading…
Cancel
Save