From patchwork Wed Oct 12 14:14:45 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dirk Neukirchen X-Patchwork-Id: 681336 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2001:1868:205::9]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3svGDC1kqXz9s9x for ; Thu, 13 Oct 2016 01:18:03 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.85_2 #1 (Red Hat Linux)) id 1buKJo-0000qq-9i; Wed, 12 Oct 2016 14:15:40 +0000 Received: from mout.web.de ([217.72.192.78]) by bombadil.infradead.org with esmtps (Exim 4.85_2 #1 (Red Hat Linux)) id 1buKJZ-00082E-Sc for lede-dev@lists.infradead.org; Wed, 12 Oct 2016 14:15:30 +0000 Received: from tenchi-htpc.lan ([91.66.240.88]) by smtp.web.de (mrweb102) with ESMTPSA (Nemesis) id 0Marpe-1bZv4x2w5y-00KMJs for ; Wed, 12 Oct 2016 16:15:01 +0200 From: Dirk Neukirchen To: lede-dev@lists.infradead.org Date: Wed, 12 Oct 2016 16:14:45 +0200 Message-Id: <20161012141445.12851-4-dirkneukirchen@web.de> X-Mailer: git-send-email 2.10.0 In-Reply-To: <20161012141445.12851-1-dirkneukirchen@web.de> References: <20161012141445.12851-1-dirkneukirchen@web.de> X-Provags-ID: V03:K0:mrKH6Gy8Dr1/ZDp6GWktPiFdX2R/M87fAAA+9f7gGIjwLsc8v6d PbEMzj8zRFEENb0fGQtJuwTK/xjw9mRYkKdqYGpNthiPNAwZMOGaE8S0TUcAzJXIc4USIdj 0v8KSIJCnsb/r989ebMU2EtqFbMGb6SBJSyTIjYcu3vLyMS0cj+ewfUckUIhlfnh3fhwUzj EH15k7o0r8TJQ9aVBUtAA== X-UI-Out-Filterresults: notjunk:1; V01:K0:q5or9r6TkIM=:teWyBzZfx90KJwjZ2H0mbj 1aHBYSvg8G2Ih2f6qvQnbMcZF2xOXkAfngnp4OH/HxN5jhOV9Mnj7FbPVt9pCh/Tb4hFxSrUc w1rpC+jl+WBfsBKBQhtgGeYgURF0PMr0yL+5GaJ9keRBtqQ2YvRG94qr3sqexHCM7BPwAQrWw 4BT6Lz2Z5qzhfUWIfEjGZrz/w/Ibd8X1jY5lMA5at9zFyT27j43/+O849z6k3UmzGwFhNMPot Yd3+g2pfWIbDtAxv3OdXFpsLuz1Lg9Y4Lq9VKM4oN4IR9QpE0xlYGfDl+1t2/0byLbVt1X731 z/7OhoLANmy0qPBvUoaFjiDtEds/p1MjoScyj64WgPyg7Qf//6b7xHkIhR0oayeT/w9pzCavr LkLw+6FU08SYqVsfmeH/br93I6cf08JC/wiuoqLO9g5GFiObS94Ec8YIV/PSxxcRilhe2ZlSo 5n525ux3xU56xls+Qj8PI3jZ2vvEpSBce2yn3VYdrunwL1538xbIc/3aAI3uV+d6iQm6Uu5M/ m8ZQaqHyXXPmUVtnFivJUj8umGkhpyNf8tBHebSuMq6Hl8WBGGFwdVjmxqkv8RKk4Mq/VKnjW zoAXEere69GFzG9rInhyk4NuLwsbpd7wByLr9QNaq8MvcBAKvfOIugNqfMKK07zp8NkAATS7a 77TowIWjcSmVuk7NQvww0FGrYqGeBriZZ38m/DyGX6NRERXZphvRTh1P6lMExuYO0uR4C6gOk i1lqCFgPSq+CtGGE3yfS9j5kTSEdvogs1FVICZTJr9+SaBRxR1AWNlhoviY= X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20161012_071526_360029_E2EE6E17 X-CRM114-Status: UNSURE ( 8.15 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -4.0 (----) X-Spam-Report: SpamAssassin version 3.4.0 on bombadil.infradead.org summary: Content analysis details: (-4.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_MSPIKE_H3 RBL: Good reputation (+3) [217.72.192.78 listed in wl.mailspike.net] -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [217.72.192.78 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (dirkneukirchen[at]web.de) -1.4 RP_MATCHES_RCVD Envelope sender domain matches handover relay domain -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] -0.0 RCVD_IN_MSPIKE_WL Mailspike good senders Subject: [LEDE-DEV] [PATCH 3/3] gettext-full: update to 0.19.8.1 X-BeenThere: lede-dev@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "Lede-dev" Errors-To: lede-dev-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org - unify configs of host/target - disable stuff to decrease build time - disable interactive gettextize: see http://lists.busybox.net/pipermail/buildroot/2014-April/093394.html Signed-off-by: Dirk Neukirchen --- package/libs/gettext-full/Makefile | 18 ++++++++++++++---- package/libs/gettext-full/patches/001-autotools.patch | 2 +- .../patches/001-no_examples_and_tests.patch | 4 ++-- .../gettext-full/patches/120-uclibc-nolocale.patch | 2 +- .../patches/150-disable_libxml_iconv.patch | 4 ++-- 5 files changed, 20 insertions(+), 10 deletions(-) diff --git a/package/libs/gettext-full/Makefile b/package/libs/gettext-full/Makefile index abe311f..eb4236b 100644 --- a/package/libs/gettext-full/Makefile +++ b/package/libs/gettext-full/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=gettext-full -PKG_VERSION:=0.19.6 -PKG_RELEASE:=3 +PKG_VERSION:=0.19.8.1 +PKG_RELEASE:=1 PKG_SOURCE:=gettext-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=@GNU/gettext -PKG_MD5SUM:=69d79254ee3b41df23f41c2f4fd720d9 +PKG_MD5SUM:=df3f5690eaa30fd228537b00cb7b7590 PKG_BUILD_DIR:=$(BUILD_DIR)/gettext-$(PKG_VERSION) HOST_BUILD_DIR:=$(BUILD_DIR_HOST)/gettext-$(PKG_VERSION) @@ -46,6 +46,7 @@ endif CONFIGURE_ARGS += \ --enable-shared \ --enable-static \ + --disable-libasprintf \ --disable-rpath \ --enable-nls \ --disable-java \ @@ -58,7 +59,14 @@ CONFIGURE_ARGS += \ --without-emacs HOST_CONFIGURE_ARGS += \ - --with-included-libxml --without-libxml2-prefix --with-included-libcroco + --disable-libasprintf \ + --disable-rpath \ + --disable-java \ + --disable-native-java \ + --disable-openmp \ + --without-emacs \ + --without-libxml2-prefix + HOST_CONFIGURE_VARS += \ EMACS="no" @@ -72,6 +80,8 @@ define Build/InstallDev $(INSTALL_DIR) $(1)/usr/share/aclocal $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/share/aclocal/* $(1)/usr/share/aclocal/ + + $(SED) '/read dummy/d' $(STAGING_DIR)/host/bin/gettextize endef define Package/libintl-full/install diff --git a/package/libs/gettext-full/patches/001-autotools.patch b/package/libs/gettext-full/patches/001-autotools.patch index 2f23c8e..4b1799f 100644 --- a/package/libs/gettext-full/patches/001-autotools.patch +++ b/package/libs/gettext-full/patches/001-autotools.patch @@ -12,7 +12,7 @@ $(INSTALL_DATA) $$dir/$$file $(DESTDIR)$(htmldir)/$$file; \ --- a/gettext-tools/man/Makefile.am +++ b/gettext-tools/man/Makefile.am -@@ -154,8 +154,7 @@ recode-sr-latin.1.html: recode-sr-latin. +@@ -153,8 +153,7 @@ recode-sr-latin.1.html: recode-sr-latin. gettextize.1.html: gettextize.1 autopoint.1.html: autopoint.1 diff --git a/package/libs/gettext-full/patches/001-no_examples_and_tests.patch b/package/libs/gettext-full/patches/001-no_examples_and_tests.patch index 97353b1..abb1b24 100644 --- a/package/libs/gettext-full/patches/001-no_examples_and_tests.patch +++ b/package/libs/gettext-full/patches/001-no_examples_and_tests.patch @@ -15,8 +15,8 @@ AUTOMAKE_OPTIONS = 1.5 gnu no-dependencies ACLOCAL_AMFLAGS = -I m4 -I ../gettext-runtime/m4 -I ../m4 -I gnulib-m4 -I libgrep/gnulib-m4 -I libgettextpo/gnulib-m4 --SUBDIRS = doc intl gnulib-lib libgrep src libgettextpo po projects styles misc man m4 tests gnulib-tests examples -+SUBDIRS = intl gnulib-lib libgrep src libgettextpo po projects styles misc m4 +-SUBDIRS = doc intl gnulib-lib libgrep src libgettextpo po projects styles misc man m4 tests gnulib-tests examples its ++SUBDIRS = intl gnulib-lib libgrep src libgettextpo po projects styles misc m4 its EXTRA_DIST = misc/DISCLAIM MOSTLYCLEANFILES = core *.stackdump diff --git a/package/libs/gettext-full/patches/120-uclibc-nolocale.patch b/package/libs/gettext-full/patches/120-uclibc-nolocale.patch index 4c6a73e..40ca10e 100644 --- a/package/libs/gettext-full/patches/120-uclibc-nolocale.patch +++ b/package/libs/gettext-full/patches/120-uclibc-nolocale.patch @@ -1,6 +1,6 @@ --- a/gettext-runtime/intl/localename.c +++ b/gettext-runtime/intl/localename.c -@@ -2788,7 +2788,7 @@ gl_locale_name_posix (int category, cons +@@ -2790,7 +2790,7 @@ gl_locale_name_posix (int category, cons { /* Use the POSIX methods of looking to 'LC_ALL', 'LC_xxx', and 'LANG'. On some systems this can be done by the 'setlocale' function itself. */ diff --git a/package/libs/gettext-full/patches/150-disable_libxml_iconv.patch b/package/libs/gettext-full/patches/150-disable_libxml_iconv.patch index a8f5a5c..da037fe 100644 --- a/package/libs/gettext-full/patches/150-disable_libxml_iconv.patch +++ b/package/libs/gettext-full/patches/150-disable_libxml_iconv.patch @@ -1,6 +1,6 @@ --- a/gettext-tools/gnulib-lib/libxml/xmlversion.in.h +++ b/gettext-tools/gnulib-lib/libxml/xmlversion.in.h -@@ -263,7 +263,7 @@ XMLPUBFUN void XMLCALL xmlCheckVersion(i +@@ -273,7 +273,7 @@ XMLPUBFUN void XMLCALL xmlCheckVersion(i * * Whether iconv support is available */ @@ -11,7 +11,7 @@ --- a/gnulib-local/lib/libxml/xmlversion.in.h +++ b/gnulib-local/lib/libxml/xmlversion.in.h -@@ -263,7 +263,7 @@ XMLPUBFUN void XMLCALL xmlCheckVersion(i +@@ -273,7 +273,7 @@ XMLPUBFUN void XMLCALL xmlCheckVersion(i * * Whether iconv support is available */