summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Olbrich <m.olbrich@pengutronix.de>2021-02-26 21:37:48 +0100
committerMichael Olbrich <m.olbrich@pengutronix.de>2021-02-27 08:32:42 +0100
commitc8605b0cc42f616a7f7797dae36fe673cd39ea4c (patch)
treeb3b8837ae0ea6341374540734c1040784e809ce3
parent6651a4dbb70e8cd0341da9b6a95d8368308d1c06 (diff)
downloadptxdist-c8605b0cc42f616a7f7797dae36fe673cd39ea4c.tar.gz
ptxdist-c8605b0cc42f616a7f7797dae36fe673cd39ea4c.tar.xz
gettext: version bump 0.20.2 -> 0.21
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
-rw-r--r--rules/gettext.make11
-rw-r--r--rules/host-gettext.make14
2 files changed, 16 insertions, 9 deletions
diff --git a/rules/gettext.make b/rules/gettext.make
index c8f25a2d6..807f0e5b6 100644
--- a/rules/gettext.make
+++ b/rules/gettext.make
@@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_GETTEXT) += gettext
#
# Paths and names
#
-GETTEXT_VERSION := 0.20.2
-GETTEXT_MD5 := 0cf5f68338d5d941bbf9ac93b847310f
+GETTEXT_VERSION := 0.21
+GETTEXT_MD5 := 40996bbaf7d1356d3c22e33a8b255b31
GETTEXT := gettext-$(GETTEXT_VERSION)
GETTEXT_SUFFIX := tar.xz
GETTEXT_URL := $(call ptx/mirror, GNU, gettext/$(GETTEXT).$(GETTEXT_SUFFIX))
@@ -32,13 +32,10 @@ GETTEXT_LICENSE_FILES := \
# Prepare
# ----------------------------------------------------------------------------
-GETTEXT_PATH := PATH=$(CROSS_PATH)
-GETTEXT_ENV := $(CROSS_ENV)
-
#
# autoconf
#
-GETTEXT_AUTOCONF := \
+GETTEXT_CONF_OPT := \
$(CROSS_AUTOCONF_USR) \
--disable-java \
--disable-csharp \
@@ -59,6 +56,8 @@ GETTEXT_AUTOCONF := \
--without-included-libxml \
--with-included-regex \
--without-emacs \
+ --without-git \
+ --without-cvs \
--without-bzip2 \
--without-xz
diff --git a/rules/host-gettext.make b/rules/host-gettext.make
index 4553e0652..71c9d2ce3 100644
--- a/rules/host-gettext.make
+++ b/rules/host-gettext.make
@@ -22,17 +22,25 @@ HOST_PACKAGES-$(PTXCONF_HOST_GETTEXT) += host-gettext
HOST_GETTEXT_AUTOCONF := \
$(HOST_AUTOCONF) \
--disable-java \
- --disable-native-java \
--disable-csharp \
+ --enable-threads=posix \
--disable-static \
--disable-nls \
+ --disable-rpath \
--disable-c++ \
+ --enable-cross-guesses=conservative \
--enable-relocatable \
--disable-libasprintf \
- --disable-acl \
- --disable-openmp \
--disable-curses \
+ --enable-namespacing \
+ --disable-openmp \
+ --disable-acl \
+ --with-included-libunistring \
+ --with-included-libxml \
+ --with-included-regex \
--without-emacs \
+ --without-git \
+ --without-cvs \
--without-bzip2 \
--without-xz