Skip to content
This repository has been archived by the owner on Feb 1, 2023. It is now read-only.

Commit

Permalink
.homebrew-build-env, build/pkgs/{_prereq,_bootstrap}/distros: Remove …
Browse files Browse the repository at this point in the history
…gettext
  • Loading branch information
Matthias Koeppe committed Aug 22, 2022
1 parent f53bed1 commit 16b3c5a
Show file tree
Hide file tree
Showing 14 changed files with 13 additions and 20 deletions.
4 changes: 2 additions & 2 deletions .homebrew-build-env
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion build/pkgs/_bootstrap/distros/arch.txt
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion build/pkgs/_bootstrap/distros/conda.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
# Packages needed for ./bootstrap
gettext autoconf automake libtool
autoconf automake libtool
2 changes: 1 addition & 1 deletion build/pkgs/_bootstrap/distros/cygwin.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
# Packages needed for ./bootstrap
gettext-devel autoconf automake libtool
autoconf automake libtool
1 change: 0 additions & 1 deletion build/pkgs/_bootstrap/distros/debian.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
# Packages needed for ./bootstrap
gettext
autoconf
automake
libtool
Expand Down
2 changes: 1 addition & 1 deletion build/pkgs/_bootstrap/distros/fedora.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Packages needed for ./bootstrap
gettext-devel autoconf automake libtool
autoconf automake libtool
# Fedora 26 needs:
pkg-config
2 changes: 1 addition & 1 deletion build/pkgs/_bootstrap/distros/freebsd.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
# Packages needed for ./bootstrap
gettext autoconf automake libtool pkg-config
autoconf automake libtool pkg-config
2 changes: 1 addition & 1 deletion build/pkgs/_bootstrap/distros/homebrew.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
# Packages needed for ./bootstrap
gettext autoconf automake libtool pkg-config
autoconf automake libtool pkg-config
2 changes: 1 addition & 1 deletion build/pkgs/_bootstrap/distros/nix.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
# Packages needed for ./bootstrap
gettext autoconf automake libtool pkg-config
autoconf automake libtool pkg-config
1 change: 0 additions & 1 deletion build/pkgs/_bootstrap/distros/opensuse.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
# Packages needed for ./bootstrap
gettext-tools
autoconf
automake
libtool
Expand Down
3 changes: 1 addition & 2 deletions build/pkgs/_bootstrap/distros/void.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
# Packages needed for ./bootstrap
gettext autoconf automake libtool
gettext-devel
autoconf automake libtool
xtools mk-configure
2 changes: 0 additions & 2 deletions build/pkgs/_prereq/distros/gentoo.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 0 additions & 2 deletions build/pkgs/_prereq/distros/slackware.txt
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,5 @@ flex
# for https upstream_url downloads
ca-certificates
pkg-config
gettext-tools
libcroco # gettext dependency (msgfmt)
libxml2
cyrus-sasl
6 changes: 3 additions & 3 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -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}")
Expand Down

0 comments on commit 16b3c5a

Please sign in to comment.