diff options
| author | Akim Demaille <akim.demaille@gmail.com> | 2019-04-24 23:14:23 +0200 |
|---|---|---|
| committer | Akim Demaille <akim.demaille@gmail.com> | 2019-04-25 22:09:41 +0200 |
| commit | f5a4e279bcd368ebb7ce6cf2fea13d6ff3c67868 (patch) | |
| tree | 71de20690b28ffe9c16dc9d33a97a08551204f4f /.travis.yml | |
| parent | 571447afe8e54253ac48fb9bd743f826474feb26 (diff) | |
| download | bison-f5a4e279bcd368ebb7ce6cf2fea13d6ff3c67868.tar.gz | |
build: use gettext-h
We were using the gnulib's gettext module with tricks in
bootstrap.conf to avoid useless files. Instead, use gnulib's
gettext-h module.
* .travis.yml: Force Gettext 0.18.3 on Trusty.
* bootstrap.conf: Use gettext-h instead of gettext.
(excluded_files): Remove.
* configure.ac (AM_GNU_GETTEXT_VERSION): Bump to 0.19.
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml index d8db9c03..78dbbb83 100644 --- a/.travis.yml +++ b/.travis.yml @@ -290,7 +290,7 @@ matrix: env: # No versioned name installed, but beware that Travis installs # a more modern clang earlier in the default PATH. - - MATRIX_EVAL='CC=/usr/bin/clang && CXX=/usr/bin/clang++' + - MATRIX_EVAL='CC=/usr/bin/clang && CXX=/usr/bin/clang++ && GETTEXT_VERSION=0.18.3' - name: "Clang 3.3" os: linux @@ -302,7 +302,7 @@ matrix: - clang-3.3 env: # See comment for 3.4. - - MATRIX_EVAL='CC=/usr/bin/clang && CXX=/usr/bin/clang++' + - MATRIX_EVAL='CC=/usr/bin/clang && CXX=/usr/bin/clang++ && GETTEXT_VERSION=0.18.3' before_install: @@ -340,7 +340,10 @@ script: # with `Picked up _JAVA_OPTIONS: -Xmx2048m -Xms512m`, which makes # the test suite fail. - unset _JAVA_OPTIONS + - if [[ $GETTEXT_VERSION ]]; then sed -i -re "s/(AM_GNU_GETTEXT_VERSION).*/\1([$GETTEXT_VERSION])/" configure.ac; fi - ./bootstrap + # For some reason, gnulib-po/Makefile.in.in is about Gettext 0.19, so it will break here. Override it. + - if [[ $GETTEXT_VERSION ]]; then autopoint --force; fi - if [[ -f ~/.bashrc ]]; then source ~/.bashrc; fi - ./configure --enable-gcc-warnings CC="$CC" CXX="$CXX" $CONFIGUREFLAGS || { cat config.log && false; } - make -j2 $MAKE_ARGS |