[vlc-devel] [PATCH] extras: tools: Provide gettext if necessary

Martin Storsjö martin at martin.st
Thu Jun 14 13:21:29 CEST 2018


Building many contribs requires having autopoint available, and
having using the version from contribs isn't right when cross compiling.
---
 extras/tools/SHA512SUMS   |  1 +
 extras/tools/bootstrap    |  1 +
 extras/tools/packages.mak |  3 +++
 extras/tools/tools.mak    | 21 +++++++++++++++++++++
 4 files changed, 26 insertions(+)

diff --git a/extras/tools/SHA512SUMS b/extras/tools/SHA512SUMS
index 58bba98567..566ff2b47b 100644
--- a/extras/tools/SHA512SUMS
+++ b/extras/tools/SHA512SUMS
@@ -15,3 +15,4 @@ e80ace766e145f6486e76da1a5a9819221b7f406745a02529b4ad220ef7f51ddd67f23d0d8b187bf
 bbdc23e7772e49da1c7c47e66d4e4efbfbfe9b21dbc59bf3ad9a6e573eecac6c9f52c7f11a64be9897e8deb99ef7ba015164aa8232aa391b901dd7db03632412  bison-3.0.4.tar.xz
 e9785f3d620a204b7d20222888917dc065c2036cae28667065bf7862dfa1b25235095a12fd04efdbd09bfd17d3452e6b9ef953a8c1137862ff671c97132a082e  flex-2.6.4.tar.gz
 611e573756e3e936ce16b456df9583eb9acae51a0fbd28212444ddc0c1c5ec21e893d7a666bd77ef53423024939291a31dcf86d129126fa707b729d80b24184d  nasm-2.13.03.tar.gz
+073042fa2dc48804c58e76f036130a669e19612c25427b0ab14d0b366b549a63751bf3af03bfd0745d7c4f72497a4b2aab26a3cc6de83189ce111679073878e1  gettext-0.19.8.1.tar.gz
diff --git a/extras/tools/bootstrap b/extras/tools/bootstrap
index 6f77a0ff2a..80c248b808 100755
--- a/extras/tools/bootstrap
+++ b/extras/tools/bootstrap
@@ -133,6 +133,7 @@ check xz
 check bison 3.0.0
 check flex
 check_nasm 2.13.01
+check gettext
 
 [ -n "$NEEDED" ] && mkdir -p build/ && echo "To-be-built packages: `echo $NEEDED | sed 's/\.//g'`"
 
diff --git a/extras/tools/packages.mak b/extras/tools/packages.mak
index 5ebdcde8a5..b09f005381 100644
--- a/extras/tools/packages.mak
+++ b/extras/tools/packages.mak
@@ -53,3 +53,6 @@ BISON_URL=$(GNU)/bison/bison-$(BISON_VERSION).tar.xz
 
 FLEX_VERSION=2.6.4
 FLEX_URL=https://github.com/westes/flex/releases/download/v$(FLEX_VERSION)/flex-$(FLEX_VERSION).tar.gz
+
+GETTEXT_VERSION=0.19.8.1
+GETTEXT_URL=$(GNU)/gettext/gettext-$(GETTEXT_VERSION).tar.gz
diff --git a/extras/tools/tools.mak b/extras/tools/tools.mak
index d9b94aed79..44517799dc 100644
--- a/extras/tools/tools.mak
+++ b/extras/tools/tools.mak
@@ -351,6 +351,27 @@ DISTCLEAN_PKG += flex-$(FLEX_VERSION).tar.gz
 CLEAN_FILE += .flex
 
 
+
+#
+# GNU gettext
+#
+
+gettext-$(GETTEXT_VERSION).tar.gz:
+	$(call download_pkg,$(GETTEXT_URL),gettext)
+
+gettext: gettext-$(GETTEXT_VERSION).tar.gz
+	$(UNPACK)
+	$(MOVE)
+
+.gettext: gettext
+	(cd $<; ./configure --prefix=$(PREFIX) && $(MAKE) && $(MAKE) install)
+	touch $@
+
+CLEAN_PKG += gettext
+DISTCLEAN_PKG += gettext-$(GETTEXT_VERSION).tar.gz
+CLEAN_FILE += .gettext
+
+
 #
 #
 #
-- 
2.15.1 (Apple Git-101)



More information about the vlc-devel mailing list