Skip to contentSkip to conversation

gnupg: Package only needs ncurses with readline

PATCH New Trent Piepho 3 participants 3 messages Oct 3, 2018 – Oct 5, 2018

lore
Share & tools
lore

Trent Piepho

author
#0 lore raw

PATCH v2 1/1 gnupg: Package only needs ncurses with readline

This package only needs ncurses when readline support is enabled, as it's the autoconf macro file for readline (used by autoconf to create the gnupg configure script) that checks for and pulls in ncurses.

Since readline already depends on ncurses, gnupg need only depend on readline (when enabled).

The host package always forces readline support off, so the host-ncurses dependency can be removed entirely.

Signed-off-by Trent Piepho <[email protected]>
---
 package/gnupg/Config.in | 1 -
 package/gnupg/gnupg.mk  | 4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)
package/gnupg/Config.in +0 -1
index 7c31612298..2db46318f1 100644
@@ -2,7 +2,6 @@ config BR2_PACKAGE_GNUPG
 	bool "gnupg"
 	depends on !BR2_PACKAGE_GNUPG2
 	select BR2_PACKAGE_ZLIB
-	select BR2_PACKAGE_NCURSES
 	help
 	  GnuPG is the GNU project's complete and free implementation
 	  of the OpenPGP standard as defined by RFC4880. GnuPG allows
package/gnupg/gnupg.mk +2 -2
index ac9047894d..bedcf6c985 100644
@@ -9,7 +9,7 @@ GNUPG_SOURCE = gnupg-$(GNUPG_VERSION).tar.bz2
 GNUPG_SITE = https://gnupg.org/ftp/gcrypt/gnupg
 GNUPG_LICENSE = GPL-3.0+
 GNUPG_LICENSE_FILES = COPYING
-GNUPG_DEPENDENCIES = zlib ncurses $(if $(BR2_PACKAGE_LIBICONV),libiconv)
+GNUPG_DEPENDENCIES = zlib $(if $(BR2_PACKAGE_LIBICONV),libiconv)
 GNUPG_CONF_ENV = ac_cv_sys_symbol_underscore=no
 GNUPG_CONF_OPTS = \
 	--disable-rpath \

@@ -18,7 +18,7 @@ GNUPG_CONF_OPTS = \
 	--enable-sha256 \
 	--enable-sha512
 
-HOST_GNUPG_DEPENDENCIES = host-zlib host-ncurses
+HOST_GNUPG_DEPENDENCIES = host-zlib
 HOST_GNUPG_CONF_OPTS = \
 	--disable-rpath \
 	--enable-minimal \
Signature · 1 line
2.14.4
Applied
#1 lore raw

PATCH v2 1/1 gnupg: Package only needs ncurses with readline

Hello,

Quoted 7 lines · Trent Piepho

This package only needs ncurses when readline support is enabled, as it's the autoconf macro file for readline (used by autoconf to create the gnupg configure script) that checks for and pulls in ncurses.

Since readline already depends on ncurses, gnupg need only depend on readline (when enabled).

Quoted 8 lines

The host package always forces readline support off, so the host-ncurses dependency can be removed entirely.

Signed-off-by Trent Piepho <[email protected]>
---
 package/gnupg/Config.in | 1 -
 package/gnupg/gnupg.mk  | 4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)

Applied to master, thanks.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
#2 lore raw

PATCH v2 1/1 gnupg: Package only needs ncurses with readline

In reply to Trent Piepho
Quoted 6 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Trent" == Trent Piepho <[email protected]> writes:

This package only needs ncurses when readline support is enabled, as it's the autoconf macro file for readline (used by autoconf to create the gnupg configure script) that checks for and pulls in ncurses.

Quoted 7 lines

Since readline already depends on ncurses, gnupg need only depend on readline (when enabled).

The host package always forces readline support off, so the host-ncurses dependency can be removed entirely.

Signed-off-by Trent Piepho <[email protected]>

Committed to 2018.02.x, 2018.05.x and 2018.08.x, thanks.

Signature · 1 line
Bye, Peter Korsgaard