Skip to contentSkip to conversation

slang: use correct ncurses config script name

PATCH New Rodrigo Rebello 3 participants 5 messages Mar 26, 2017 – Mar 31, 2017

lore
Share & tools
lore

Rodrigo Rebello

author
#0 lore raw

PATCH 1/2 slang: use correct ncurses config script name

The ncurses config script can have different names depending on the configuration (e.g. wchar support enabled/disabled). So, use $(NCURSES_CONFIG_SCRIPTS) from the ncurses package as it contains the proper name.

Fixes:

http://autobuild.buildroot.net/results/c97554c05e121c76407be53ba37924cfcb658e9d/
http://autobuild.buildroot.net/results/b0a31a3491a30ee0d6e6e7dbba68a86f0e00943d/
http://autobuild.buildroot.net/results/a77241141cf8710fa945523ef62327798e3c4824/
[...]

Signed-off-by Rodrigo Rebello <[email protected]>
---
 package/slang/slang.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
package/slang/slang.mk +2 -2
index 9078bf293..e6abdeebe 100644
@@ -40,7 +40,7 @@ endif
 
 ifeq ($(BR2_PACKAGE_NCURSES),y)
 SLANG_DEPENDENCIES += ncurses
-SLANG_CONF_ENV += ac_cv_path_nc5config=$(STAGING_DIR)/usr/bin/ncurses5-config
+SLANG_CONF_ENV += ac_cv_path_nc5config=$(STAGING_DIR)/usr/bin/$(NCURSES_CONFIG_SCRIPTS)
 else
 SLANG_CONF_OPTS += ac_cv_path_nc5config=no
 endif

@@ -49,7 +49,7 @@ ifeq ($(BR2_PACKAGE_READLINE),y)
 SLANG_CONF_OPTS += --with-readline=gnu
 SLANG_DEPENDENCIES += readline
 ifeq ($(BR2_STATIC_LIBS),y)
-SLANG_CONF_ENV += LIBS="`$(STAGING_DIR)/usr/bin/ncurses5-config --libs`"
+SLANG_CONF_ENV += LIBS="`$(STAGING_DIR)/usr/bin/$(NCURSES_CONFIG_SCRIPTS) --libs`"
 endif
 endif
Signature · 1 line
2.11.0
author
#1 lore raw

PATCH 2/2 htop: use correct ncurses config script name

The ncurses config script can have different names depending on the configuration (e.g. wchar support enabled/disabled). So, use $(NCURSES_CONFIG_SCRIPTS) from the ncurses package as it contains the proper name.

Signed-off-by Rodrigo Rebello <[email protected]>
---
 package/htop/htop.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
package/htop/htop.mk +1 -1
index 9451d159f..dd3bed41b 100644
@@ -8,7 +8,7 @@ HTOP_VERSION = 2.0.2
 HTOP_SITE = http://hisham.hm/htop/releases/$(HTOP_VERSION)
 HTOP_DEPENDENCIES = ncurses
 # Prevent htop build system from searching the host paths
-HTOP_CONF_ENV = HTOP_NCURSES_CONFIG_SCRIPT=$(STAGING_DIR)/usr/bin/ncurses5-config
+HTOP_CONF_ENV = HTOP_NCURSES_CONFIG_SCRIPT=$(STAGING_DIR)/usr/bin/$(NCURSES_CONFIG_SCRIPTS)
 HTOP_LICENSE = GPLv2
 HTOP_LICENSE_FILES = COPYING
Signature · 1 line
2.11.0
#2 lore raw

PATCH 2/2 htop: use correct ncurses config script name

Quoted 8 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Rodrigo" == Rodrigo Rebello <[email protected]> writes:

The ncurses config script can have different names depending on the configuration (e.g. wchar support enabled/disabled). So, use $(NCURSES_CONFIG_SCRIPTS) from the ncurses package as it contains the proper name.

Signed-off-by Rodrigo Rebello <[email protected]>

Committed to 2017.02.x, thanks.

Signature · 1 line
Bye, Peter Korsgaard
#3 lore raw

PATCH 1/2 slang: use correct ncurses config script name

In reply to Rodrigo Rebello

Hello,

Quoted 12 lines · Rodrigo Rebello

The ncurses config script can have different names depending on the configuration (e.g. wchar support enabled/disabled). So, use $(NCURSES_CONFIG_SCRIPTS) from the ncurses package as it contains the proper name.

Fixes:

http://autobuild.buildroot.net/results/c97554c05e121c76407be53ba37924cfcb658e9d/
http://autobuild.buildroot.net/results/b0a31a3491a30ee0d6e6e7dbba68a86f0e00943d/
http://autobuild.buildroot.net/results/a77241141cf8710fa945523ef62327798e3c4824/
[...]

Quoted 4 lines
Signed-off-by Rodrigo Rebello <[email protected]>
---
 package/slang/slang.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Both applied, thanks!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
#4 lore raw

PATCH 1/2 slang: use correct ncurses config script name

In reply to Rodrigo Rebello
Quoted 7 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Rodrigo" == Rodrigo Rebello <[email protected]> writes:

The ncurses config script can have different names depending on the configuration (e.g. wchar support enabled/disabled). So, use $(NCURSES_CONFIG_SCRIPTS) from the ncurses package as it contains the proper name.

Quoted 8 lines

Fixes:

http://autobuild.buildroot.net/results/c97554c05e121c76407be53ba37924cfcb658e9d/
http://autobuild.buildroot.net/results/b0a31a3491a30ee0d6e6e7dbba68a86f0e00943d/
http://autobuild.buildroot.net/results/a77241141cf8710fa945523ef62327798e3c4824/
[...]

Signed-off-by Rodrigo Rebello <[email protected]>

Committed to 2017.02.x, thanks.

Signature · 1 line
Bye, Peter Korsgaard