From 16b3c5aad1d87e219bd3f86979787ada5b1e9688 Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Mon, 11 Jul 2022 09:34:35 -0700 Subject: [PATCH] .homebrew-build-env, build/pkgs/{_prereq,_bootstrap}/distros: Remove gettext --- .homebrew-build-env | 4 ++-- build/pkgs/_bootstrap/distros/arch.txt | 2 +- build/pkgs/_bootstrap/distros/conda.txt | 2 +- build/pkgs/_bootstrap/distros/cygwin.txt | 2 +- build/pkgs/_bootstrap/distros/debian.txt | 1 - build/pkgs/_bootstrap/distros/fedora.txt | 2 +- build/pkgs/_bootstrap/distros/freebsd.txt | 2 +- build/pkgs/_bootstrap/distros/homebrew.txt | 2 +- build/pkgs/_bootstrap/distros/nix.txt | 2 +- build/pkgs/_bootstrap/distros/opensuse.txt | 1 - build/pkgs/_bootstrap/distros/void.txt | 3 +-- build/pkgs/_prereq/distros/gentoo.txt | 2 -- build/pkgs/_prereq/distros/slackware.txt | 2 -- configure.ac | 6 +++--- 14 files changed, 13 insertions(+), 20 deletions(-) diff --git a/.homebrew-build-env b/.homebrew-build-env index ff07cad2f64..84f5017a310 100644 --- a/.homebrew-build-env +++ b/.homebrew-build-env @@ -2,7 +2,7 @@ # that activate keg-only homebrew package installations HOMEBREW=`brew --prefix` || return 1 -for l in gettext bzip2 texinfo polymake; do +for l in bzip2 texinfo polymake; do if [ -d "$HOMEBREW/opt/$l/bin" ]; then PATH="$HOMEBREW/opt/$l/bin:$PATH" fi @@ -39,7 +39,7 @@ for l in "gcc/lib/gcc/11 gcc/lib/gcc/10 gcc/lib/gcc/9"; do done export LIBRARY_PATH export CPATH -for l in gettext; do +for l in ; do if [ -d "$HOMEBREW/opt/$l/share/aclocal" ]; then ACLOCAL_PATH="$HOMEBREW/opt/$l/share/aclocal:$ACLOCAL_PATH" fi diff --git a/build/pkgs/_bootstrap/distros/arch.txt b/build/pkgs/_bootstrap/distros/arch.txt index 67bfbc0fae0..96fe92340d9 100644 --- a/build/pkgs/_bootstrap/distros/arch.txt +++ b/build/pkgs/_bootstrap/distros/arch.txt @@ -1,4 +1,4 @@ # Packages needed for ./bootstrap -gettext autoconf automake libtool +autoconf automake libtool # Otherwise: Error: could not locate the pkg-config autoconf macros. These are pkg-config diff --git a/build/pkgs/_bootstrap/distros/conda.txt b/build/pkgs/_bootstrap/distros/conda.txt index 5405f70cf3d..b5d2db8cfb2 100644 --- a/build/pkgs/_bootstrap/distros/conda.txt +++ b/build/pkgs/_bootstrap/distros/conda.txt @@ -1,2 +1,2 @@ # Packages needed for ./bootstrap -gettext autoconf automake libtool +autoconf automake libtool diff --git a/build/pkgs/_bootstrap/distros/cygwin.txt b/build/pkgs/_bootstrap/distros/cygwin.txt index 5cd20fd529c..b5d2db8cfb2 100644 --- a/build/pkgs/_bootstrap/distros/cygwin.txt +++ b/build/pkgs/_bootstrap/distros/cygwin.txt @@ -1,2 +1,2 @@ # Packages needed for ./bootstrap -gettext-devel autoconf automake libtool +autoconf automake libtool diff --git a/build/pkgs/_bootstrap/distros/debian.txt b/build/pkgs/_bootstrap/distros/debian.txt index d99fdbbceab..5fe960ac3a0 100644 --- a/build/pkgs/_bootstrap/distros/debian.txt +++ b/build/pkgs/_bootstrap/distros/debian.txt @@ -1,5 +1,4 @@ # Packages needed for ./bootstrap -gettext autoconf automake libtool diff --git a/build/pkgs/_bootstrap/distros/fedora.txt b/build/pkgs/_bootstrap/distros/fedora.txt index 97f16705319..e8e9330eca1 100644 --- a/build/pkgs/_bootstrap/distros/fedora.txt +++ b/build/pkgs/_bootstrap/distros/fedora.txt @@ -1,4 +1,4 @@ # Packages needed for ./bootstrap -gettext-devel autoconf automake libtool +autoconf automake libtool # Fedora 26 needs: pkg-config diff --git a/build/pkgs/_bootstrap/distros/freebsd.txt b/build/pkgs/_bootstrap/distros/freebsd.txt index 55f45bfd276..93d91f5c84b 100644 --- a/build/pkgs/_bootstrap/distros/freebsd.txt +++ b/build/pkgs/_bootstrap/distros/freebsd.txt @@ -1,2 +1,2 @@ # Packages needed for ./bootstrap -gettext autoconf automake libtool pkg-config +autoconf automake libtool pkg-config diff --git a/build/pkgs/_bootstrap/distros/homebrew.txt b/build/pkgs/_bootstrap/distros/homebrew.txt index 55f45bfd276..93d91f5c84b 100644 --- a/build/pkgs/_bootstrap/distros/homebrew.txt +++ b/build/pkgs/_bootstrap/distros/homebrew.txt @@ -1,2 +1,2 @@ # Packages needed for ./bootstrap -gettext autoconf automake libtool pkg-config +autoconf automake libtool pkg-config diff --git a/build/pkgs/_bootstrap/distros/nix.txt b/build/pkgs/_bootstrap/distros/nix.txt index 55f45bfd276..93d91f5c84b 100644 --- a/build/pkgs/_bootstrap/distros/nix.txt +++ b/build/pkgs/_bootstrap/distros/nix.txt @@ -1,2 +1,2 @@ # Packages needed for ./bootstrap -gettext autoconf automake libtool pkg-config +autoconf automake libtool pkg-config diff --git a/build/pkgs/_bootstrap/distros/opensuse.txt b/build/pkgs/_bootstrap/distros/opensuse.txt index 819e4433b53..48e74f8118e 100644 --- a/build/pkgs/_bootstrap/distros/opensuse.txt +++ b/build/pkgs/_bootstrap/distros/opensuse.txt @@ -1,5 +1,4 @@ # Packages needed for ./bootstrap -gettext-tools autoconf automake libtool diff --git a/build/pkgs/_bootstrap/distros/void.txt b/build/pkgs/_bootstrap/distros/void.txt index eefc9315cb5..159333b4216 100644 --- a/build/pkgs/_bootstrap/distros/void.txt +++ b/build/pkgs/_bootstrap/distros/void.txt @@ -1,4 +1,3 @@ # Packages needed for ./bootstrap -gettext autoconf automake libtool -gettext-devel +autoconf automake libtool xtools mk-configure diff --git a/build/pkgs/_prereq/distros/gentoo.txt b/build/pkgs/_prereq/distros/gentoo.txt index 51316a87c0b..1e26c46cacc 100644 --- a/build/pkgs/_prereq/distros/gentoo.txt +++ b/build/pkgs/_prereq/distros/gentoo.txt @@ -14,8 +14,6 @@ sys-devel/bc dev-lang/python sys-devel/flex app-misc/ca-certificates -sys-devel/gettext -dev-libs/libcroco dev-libs/libxml2 sys-apps/findutils sys-apps/which diff --git a/build/pkgs/_prereq/distros/slackware.txt b/build/pkgs/_prereq/distros/slackware.txt index a8310031df7..4c2b7080ce8 100644 --- a/build/pkgs/_prereq/distros/slackware.txt +++ b/build/pkgs/_prereq/distros/slackware.txt @@ -15,7 +15,5 @@ flex # for https upstream_url downloads ca-certificates pkg-config -gettext-tools -libcroco # gettext dependency (msgfmt) libxml2 cyrus-sasl diff --git a/configure.ac b/configure.ac index 4ab080c6115..22637978a8a 100644 --- a/configure.ac +++ b/configure.ac @@ -49,10 +49,10 @@ dnl Make sure the path to our own m4 macros is always properly set dnl and doesn't depend on how autoconf is called. AC_CONFIG_MACRO_DIR([m4]) -dnl The AC_LIB_RPATH macro comes from gettext, which is one of our bootstrap -dnl packages. It defines, among other things, the $acl_shlibext variable that +dnl The AC_LIB_RPATH macro comes from a Gnulib-provided file in m4/. +dnl It defines, among other things, the $acl_shlibext variable that dnl contains the shared library extension for this system. We already use the -dnl AM_ICONV macro from gettext (which ultimately calls AC_LIB_RPATH), and we +dnl AM_ICONV macro from the same source (which ultimately calls AC_LIB_RPATH), and we dnl avoid involving libtool by using it to get the shared library extension. AC_LIB_RPATH AC_SUBST(SHLIBEXT, "${acl_shlibext}")