From patchwork Fri Jan 11 21:50:20 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabrice Fontaine X-Patchwork-Id: 1023782 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.137; helo=fraxinus.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.b="C/2IQHUN"; dkim-atps=neutral Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 43bxQ21vPPz9s55 for ; Sat, 12 Jan 2019 08:51:05 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id D084885CA3; Fri, 11 Jan 2019 21:51:03 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id D6tBHu-prIhU; Fri, 11 Jan 2019 21:51:03 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id F27A785BC8; Fri, 11 Jan 2019 21:51:02 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id 52B9E1C0C67 for ; Fri, 11 Jan 2019 21:51:01 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 503D685B25 for ; Fri, 11 Jan 2019 21:51:01 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 40UVwp2Pc2OR for ; Fri, 11 Jan 2019 21:50:58 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm1-f66.google.com (mail-wm1-f66.google.com [209.85.128.66]) by fraxinus.osuosl.org (Postfix) with ESMTPS id 2CDEF859C1 for ; Fri, 11 Jan 2019 21:50:58 +0000 (UTC) Received: by mail-wm1-f66.google.com with SMTP id m22so3733165wml.3 for ; Fri, 11 Jan 2019 13:50:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=29woDilPb5JdI4HPL0QwLbzvAiFV3aKwWvJOFjmBlGA=; b=C/2IQHUNF8uN3O2cCG1CQX/KYjh86ESaItH0Lo02l/V+c7D9+MZHRr0sYNET6xaIhG 77NkjgLYe+rAYUEWyvBbdQ60aWNOSI5ki8/wQ4dZTGzIQhcRsLnG28D1iNPJqS5r8Xje 0ZYX2BsvLIY2zhAtPlDoGolUapmNLIAm1bEQoH5X9RSsTAL/oepkXPo0iN0lbf6ljCE5 G7ia7hRHvL2zUZ5faAlGRi23abhvp172z0A0yE9AL/UEb9y9TopuwRy5mvTdA/b1Daoz 4g7NVkzCAttpAFldLSrm/HPjeCShsWGiohRdtfWmSJZvzbVzOG/rl2H1pwiAzBKzE7s7 Sllg== 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; bh=29woDilPb5JdI4HPL0QwLbzvAiFV3aKwWvJOFjmBlGA=; b=kCWh94iClYcKDIZla4mxGqkLub3IXucd5PbGOa9T2eogXJ2Aaws/uaW8+Zp1XABYtg 9iwyMKek52kjUER8QJ1/ZNL57IrWEGGPH7T1lizbbOq2oUt5pcxrBbDFI8bnVYP2nffi 6mElNt6/HARAqiNKJrtyi1tKIQ/kGscmnfHXXP5QzsDCPZZvg97sZl5UUvAJSDiDZEkk 7ihYE+opaXtegDd7cPC/zuZ373dP+RVaS/LMduHfYjpqQpgRE7Hhh4bjU1Nwp/ffr2RJ JRE9wL8lkp8NaKedQq7Eo6bHl99M7KD+d+Of90rnUf+BZUKPKTB6YCu2V2Ikpl0aU7Ri 7f/w== X-Gm-Message-State: AJcUukemvGq+D/PA2zCQX0JKUYl3nFp0rquDVUHlvSsW4z8otXltbk1F ehMfvu7F2lv8co0K/fc7cn5V1jbY X-Google-Smtp-Source: ALg8bN5p90MjgBLnpTt4cwZIOeoaE40fjmSYiScaqtOD7GmHcesKCcVNqhrm5eYA3sFd7F1isSTm5g== X-Received: by 2002:a1c:868a:: with SMTP id i132mr3612867wmd.49.1547243456303; Fri, 11 Jan 2019 13:50:56 -0800 (PST) Received: from fabrice-VirtualBox.home (arennes-656-1-28-46.w86-214.abo.wanadoo.fr. [86.214.223.46]) by smtp.gmail.com with ESMTPSA id c1sm16562826wmb.14.2019.01.11.13.50.54 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 11 Jan 2019 13:50:55 -0800 (PST) From: Fabrice Fontaine To: buildroot@buildroot.org Date: Fri, 11 Jan 2019 22:50:20 +0100 Message-Id: <20190111215020.5701-1-fontaine.fabrice@gmail.com> X-Mailer: git-send-email 2.14.1 Subject: [Buildroot] [PATCH 1/1] readline: bump to version 8.0 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: Fabrice Fontaine MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" - Remove first patch (already in version) and so remove READLINE_AUTOCONF as configure.ac is not patched anymore - Use the new --disable-install-examples option and remove READLINE_PURGE_EXAMPLES - Remove READLINE_INSTALL_PC_FILE as readline.pc is installed since: http://git.savannah.gnu.org/cgit/readline.git/commit/Makefile.in?id=8e6ccd0373d77b86ed37a9a7d232ccfea3d6670c - Remove READLINE_INSTALL_FIXUPS_SHARED (libraries are installed with correct rights) - Add hash for license file Signed-off-by: Fabrice Fontaine --- ...c-readline.pc.in-fix-Requires.private-val.patch | 62 ---------------------- package/readline/readline.hash | 5 +- package/readline/readline.mk | 29 +--------- 3 files changed, 6 insertions(+), 90 deletions(-) delete mode 100644 package/readline/0001-configure.ac-readline.pc.in-fix-Requires.private-val.patch diff --git a/package/readline/0001-configure.ac-readline.pc.in-fix-Requires.private-val.patch b/package/readline/0001-configure.ac-readline.pc.in-fix-Requires.private-val.patch deleted file mode 100644 index 22b479cd91..0000000000 --- a/package/readline/0001-configure.ac-readline.pc.in-fix-Requires.private-val.patch +++ /dev/null @@ -1,62 +0,0 @@ -From 7bbf2046fbcf4416ec226ecb3a2b4c6a5c263298 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Sun, 22 Apr 2018 23:06:28 +0200 -Subject: [PATCH] configure.ac, readline.pc.in: fix Requires.private value - -The provided readline.pc.in hardcodes the fact that readline depends -on the tinfo library. However, different termcap implementation are -supported beyond tinfo. This commit improves the configure.ac script -to define a TERMCAP_PKG_CONFIG_LIB variable, which is then used in -readline.pc.in. - -This for example allows the generated readline.pc to properly contain -"Requires.private: ncurses" when ncurses is used as the termcap -implementation. - -Signed-off-by: Thomas Petazzoni ---- - configure.ac | 8 ++++++++ - readline.pc.in | 2 +- - 2 files changed, 9 insertions(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index fd0cec4..9f85f37 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -276,6 +276,13 @@ case "$BUILD_DIR" in - *) ;; - esac - -+case "$TERMCAP_LIB" in -+-ltinfo) TERMCAP_PKG_CONFIG_LIB=tinfo ;; -+-lcurses) TERMCAP_PKG_CONFIG_LIB=ncurses ;; -+-lncurses) TERMCAP_PKG_CONFIG_LIB=ncurses ;; -+-ltermcap) TERMCAP_PKG_CONFIG_LIB=termcap ;; -+esac -+ - AC_SUBST(BUILD_DIR) - - AC_SUBST(CFLAGS) -@@ -292,6 +299,7 @@ AC_SUBST(host_os) - AC_SUBST(LIBVERSION) - - AC_SUBST(TERMCAP_LIB) -+AC_SUBST(TERMCAP_PKG_CONFIG_LIB) - - AC_OUTPUT([Makefile doc/Makefile examples/Makefile shlib/Makefile readline.pc], - [ -diff --git a/readline.pc.in b/readline.pc.in -index fbfca8a..a7f2cf3 100644 ---- a/readline.pc.in -+++ b/readline.pc.in -@@ -7,6 +7,6 @@ Name: Readline - Description: Gnu Readline library for command line editing - URL: http://tiswww.cwru.edu/php/chet/readline/rltop.html - Version: @LIBVERSION@ --Requires.private: tinfo -+Requires.private: @TERMCAP_PKG_CONFIG_LIB@ - Libs: -L${libdir} -lreadline - Cflags: -I${includedir}/readline --- -2.14.3 - diff --git a/package/readline/readline.hash b/package/readline/readline.hash index 43f8c64bb2..560154c2f7 100644 --- a/package/readline/readline.hash +++ b/package/readline/readline.hash @@ -1,2 +1,5 @@ # Locally calculated after checking pgp signature -sha256 750d437185286f40a369e1e4f4764eda932b9459b5ec9a731628393dd3d32334 readline-7.0.tar.gz +sha256 e339f51971478d369f8a053a330a190781acb9864cf4c541060f12078948e461 readline-8.0.tar.gz + +# Hash for license file +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/readline/readline.mk b/package/readline/readline.mk index e00c594697..f5d7d5bf9e 100644 --- a/package/readline/readline.mk +++ b/package/readline/readline.mk @@ -4,46 +4,21 @@ # ################################################################################ -READLINE_VERSION = 7.0 +READLINE_VERSION = 8.0 READLINE_SITE = $(BR2_GNU_MIRROR)/readline READLINE_INSTALL_STAGING = YES READLINE_DEPENDENCIES = ncurses host-autoconf HOST_READLINE_DEPENDENCIES = host-ncurses host-autoconf READLINE_CONF_ENV = bash_cv_func_sigsetjmp=yes \ bash_cv_wcwidth_broken=no +READLINE_CONF_OPTS = --disable-install-examples READLINE_LICENSE = GPL-3.0+ READLINE_LICENSE_FILES = COPYING -# readline only uses autoconf, not automake, and therefore the regular -# AUTORECONF = YES doesn't work. -define READLINE_AUTOCONF - cd $(@D); $(HOST_DIR)/bin/autoconf -endef -READLINE_PRE_CONFIGURE_HOOKS += READLINE_AUTOCONF -HOST_READLINE_PRE_CONFIGURE_HOOKS += READLINE_AUTOCONF - -define READLINE_PURGE_EXAMPLES - rm -rf $(TARGET_DIR)/usr/share/readline -endef -READLINE_POST_INSTALL_TARGET_HOOKS += READLINE_PURGE_EXAMPLES - -define READLINE_INSTALL_PC_FILE - $(INSTALL) -D -m 644 $(@D)/readline.pc $(STAGING_DIR)/usr/lib/pkgconfig/readline.pc -endef -READLINE_POST_INSTALL_STAGING_HOOKS += READLINE_INSTALL_PC_FILE - define READLINE_INSTALL_INPUTRC $(INSTALL) -D -m 644 package/readline/inputrc $(TARGET_DIR)/etc/inputrc endef READLINE_POST_INSTALL_TARGET_HOOKS += READLINE_INSTALL_INPUTRC -ifneq ($(BR2_STATIC_LIBS),y) -# libraries get installed read only, so strip fails -define READLINE_INSTALL_FIXUPS_SHARED - chmod +w $(addprefix $(TARGET_DIR)/usr/lib/,libhistory.so.* libreadline.so.*) -endef -READLINE_POST_INSTALL_TARGET_HOOKS += READLINE_INSTALL_FIXUPS_SHARED -endif - $(eval $(autotools-package)) $(eval $(host-autotools-package))