Skip to content

Commit 16b3c5a

Browse files
committed
.homebrew-build-env, build/pkgs/{_prereq,_bootstrap}/distros: Remove gettext
1 parent f53bed1 commit 16b3c5a

14 files changed

+13
-20
lines changed

.homebrew-build-env

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# that activate keg-only homebrew package installations
33

44
HOMEBREW=`brew --prefix` || return 1
5-
for l in gettext bzip2 texinfo polymake; do
5+
for l in bzip2 texinfo polymake; do
66
if [ -d "$HOMEBREW/opt/$l/bin" ]; then
77
PATH="$HOMEBREW/opt/$l/bin:$PATH"
88
fi
@@ -39,7 +39,7 @@ for l in "gcc/lib/gcc/11 gcc/lib/gcc/10 gcc/lib/gcc/9"; do
3939
done
4040
export LIBRARY_PATH
4141
export CPATH
42-
for l in gettext; do
42+
for l in ; do
4343
if [ -d "$HOMEBREW/opt/$l/share/aclocal" ]; then
4444
ACLOCAL_PATH="$HOMEBREW/opt/$l/share/aclocal:$ACLOCAL_PATH"
4545
fi
+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
# Packages needed for ./bootstrap
2-
gettext autoconf automake libtool
2+
autoconf automake libtool
33
# Otherwise: Error: could not locate the pkg-config autoconf macros. These are
44
pkg-config
+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
# Packages needed for ./bootstrap
2-
gettext autoconf automake libtool
2+
autoconf automake libtool
+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
# Packages needed for ./bootstrap
2-
gettext-devel autoconf automake libtool
2+
autoconf automake libtool

build/pkgs/_bootstrap/distros/debian.txt

-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
# Packages needed for ./bootstrap
2-
gettext
32
autoconf
43
automake
54
libtool
+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
# Packages needed for ./bootstrap
2-
gettext-devel autoconf automake libtool
2+
autoconf automake libtool
33
# Fedora 26 needs:
44
pkg-config
+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
# Packages needed for ./bootstrap
2-
gettext autoconf automake libtool pkg-config
2+
autoconf automake libtool pkg-config
+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
# Packages needed for ./bootstrap
2-
gettext autoconf automake libtool pkg-config
2+
autoconf automake libtool pkg-config

build/pkgs/_bootstrap/distros/nix.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
# Packages needed for ./bootstrap
2-
gettext autoconf automake libtool pkg-config
2+
autoconf automake libtool pkg-config

build/pkgs/_bootstrap/distros/opensuse.txt

-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
# Packages needed for ./bootstrap
2-
gettext-tools
32
autoconf
43
automake
54
libtool
+1-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11
# Packages needed for ./bootstrap
2-
gettext autoconf automake libtool
3-
gettext-devel
2+
autoconf automake libtool
43
xtools mk-configure

build/pkgs/_prereq/distros/gentoo.txt

-2
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,6 @@ sys-devel/bc
1414
dev-lang/python
1515
sys-devel/flex
1616
app-misc/ca-certificates
17-
sys-devel/gettext
18-
dev-libs/libcroco
1917
dev-libs/libxml2
2018
sys-apps/findutils
2119
sys-apps/which

build/pkgs/_prereq/distros/slackware.txt

-2
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,5 @@ flex
1515
# for https upstream_url downloads
1616
ca-certificates
1717
pkg-config
18-
gettext-tools
19-
libcroco # gettext dependency (msgfmt)
2018
libxml2
2119
cyrus-sasl

configure.ac

+3-3
Original file line numberDiff line numberDiff line change
@@ -49,10 +49,10 @@ dnl Make sure the path to our own m4 macros is always properly set
4949
dnl and doesn't depend on how autoconf is called.
5050
AC_CONFIG_MACRO_DIR([m4])
5151

52-
dnl The AC_LIB_RPATH macro comes from gettext, which is one of our bootstrap
53-
dnl packages. It defines, among other things, the $acl_shlibext variable that
52+
dnl The AC_LIB_RPATH macro comes from a Gnulib-provided file in m4/.
53+
dnl It defines, among other things, the $acl_shlibext variable that
5454
dnl contains the shared library extension for this system. We already use the
55-
dnl AM_ICONV macro from gettext (which ultimately calls AC_LIB_RPATH), and we
55+
dnl AM_ICONV macro from the same source (which ultimately calls AC_LIB_RPATH), and we
5656
dnl avoid involving libtool by using it to get the shared library extension.
5757
AC_LIB_RPATH
5858
AC_SUBST(SHLIBEXT, "${acl_shlibext}")

0 commit comments

Comments
 (0)