Skip to contentSkip to conversation

guile: handle readline support explicitly

PATCH New Gustavo Zacarias 2 participants 2 messages Oct 14, 2015

lore
Share & tools
lore

Gustavo Zacarias

author
#0 lore raw

PATCH 1/1 guile: handle readline support explicitly

Otherwise the host readline (+ncurses) development files can poison the build causing breakage. Fixes:
http://autobuild.buildroot.net/results/d0a/d0a8ad9d3f19592e06df36408d6af745f7908165/

Signed-off-by Gustavo Zacarias <[email protected]>
---
 package/guile/guile.mk | 10 ++++++++++
 1 file changed, 10 insertions(+)
package/guile/guile.mk +10 -0
index 2bd7198..0e0b1a3 100644
@@ -32,6 +32,16 @@ ifeq ($(BR2_STATIC_LIBS),y)
 GUILE_CFLAGS += -DGC_NO_DLOPEN
 endif
 
+# It can use readline, but on the condition that it was build against
+# ncurses. If both aren't present disable readline support since the
+# host readline/ncurses support can poison the build.
+ifeq ($(BR2_PACKAGE_NCURSES)$(BR2_PACKAGE_READLINE),yy)
+GUILE_CONF_OPTS += --with-libreadline-prefix=$(STAGING_DIR)/usr
+GUILE_DEPENDENCIES += readline
+else
+GUILE_CONF_OPTS += --without-libreadline-prefix
+endif
+
 GUILE_CONF_ENV += GUILE_FOR_BUILD=$(HOST_DIR)/usr/bin/guile \
 	CFLAGS="$(TARGET_CFLAGS) $(GUILE_CFLAGS)"
Signature · 1 line
2.4.9
Applied
#1 lore raw

PATCH 1/1 guile: handle readline support explicitly

Dear Gustavo Zacarias,

Quoted 8 lines · Gustavo Zacarias

Otherwise the host readline (+ncurses) development files can poison the build causing breakage. Fixes:
http://autobuild.buildroot.net/results/d0a/d0a8ad9d3f19592e06df36408d6af745f7908165/

Signed-off-by Gustavo Zacarias <[email protected]>
---
 package/guile/guile.mk | 10 ++++++++++
 1 file changed, 10 insertions(+)

Applied, thanks.

Thomas

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