From patchwork Tue Apr 21 20:55:02 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adam Duskett X-Patchwork-Id: 1274513 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.138; helo=whitealder.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=LDbw6a+c; dkim-atps=neutral Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 496G6V4CK6z9sRN for ; Wed, 22 Apr 2020 06:55:14 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 11BE887580; Tue, 21 Apr 2020 20:55:13 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id tHqHFlvzjGbk; Tue, 21 Apr 2020 20:55:12 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 23F3A86D78; Tue, 21 Apr 2020 20:55:12 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 0315B1BF25B for ; Tue, 21 Apr 2020 20:55:09 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id F3C5F86E6F for ; Tue, 21 Apr 2020 20:55:08 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id SM9LCfHDtMia for ; Tue, 21 Apr 2020 20:55:07 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-pj1-f52.google.com (mail-pj1-f52.google.com [209.85.216.52]) by whitealder.osuosl.org (Postfix) with ESMTPS id 9DC0E86D13 for ; Tue, 21 Apr 2020 20:55:07 +0000 (UTC) Received: by mail-pj1-f52.google.com with SMTP id np7so63272pjb.1 for ; Tue, 21 Apr 2020 13:55:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=ZXmT5HIjvlc33/8PvXS9dYORm7TNyolON4T+x6XS0D8=; b=LDbw6a+cMNKH7h4wasyfvHvHqJEphXQvAYD5G4V6A87ZTxEh7mLIYgykzFnWLcS4JE /O8E4uLYymy4vGvD7gsuq8zBsYEdiJR9JI+f5O/R9MFR7rUDMZ0gW/P5GDBzWlYZCtMg j3zyHkoPFQSi5NntAxThOowukAPpH6unOqdSm6p1aPuDn7zPQXKA9VRtpQ6GoQK+kSq3 vuGUYaHq3vwKjUpAdZHarcZX54ziwSgzCXhsjPsImPyF1HHOO6rWPx8frpXRoTnqFG7w JajDjmsZDweDsVIdhwMfZ3V/oLdLGZ1azM38It93dmQOIc27CAhxnvmWgXzqQsbUyjyD d9cQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=ZXmT5HIjvlc33/8PvXS9dYORm7TNyolON4T+x6XS0D8=; b=m7Kl+KgbpkHWvtIn2caLi38mGLsjqbHeXbhSLBD3/wD2thbBg2uWO0AH5xpfDkQt0O RmjIrN72acPV5GRBlAlc9nzMHIMiXyFkHwgsPohmmZ7qrCQv6i+S2VF677ziedvwLUE/ r2sgeqQ1Z3wC+E9qXOG7rB/f26yyNrRztbRZDqfmU4RAMcrxH30clT1YyCqTNdQWWZmP qlyLM7Fbcj6fPwLdflvHq2YiDzJfm2MSRd71h7qJTsI3zW+/jF6LWtmaWf/qzotgSxlh 78JktN4+NOVkl7iQfKMRrnIQAga4YEk8KefaPLHC2qQ2c4OaTvhfFKugNapKkYr1JfmA sKaA== X-Gm-Message-State: AGi0PuYkPAJGkm12uUJMSF5H0VxfM46DGcUCInLktV4+Dpz0XqA/ZLLl f1wn2JwSiB81u3s0ZQtjIyNsH8kd8f0= X-Google-Smtp-Source: APiQypJU1ILQbjN5TXV+hyE4EIXKW08t1eITeCdKRI6FcHkvBOzM2Ri6e1Qq/nCedMy9A6T5sMRwIQ== X-Received: by 2002:a17:90a:8d02:: with SMTP id c2mr7664556pjo.113.1587502506732; Tue, 21 Apr 2020 13:55:06 -0700 (PDT) Received: from localhost.localdomain ([47.149.8.172]) by smtp.gmail.com with ESMTPSA id t15sm3048435pgv.61.2020.04.21.13.55.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Apr 2020 13:55:06 -0700 (PDT) From: aduskett@gmail.com To: buildroot@buildroot.org Date: Tue, 21 Apr 2020 13:55:02 -0700 Message-Id: <20200421205504.3061551-1-aduskett@gmail.com> X-Mailer: git-send-email 2.25.3 MIME-Version: 1.0 Subject: [Buildroot] [PATCH v4 1/3] package/libtextstyle: new package X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Adam Duskett Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" From: Adam Duskett This library provides an easy way to add styling to programs that produce output to a console or terminal emulator window. libtextstyle is for you if your application produces text that is more readable when it is accompanied with styling information, such as color, font attributes (weight, posture), or underlining. Our gettext-gnu package currently has HOST_GETTEXT_GNU_SUBDIR = gettext-tools so we only configure and build the gettext-tools sub-directory. Version 0.20.1 of gettext-gnu now requires libtextstyle, which the subdirectory gettext-tools does not provide. We have three options: 1) Add hooks to configure and build libtextstyle as a pre-configure hook in gettext-gnu, and install it in a pre-install hook. 2) Revert to building the whole of gettext. 3) Add a separate package for libtextstyle. Here are the results of a test with BR2_JLEVEL=4: - Only gettext-tools: 38.86s user 22.13s system 124% CPU 49.035 total - gettext + libtextstyle: 40.78s user 14.57s system 146% CPU 37.817 total - All of gettext: 203.18s user 122.87s system 161% CPU 3:22.39 total As seen above, compiling the entire gettext package takes 5x longer than building libtextstyle and gettext separately! As such, the best option is option 3, as the time increase to build libtextstyle is negligible. Tested with test-pkg -p gettext-tiny in Debian 10 and Centos 7 br-arm-full [1/6]: OK br-arm-cortex-a9-glibc [2/6]: OK br-arm-cortex-m4-full [3/6]: OK br-x86-64-musl [4/6]: OK br-arm-full-static [5/6]: OK sourcery-arm [6/6]: OK Signed-off-by: Adam Duskett --- Changes v2 -> v3: - Add a much more comprehensive change log (Yann) Changes v3 -> v4: - Remove the target variant (Thomas) DEVELOPERS | 1 + package/libtextstyle/libtextstyle.hash | 6 ++++++ package/libtextstyle/libtextstyle.mk | 21 +++++++++++++++++++++ 3 files changed, 28 insertions(+) create mode 100644 package/libtextstyle/libtextstyle.hash create mode 100644 package/libtextstyle/libtextstyle.mk diff --git a/DEVELOPERS b/DEVELOPERS index c57bc1c5c9..03ea2d39f2 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -48,6 +48,7 @@ F: package/libressl/ F: package/libselinux/ F: package/libsemanage/ F: package/libsepol/ +F: package/libtextstyle/ F: package/libwebsockets/ F: package/mender-grubenv/ F: package/nginx-naxsi/ diff --git a/package/libtextstyle/libtextstyle.hash b/package/libtextstyle/libtextstyle.hash new file mode 100644 index 0000000000..5c5aee85bf --- /dev/null +++ b/package/libtextstyle/libtextstyle.hash @@ -0,0 +1,6 @@ +# From https://lists.gnu.org/archive/html/info-gnu/2019-05/msg00011.html +sha1 62f4a6a2fd5f80bfd0e66c497a04094fa3e07b90 gettext-0.20.1.tar.xz + +# Locally calculated +sha256 53f02fbbec9e798b0faaf7c73272f83608e835c6288dd58be6c9bb54624a3800 gettext-0.20.1.tar.xz +sha256 e79e9c8a0c85d735ff98185918ec94ed7d175efc377012787aebcf3b80f0d90b COPYING diff --git a/package/libtextstyle/libtextstyle.mk b/package/libtextstyle/libtextstyle.mk new file mode 100644 index 0000000000..aeefc28e9b --- /dev/null +++ b/package/libtextstyle/libtextstyle.mk @@ -0,0 +1,21 @@ +################################################################################ +# +# libtextstyle +# +################################################################################ + +LIBTEXTSTYLE_VERSION = 0.20.1 +LIBTEXTSTYLE_SITE = $(BR2_GNU_MIRROR)/gettext +LIBTEXTSTYLE_SOURCE = gettext-$(LIBTEXTSTYLE_VERSION).tar.xz +LIBTEXTSTYLE_INSTALL_STAGING = YES +LIBTEXTSTYLE_LICENSE = GPL-3.0+ +LIBTEXTSTYLE_LICENSE_FILES = COPYING +HOST_LIBTEXTSTYLE_SUBDIR = libtextstyle + +# gettext-tools require libtextstyle.m4 +define HOST_LIBTEXTSTYLE_INSTALL_M4 + $(INSTALL) -D -m 0755 $(@D)/libtextstyle/m4/libtextstyle.m4 $(ACLOCAL_HOST_DIR)/libtextstyle.m4 +endef +HOST_LIBTEXTSTYLE_POST_INSTALL_HOOKS += HOST_LIBTEXTSTYLE_INSTALL_M4 + +$(eval $(host-autotools-package)) From patchwork Tue Apr 21 20:55:03 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Adam Duskett X-Patchwork-Id: 1274514 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.136; helo=silver.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=nnCYfSGT; dkim-atps=neutral Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 496G6d6vPsz9sRN for ; Wed, 22 Apr 2020 06:55:21 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 8F477204C8; Tue, 21 Apr 2020 20:55:19 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id d8I-gKv0660i; Tue, 21 Apr 2020 20:55:14 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 2B0AE20455; Tue, 21 Apr 2020 20:55:14 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 997681BF25B for ; Tue, 21 Apr 2020 20:55:10 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 9618786D13 for ; Tue, 21 Apr 2020 20:55:10 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Ob0vphr0qcPw for ; Tue, 21 Apr 2020 20:55:08 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-pg1-f172.google.com (mail-pg1-f172.google.com [209.85.215.172]) by whitealder.osuosl.org (Postfix) with ESMTPS id BDD9086D81 for ; Tue, 21 Apr 2020 20:55:08 +0000 (UTC) Received: by mail-pg1-f172.google.com with SMTP id o15so6784591pgi.1 for ; Tue, 21 Apr 2020 13:55:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=f1X1WQZbwFZ3fWQ9JKaW+N04aKccp/ljA9/5C3rUIL4=; b=nnCYfSGTkRXcr5xR71MKXfJiOkjYCtDXFA9Ktx3Ot4yy4ZWw2a0N4k/D0C9jzl+nMV j1gfmwAvsc+ptSgGqEU4HUg7Lf8hFq53q3YFSluYJ8RxoAEkdVneYc7Z0D4XaEj5yIRX i/uMi/KDEZbYtl9KGSXosBxTbe/cUn/oe1pdtwCATUzBIg0A5ZmNVgWifF2U3PA5EXZQ iwF58z4asOlP1lJFOjW6Y9Ul/maunOlwWB8lctr62zeY4RYey8XJnZp60cBPCoUfjNUs SiFaGNLg3+heT4rr5pCsNrzwBCVCpP3nTO62ahdzO0cYusjQPD04yCEqHACCKA8ZHEFv i9+w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=f1X1WQZbwFZ3fWQ9JKaW+N04aKccp/ljA9/5C3rUIL4=; b=n45MGMEYni+ePvW0NCKuISl+v1oDKKVrk5JFOJlr8XxD5034Rom9h3AwfvrI2MNyUS bmKwE8MuwZjaKHkGOWRBhSnNsR+bQ60OOSgXgM2pHyW/MHojk3VK18g+Z6Tc16o79WLw B+Au8+5oQ7OtkMeagkv5ZvglTLfpS0PRBiHYuYDC7wW/7l0fchfpMzBiWt6f3mIkf5La dDAcO+KTiWbpUcI0C3OvOiH32u7C9B1CR8E1rkPRexrgT6jNfGnehwK4yED2vHehXvv0 81CPJbzbzjLjIL0WhVRM7FSCRvOgnXjulSC8AQjHE5C4Ao23DZbu1t6xIX3H5ca6f4pS CtFg== X-Gm-Message-State: AGi0PuYCMsIdGuhtHKlsaDp2xd7XH9LkUhyog2pBUi0RkBzU50Oe2lhy Lk5oPjO5dG/FZDf7H9hlZtt67TpAfEs= X-Google-Smtp-Source: APiQypI/06suFMGfr8pXQm4oP3hYGG4knpmeQIsECc9lB7+czoAqPJEbb37AJidguXK9lcXxnlWuTQ== X-Received: by 2002:a65:4908:: with SMTP id p8mr23027999pgs.413.1587502507542; Tue, 21 Apr 2020 13:55:07 -0700 (PDT) Received: from localhost.localdomain ([47.149.8.172]) by smtp.gmail.com with ESMTPSA id t15sm3048435pgv.61.2020.04.21.13.55.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Apr 2020 13:55:07 -0700 (PDT) From: aduskett@gmail.com To: buildroot@buildroot.org Date: Tue, 21 Apr 2020 13:55:03 -0700 Message-Id: <20200421205504.3061551-2-aduskett@gmail.com> X-Mailer: git-send-email 2.25.3 In-Reply-To: <20200421205504.3061551-1-aduskett@gmail.com> References: <20200421205504.3061551-1-aduskett@gmail.com> MIME-Version: 1.0 Subject: [Buildroot] [PATCH v4 2/3] package/gettext-gnu: bump version to 0.20.1 X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Adam Duskett Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" From: Adam Duskett Other changes: - Update license hash due to http -> https URL changes. - Depend on host-libtextstyle for host-gettext-gnu. - Update 0001-error_print_progname.patch to apply cleanly. - Remove upstream 0002-Update-after-gnulib-changed.patch - Add 0002-restore-the-ability-to-buld-gettext-tools-seperately-part1.patch which allows gettext-tools to build with an external libtextstyle. Tested under Debian 8 with test-pkg -a: 44 builds, 5 skipped, 0 build failed, 0 legal-info failed Signed-off-by: Adam Duskett --- Changes v2 -> v3: - Fix comment above GETTEXT_GNU_AUTORECONF = YES (Bernd) Changes v3 -> v4: - Removed the dependency on libtextstyle for the target. (Thomas) .../0001-error_print_progname.patch | 14 +- .../0002-Update-after-gnulib-changed.patch | 86 ----------- ...-buld-gettext-tools-seperately-part1.patch | 142 ++++++++++++++++++ package/gettext-gnu/Config.in | 1 + package/gettext-gnu/gettext-gnu.hash | 11 +- package/gettext-gnu/gettext-gnu.mk | 9 +- 6 files changed, 164 insertions(+), 99 deletions(-) delete mode 100644 package/gettext-gnu/0002-Update-after-gnulib-changed.patch create mode 100644 package/gettext-gnu/0002-restore-the-ability-to-buld-gettext-tools-seperately-part1.patch diff --git a/package/gettext-gnu/0001-error_print_progname.patch b/package/gettext-gnu/0001-error_print_progname.patch index 189d28b576..7e1d3c55cf 100644 --- a/package/gettext-gnu/0001-error_print_progname.patch +++ b/package/gettext-gnu/0001-error_print_progname.patch @@ -1,6 +1,11 @@ ---- gettext-0.16.1.oorig/gettext-tools/gnulib-lib/error.h 2006-11-27 18:14:50.000000000 +0100 -+++ gettext-0.16.1/gettext-tools/gnulib-lib/error.h 2007-06-20 13:29:32.000000000 +0200 -@@ -50,7 +50,10 @@ extern void error_at_line (int __status, +[Updated to apply cleanly with 0.20.1] +Signed-off-by: Adam Duskett +--- +diff --git a/gettext-tools/gnulib-lib/error.h b/gettext-tools/gnulib-lib/error.h +index 61771cc..4221684 100644 +--- a/gettext-tools/gnulib-lib/error.h ++++ b/gettext-tools/gnulib-lib/error.h +@@ -68,7 +68,10 @@ extern void error_at_line (int __status, int __errnum, const char *__fname, /* If NULL, error will flush stdout, then print on stderr the program name, a colon and a space. Otherwise, error will call this function without parameters instead. */ @@ -10,5 +15,6 @@ +#endif +void (*error_print_progname) (void); - /* This variable is incremented each time `error' is called. */ + /* This variable is incremented each time 'error' is called. */ extern DLL_VARIABLE unsigned int error_message_count; +-- diff --git a/package/gettext-gnu/0002-Update-after-gnulib-changed.patch b/package/gettext-gnu/0002-Update-after-gnulib-changed.patch deleted file mode 100644 index 5f5e5f6c25..0000000000 --- a/package/gettext-gnu/0002-Update-after-gnulib-changed.patch +++ /dev/null @@ -1,86 +0,0 @@ -From a6f9caf8cc7614665d1be694485dd7bc30399e0f Mon Sep 17 00:00:00 2001 -From: Bruno Haible -Date: Tue, 16 May 2017 00:27:57 +0200 -Subject: [PATCH] Update after gnulib changed. - -For buildroot we only need to update wint_t.m4 to fix autoreconf with -certain packages which already contain the updated version of this file. -Otherwise autoreconf will break: - -http://git.net/ml/bug-gnulib-gnu/2017-01/msg00067.html -https://git.busybox.net/buildroot/commit/package/wget?id=c36f0d65ad63589f1b21833ef53d429c018b6f8a - -Patch backported from upstream commit: -http://git.savannah.gnu.org/cgit/gettext.git/commit/?id=a6f9caf8cc7614665d1be694485dd7bc30399e0f - -Needed for coreutils bump to 8.27 - -Signed-off-by: Bernd Kuhls - -diff --git a/gettext-runtime/m4/wint_t.m4 b/gettext-runtime/m4/wint_t.m4 -index 8ff2a5b5a..d30b8bcf8 100644 ---- a/gettext-runtime/m4/wint_t.m4 -+++ b/gettext-runtime/m4/wint_t.m4 -@@ -1,11 +1,12 @@ --# wint_t.m4 serial 5 (gettext-0.18.2) --dnl Copyright (C) 2003, 2007-2016 Free Software Foundation, Inc. -+# wint_t.m4 serial 7 -+dnl Copyright (C) 2003, 2007-2017 Free Software Foundation, Inc. - dnl This file is free software; the Free Software Foundation - dnl gives unlimited permission to copy and/or distribute it, - dnl with or without modifications, as long as this notice is preserved. - - dnl From Bruno Haible. --dnl Test whether has the 'wint_t' type. -+dnl Test whether has the 'wint_t' type and whether gnulib's -+dnl or would, if present, override 'wint_t'. - dnl Prerequisite: AC_PROG_CC - - AC_DEFUN([gt_TYPE_WINT_T], -@@ -28,5 +29,46 @@ AC_DEFUN([gt_TYPE_WINT_T], - [gt_cv_c_wint_t=no])]) - if test $gt_cv_c_wint_t = yes; then - AC_DEFINE([HAVE_WINT_T], [1], [Define if you have the 'wint_t' type.]) -+ -+ dnl Determine whether gnulib's or would, if present, -+ dnl override 'wint_t'. -+ AC_CACHE_CHECK([whether wint_t is too small], -+ [gl_cv_type_wint_t_too_small], -+ [AC_COMPILE_IFELSE( -+ [AC_LANG_PROGRAM([[ -+/* Tru64 with Desktop Toolkit C has a bug: must be included before -+ . -+ BSD/OS 4.0.1 has a bug: , and must be -+ included before . */ -+#if !(defined __GLIBC__ && !defined __UCLIBC__) -+# include -+# include -+# include -+#endif -+#include -+ int verify[sizeof (wint_t) < sizeof (int) ? -1 : 1]; -+ ]])], -+ [gl_cv_type_wint_t_too_small=no], -+ [gl_cv_type_wint_t_too_small=yes])]) -+ if test $gl_cv_type_wint_t_too_small = yes; then -+ GNULIB_OVERRIDES_WINT_T=1 -+ else -+ GNULIB_OVERRIDES_WINT_T=0 -+ fi -+ else -+ GNULIB_OVERRIDES_WINT_T=0 -+ fi -+ AC_SUBST([GNULIB_OVERRIDES_WINT_T]) -+]) -+ -+dnl Prerequisites of the 'wint_t' override. -+AC_DEFUN([gl_TYPE_WINT_T_PREREQ], -+[ -+ AC_CHECK_HEADERS_ONCE([crtdefs.h]) -+ if test $ac_cv_header_crtdefs_h = yes; then -+ HAVE_CRTDEFS_H=1 -+ else -+ HAVE_CRTDEFS_H=0 - fi -+ AC_SUBST([HAVE_CRTDEFS_H]) - ]) diff --git a/package/gettext-gnu/0002-restore-the-ability-to-buld-gettext-tools-seperately-part1.patch b/package/gettext-gnu/0002-restore-the-ability-to-buld-gettext-tools-seperately-part1.patch new file mode 100644 index 0000000000..5334a36bb7 --- /dev/null +++ b/package/gettext-gnu/0002-restore-the-ability-to-buld-gettext-tools-seperately-part1.patch @@ -0,0 +1,142 @@ +From e4b3a3f56fa6fc2a51769e286545f0631bb4837c Mon Sep 17 00:00:00 2001 +From: Bruno Haible +Date: Sat, 18 May 2019 23:33:06 +0200 +Subject: [PATCH] build: Restore the ability to build gettext-tools separately, part 1. +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Reported by Hanspeter Niederstrasser +in . + +Code based on patch by Miguel Ángel Arruga Vivas . + +* autogen.sh: Copy libtextstyle.m4 for use by gettext-tools. +* gettext-tools/configure.ac: New option --with-installed-libtextstyle. +(USE_INSTALLED_LIBTEXTSTYLE): New conditional. +* gettext-tools/src/Makefile.am (textstyle.h): Disable rule if +USE_INSTALLED_LIBTEXTSTYLE is true. +(LT_LIBTEXTSTYLE): New variable. +(libgettextsrc_la_LDFLAGS): Use it instead of hardcoding a relative filename of +libtextstyle.la. +* configure.ac: Filter out --with-installed-libtextstyle from inherited --help +output. +* Makefile.am (distcheck-hook): Compare different copies of libtextstyle.m4. +* PACKAGING: Document that gettext-tools's configure needs to be invoked with +--with-installed-libtextstyle. + +Upstream-status: committed. +https://git.savannah.gnu.org/gitweb/?p=gettext.git;a=commitdiff;h=e4b3a3f56fa6fc2a51769e286545f0631bb4837c + +Signed-off-by: Bruno Haible +[Backported to 0.20.1] +Signed-off-by: Adam Duskett +--- + PACKAGING | 2 +- + autogen.sh | 1 + + configure.ac | 2 +- + gettext-tools/configure.ac | 16 ++++++++++++++++ + gettext-tools/src/Makefile.am | 8 +++++++- + 5 files changed, 26 insertions(+), 3 deletions(-) + +diff --git a/PACKAGING b/PACKAGING +index a8ce979..52b80ac 100644 +--- a/PACKAGING ++++ b/PACKAGING +@@ -42,7 +42,7 @@ The 'libtextstyle' binary package can be installed by doing + The 'gettext-tools' binary package can be installed by doing + + cd gettext-tools +- ./configure ++ ./configure --with-installed-libtextstyle + make + make install + +diff --git a/autogen.sh b/autogen.sh +index 5c28b6f..2ccf373 100755 +--- a/autogen.sh ++++ b/autogen.sh +@@ -268,6 +268,7 @@ if ! $skip_gnulib; then + $GNULIB_TOOL --dir=gettext-tools --lib=libgettextlib --source-base=gnulib-lib --m4-base=gnulib-m4 --tests-base=gnulib-tests --makefile-name=Makefile.gnulib --libtool --with-tests --local-dir=gnulib-local --local-symlink \ + --import --avoid=array-list-tests --avoid=linkedhash-list-tests --avoid=hash-tests --avoid=fdutimensat-tests --avoid=futimens-tests --avoid=utime-tests --avoid=utimens-tests --avoid=utimensat-tests \ + `for m in $GNULIB_MODULES_TOOLS_LIBUNISTRING_TESTS; do echo --avoid=$m; done` $GNULIB_MODULES_TOOLS_FOR_SRC $GNULIB_MODULES_TOOLS_FOR_SRC_COMMON_DEPENDENCIES $GNULIB_MODULES_TOOLS_OTHER || exit $? ++ $GNULIB_TOOL --copy-file m4/libtextstyle.m4 gettext-tools/gnulib-m4/libtextstyle.m4 || exit $? + # In gettext-tools/libgrep: + GNULIB_MODULES_TOOLS_FOR_LIBGREP=' + mbrlen +diff --git a/configure.ac b/configure.ac +index 38db6fd..0c84bdd 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -49,7 +49,7 @@ AC_CANONICAL_HOST + dnl Optional Features: AC_ARG_ENABLE calls + dnl Optional Packages: AC_ARG_WITH calls + dnl Some influential environment variables: AC_ARG_VAR calls +-esyscmd([{ cd gettext-runtime && autoconf --trace=AC_ARG_ENABLE:'$n([$1],[$2])' --trace=AC_ARG_WITH:'$n([$1],[$2])' --trace=AC_ARG_VAR:'$n($@)' && cd ..; cd libtextstyle && autoconf --trace=AC_ARG_ENABLE:'$n([$1],[$2])' --trace=AC_ARG_WITH:'$n([$1],[$2])' --trace=AC_ARG_VAR:'$n($@)' && cd ..; cd gettext-tools && autoconf --trace=AC_ARG_ENABLE:'$n([$1],[$2])' --trace=AC_ARG_WITH:'$n([$1],[$2])' --trace=AC_ARG_VAR:'$n($@)' && cd ..; } | sed -f build-aux/ac-help.sed ]) ++esyscmd([{ cd gettext-runtime && autoconf --trace=AC_ARG_ENABLE:'$n([$1],[$2])' --trace=AC_ARG_WITH:'$n([$1],[$2])' --trace=AC_ARG_VAR:'$n($@)' && cd ..; cd libtextstyle && autoconf --trace=AC_ARG_ENABLE:'$n([$1],[$2])' --trace=AC_ARG_WITH:'$n([$1],[$2])' --trace=AC_ARG_VAR:'$n($@)' && cd ..; { cd gettext-tools && autoconf --trace=AC_ARG_ENABLE:'$n([$1],[$2])' --trace=AC_ARG_WITH:'$n([$1],[$2])' --trace=AC_ARG_VAR:'$n($@)' && cd ..; } | grep -v installed.libtextstyle; } | sed -f build-aux/ac-help.sed ]) + + AC_CONFIG_FILES([Makefile]) + +diff --git a/gettext-tools/configure.ac b/gettext-tools/configure.ac +index cf1dd73..a6816b8 100644 +--- a/gettext-tools/configure.ac ++++ b/gettext-tools/configure.ac +@@ -121,6 +121,22 @@ AM_CONDITIONAL([PACKAGE_IS_GETTEXT_TOOLS], [true]) + AM_CONDITIONAL([PRELOADABLE_LIBINTL], + [test $USE_INCLUDED_LIBINTL = no && test $GLIBC2 = yes]) + ++dnl This option allows to build gettext-tools without (re)building libtextstyle. ++AC_ARG_WITH([installed-libtextstyle], ++ [AS_HELP_STRING([--with-installed-libtextstyle], ++ [Use an already installed libtextstyle.])], ++ [gt_use_installed_libtextstyle=$withval], ++ [gt_use_installed_libtextstyle=no]) ++if test "$gt_use_installed_libtextstyle" != no; then ++ gl_LIBTEXTSTYLE ++else ++ test -f ../libtextstyle/Makefile || { ++ AC_MSG_ERROR([When building the gettext-tools package without building the entire gettext package, you need to pass the --with-installed-libtextstyle option to configure.]) ++ } ++fi ++AM_CONDITIONAL([USE_INSTALLED_LIBTEXTSTYLE], ++ [test "$gt_use_installed_libtextstyle" != no]) ++ + dnl This line internationalizes the bison generated parsers. + BISON_I18N + +diff --git a/gettext-tools/src/Makefile.am b/gettext-tools/src/Makefile.am +index b98b7ab..af3dcee 100644 +--- a/gettext-tools/src/Makefile.am ++++ b/gettext-tools/src/Makefile.am +@@ -250,6 +250,9 @@ cldr_plurals_SOURCES = cldr-plural.y cldr-plural-exp.c cldr-plurals.c + cldr_plurals_CFLAGS = $(AM_CFLAGS) $(INCXML) + cldr_plurals_LDADD = libgettextsrc.la $(LDADD) + ++if USE_INSTALLED_LIBTEXTSTYLE ++LT_LIBTEXTSTYLE = @LTLIBTEXTSTYLE@ ++else + # How to get the include files of libtextstyle. + textstyle.h textstyle/stdbool.h textstyle/version.h textstyle/woe32dll.h: + here=`pwd`; \ +@@ -257,6 +260,9 @@ textstyle.h textstyle/stdbool.h textstyle/version.h textstyle/woe32dll.h: + $(MAKE) install-nobase_includeHEADERS install-nobase_nodist_includeHEADERS includedir="$$here" + BUILT_SOURCES += textstyle.h textstyle/stdbool.h textstyle/version.h textstyle/woe32dll.h + MOSTLYCLEANFILES += textstyle.h textstyle/stdbool.h textstyle/version.h textstyle/woe32dll.h ++# Where to find the built libtextstyle library. ++LT_LIBTEXTSTYLE = ../../libtextstyle/lib/libtextstyle.la ++endif + + # How to build libgettextsrc.la. + # Need ../gnulib-lib/libgettextlib.la. +@@ -268,7 +274,7 @@ MOSTLYCLEANFILES += textstyle.h textstyle/stdbool.h textstyle/version.h textstyl + # use iconv(). + libgettextsrc_la_LDFLAGS = \ + -release @VERSION@ \ +- ../gnulib-lib/libgettextlib.la $(LTLIBUNISTRING) ../../libtextstyle/lib/libtextstyle.la @LTLIBINTL@ @LTLIBICONV@ -lc -no-undefined ++ ../gnulib-lib/libgettextlib.la $(LTLIBUNISTRING) $(LT_LIBTEXTSTYLE) @LTLIBINTL@ @LTLIBICONV@ -lc -no-undefined + + # OS/2 does not support a DLL name longer than 8 characters. + if OS2 +-- +2.24.1 + diff --git a/package/gettext-gnu/Config.in b/package/gettext-gnu/Config.in index 27e7a3da4c..85ddb62788 100644 --- a/package/gettext-gnu/Config.in +++ b/package/gettext-gnu/Config.in @@ -2,6 +2,7 @@ config BR2_PACKAGE_GETTEXT_GNU bool depends on BR2_USE_WCHAR select BR2_PACKAGE_HAS_GETTEXT + select BR2_PACKAGE_LIBTEXTSTYLE help The GNU `gettext' utilities are a set of tools that provide a framework to help other GNU packages produce multi-lingual diff --git a/package/gettext-gnu/gettext-gnu.hash b/package/gettext-gnu/gettext-gnu.hash index 5a621ae2d3..4c17fb3e04 100644 --- a/package/gettext-gnu/gettext-gnu.hash +++ b/package/gettext-gnu/gettext-gnu.hash @@ -1,6 +1,7 @@ -# From http://lists.gnu.org/archive/html/bug-gettext/2016-06/msg00008.html -md5 df3f5690eaa30fd228537b00cb7b7590 gettext-0.19.8.1.tar.xz -sha1 e0fe90ede22f7f16bbde7bdea791a835f2773fc9 gettext-0.19.8.1.tar.xz -# License files, locally calculated -sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING +# From https://lists.gnu.org/archive/html/info-gnu/2019-05/msg00011.html +sha1 62f4a6a2fd5f80bfd0e66c497a04094fa3e07b90 gettext-0.20.1.tar.xz + +# Locally calculated +sha256 53f02fbbec9e798b0faaf7c73272f83608e835c6288dd58be6c9bb54624a3800 gettext-0.20.1.tar.xz +sha256 e79e9c8a0c85d735ff98185918ec94ed7d175efc377012787aebcf3b80f0d90b COPYING sha256 3fe5361f24b7c49ba12911c08f5a33f9cb18871d95d9fb881f5b8a4793e04288 gettext-runtime/intl/COPYING.LIB diff --git a/package/gettext-gnu/gettext-gnu.mk b/package/gettext-gnu/gettext-gnu.mk index 28662e0dec..3759edb9f0 100644 --- a/package/gettext-gnu/gettext-gnu.mk +++ b/package/gettext-gnu/gettext-gnu.mk @@ -4,19 +4,19 @@ # ################################################################################ -GETTEXT_GNU_VERSION = 0.19.8.1 +GETTEXT_GNU_VERSION = 0.20.1 GETTEXT_GNU_SITE = $(BR2_GNU_MIRROR)/gettext GETTEXT_GNU_SOURCE = gettext-$(GETTEXT_GNU_VERSION).tar.xz GETTEXT_GNU_INSTALL_STAGING = YES GETTEXT_GNU_LICENSE = LGPL-2.1+ (libintl), GPL-3.0+ (the rest) GETTEXT_GNU_LICENSE_FILES = COPYING gettext-runtime/intl/COPYING.LIB -# 0002-Update-after-gnulib-changed.patch +# 0002-restore-the-ability-to-buld-gettext-tools-seperately-part1.patch GETTEXT_GNU_AUTORECONF = YES GETTEXT_GNU_PROVIDES = gettext GETTEXT_GNU_DEPENDENCIES = $(if $(BR2_PACKAGE_LIBICONV),libiconv) # Avoid using the bundled subset of libxml2 -HOST_GETTEXT_GNU_DEPENDENCIES = host-libxml2 +HOST_GETTEXT_GNU_DEPENDENCIES = host-libxml2 host-libtextstyle GETTEXT_GNU_CONF_OPTS += \ --disable-libasprintf \ @@ -38,7 +38,8 @@ HOST_GETTEXT_GNU_CONF_OPTS = \ --disable-native-java \ --disable-csharp \ --disable-relocatable \ - --without-emacs + --without-emacs \ + --with-installed-libtextstyle # Force the build of libintl, even if the C library provides a stub # gettext implementation From patchwork Tue Apr 21 20:55:04 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adam Duskett X-Patchwork-Id: 1274515 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.138; helo=whitealder.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=IatrSDd5; dkim-atps=neutral Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 496G6g0QdDz9sSM for ; Wed, 22 Apr 2020 06:55:22 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 3B2F186D81; Tue, 21 Apr 2020 20:55:21 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id ZQTwrWOmWWiF; Tue, 21 Apr 2020 20:55:14 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 04A148757D; Tue, 21 Apr 2020 20:55:13 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 8FFF81BF25B for ; Tue, 21 Apr 2020 20:55:09 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 8CBBF86D13 for ; Tue, 21 Apr 2020 20:55:09 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 06u2SAltVz0O for ; Tue, 21 Apr 2020 20:55:08 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-pg1-f193.google.com (mail-pg1-f193.google.com [209.85.215.193]) by whitealder.osuosl.org (Postfix) with ESMTPS id E057F86D78 for ; Tue, 21 Apr 2020 20:55:08 +0000 (UTC) Received: by mail-pg1-f193.google.com with SMTP id d17so7360351pgo.0 for ; Tue, 21 Apr 2020 13:55:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=PeJPqTFout043HnrXQf4BU4mrDhSmaFKUoBgiKCcQyc=; b=IatrSDd5kVTNtJ7TidPA1EfAyDFgESqoaz114tDhG9OdwirI2MTGR0l9T+GEhCrjvZ rNY+P449Rfsjo0zvKnA9nC9IZZzuSSUE4PpWkGwg01V2JogUe4jvwBSEu1/RkT/bQESS 4gMxTa2RMdzbkYFDM04Vfa2tIBhn1L9dS43miuuvGL7uOYyo79GgX68jVesotRYYEXfK 7SyJqOpBBfHQQOAammigh6TTQ2Hmk7m8EA1a5UFsQnCmqtzR2oktbXFIVh8atG30G5sw 1leKfYdsrpi7bG+HSIR1nuJL0FZQ+GygepxN3N/ygVJFBzrwCCmQwo3AQnD9/Iw3hDU7 IYag== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=PeJPqTFout043HnrXQf4BU4mrDhSmaFKUoBgiKCcQyc=; b=GyC9VRG5MwjAfD1P5Aw0/Klq5YU9J209XqQ+FMmtA7PI6NWAuaAcFJeVNxnNxx0tbb ADXtw5HHbg5IN0FGfdubxaIvIX/yl96z7UDgBFsJKuM7j5Bp9WNu6WFrb/VQczlilwvx dxN4FIXDEhRwW+Z771fJDhV1MI4MdRq50tiVcrWTLBcZgcmzXLIuXDh6ER6dO580ObeM sr024yItXA/Tqcf5DEVxBMmXBpTy0cZfMsMmdlSxGewGc1WhjRCgPij537aDukQMr5fu 1HSaWB5Yh2slRsZ1cABMacZsPRwPSj+FIPu2d2026/4UbFiu8T8BnfV5pesUjbkxQklc tnFQ== X-Gm-Message-State: AGi0Pubfkp+SgiipTo6Ir381Nyjd1VLw4FuN2Yfg8HV10XRIRMvaDgiW Gg2fqSuLBHq7CMUFqyUIVnA7QGfHk44= X-Google-Smtp-Source: APiQypKNB1pgGd5TpgobwHvFlXm2V48e4NAkVmulQMzvACj2tKFpmkFuNQEoifL++FgeswNq5J3zNw== X-Received: by 2002:a65:49cf:: with SMTP id t15mr23184789pgs.39.1587502508286; Tue, 21 Apr 2020 13:55:08 -0700 (PDT) Received: from localhost.localdomain ([47.149.8.172]) by smtp.gmail.com with ESMTPSA id t15sm3048435pgv.61.2020.04.21.13.55.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Apr 2020 13:55:07 -0700 (PDT) From: aduskett@gmail.com To: buildroot@buildroot.org Date: Tue, 21 Apr 2020 13:55:04 -0700 Message-Id: <20200421205504.3061551-3-aduskett@gmail.com> X-Mailer: git-send-email 2.25.3 In-Reply-To: <20200421205504.3061551-1-aduskett@gmail.com> References: <20200421205504.3061551-1-aduskett@gmail.com> MIME-Version: 1.0 Subject: [Buildroot] [PATCH v4 3/3] package/gettext-tiny: support gettext 0.20.1 X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Adam Duskett Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" From: Adam Duskett Other changes: - Update gettext to 0.20.1 and the respective hashes. - Remove share/gettext-tiny/m4/lock.m4 from GETTEXT_TINY_EXTRA_GETTEXT_FILES and the install list, as this file was removed in commit 8c2bfdbddb13a480d88ceac4ab0e5886bda957cb. Tested with test-pkg -p gettext-tiny in Debian 10 and Centos 7 br-arm-full [1/6]: OK br-arm-cortex-a9-glibc [2/6]: OK br-arm-cortex-m4-full [3/6]: OK br-x86-64-musl [4/6]: OK br-arm-full-static [5/6]: OK sourcery-arm [6/6]: OK Signed-off-by: Adam Duskett --- package/gettext-tiny/gettext-tiny.hash | 7 +++---- package/gettext-tiny/gettext-tiny.mk | 4 +--- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/package/gettext-tiny/gettext-tiny.hash b/package/gettext-tiny/gettext-tiny.hash index 9232fe8530..201b05c6ff 100644 --- a/package/gettext-tiny/gettext-tiny.hash +++ b/package/gettext-tiny/gettext-tiny.hash @@ -1,7 +1,6 @@ # Locally Computed: sha256 efc740007c82a9b3a0d382fb50d212fa7dc0beddb9695409ee79684f9f2124b2 gettext-tiny-adaa9c64921e80f2b8dd3610ffb508618b9204f3.tar.gz sha256 b57aa4fdc1c614c28d41c1e2d5c4090935964c5f86291ba7d1c99ffd1d698b34 LICENSE -sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 extra/COPYING -# From http://lists.gnu.org/archive/html/bug-gettext/2016-06/msg00008.html -md5 df3f5690eaa30fd228537b00cb7b7590 gettext-0.19.8.1.tar.xz -sha1 e0fe90ede22f7f16bbde7bdea791a835f2773fc9 gettext-0.19.8.1.tar.xz +sha256 e79e9c8a0c85d735ff98185918ec94ed7d175efc377012787aebcf3b80f0d90b extra/COPYING +# From https://lists.gnu.org/archive/html/info-gnu/2019-05/msg00011.html +sha1 62f4a6a2fd5f80bfd0e66c497a04094fa3e07b90 gettext-0.20.1.tar.xz diff --git a/package/gettext-tiny/gettext-tiny.mk b/package/gettext-tiny/gettext-tiny.mk index 09a98f99b4..87813ae5af 100644 --- a/package/gettext-tiny/gettext-tiny.mk +++ b/package/gettext-tiny/gettext-tiny.mk @@ -14,12 +14,11 @@ HOST_GETTEXT_TINY_LICENSE_FILES = LICENSE extra/COPYING GETTEXT_TINY_PROVIDES = gettext # needed for gettextize -GETTEXT_TINY_ARCHIVE_VERSION = 0.19.8 +GETTEXT_TINY_ARCHIVE_VERSION = 0.20.1 GETTEXT_TINY_EXTRA_GETTEXT_FILES = \ gettext-tools/misc/gettextize.in \ gettext-tools/po/Makevars.template \ - gettext-runtime/m4/lock.m4 \ gettext-runtime/po/boldquot.sed \ gettext-runtime/po/en@boldquot.header \ gettext-runtime/po/en@quot.header \ @@ -83,7 +82,6 @@ define HOST_GETTEXT_TINY_INSTALL_CMDS $(INSTALL) -m 0755 -D $(@D)/gettextize $(HOST_DIR)/bin/gettextize $(INSTALL) -m 0644 -D $(@D)/build-aux/config.rpath $(HOST_DIR)/share/gettext-tiny/config.rpath - $(INSTALL) -m 0644 -D $(@D)/extra/lock.m4 $(HOST_DIR)/share/gettext-tiny/m4/lock.m4 $(INSTALL) -m 0644 -D $(@D)/extra/Makefile.in.in $(HOST_DIR)/share/gettext-tiny/po/Makefile.in.in $(INSTALL) -m 0644 -D $(@D)/extra/boldquot.sed $(HOST_DIR)/share/gettext-tiny/po/boldquot.sed $(INSTALL) -m 0644 -D $(@D)/extra/en@boldquot.header $(HOST_DIR)/share/gettext-tiny/po/en@boldquot.header