Commit 542e7adf authored by Gustavo Zacarias's avatar Gustavo Zacarias Committed by Peter Korsgaard
Browse files

package/ncurses: fixup library symlinks 



As stated on the list we need to copy static libraries when doing static
targets so add the logic for that.

Also exclude the wide option for blackfin flat since there seem to be
toolchain issues with that combination - since it's a new feature option
someone interested might look into it later.

Signed-off-by: default avatarGustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: default avatarPeter Korsgaard <peter@korsgaard.com>
parent 74efae02

package/ncurses/Config.in

+2 −0
Original line number Diff line number Diff line
@@ -13,6 +13,8 @@ if BR2_PACKAGE_NCURSES 
config BR2_PACKAGE_NCURSES_WCHAR

	bool "enable wide char support"

	depends on BR2_USE_WCHAR

	# Build broken @ curses.priv.h with bad declarations

	depends on !(BR2_bfin && BR2_BINFMT_FLAT)

	help

	  Enable wide char & UTF-8 support in ncurses libraries

package/ncurses/ncurses.mk

+13 −2
Original line number Diff line number Diff line
@@ -40,12 +40,23 @@ ifeq ($(BR2_PACKAGE_NCURSES_WCHAR),y) 
NCURSES_CONF_OPT += --enable-widec

NCURSES_LIB_SUFFIX = w



ifeq ($(BR2_PREFER_STATIC_LIB),y)

define NCURSES_LINK_LIBS

	for lib in $(NCURSES_LIBS-y); do \

		ln -sf $${lib}$(NCURSES_LIB_SUFFIX).a \

			$(1)/usr/lib/$${lib}.a; \

	done

endef

else

define NCURSES_LINK_LIBS

	for lib in $(NCURSES_LIBS-y); do \

		ln -sf $${lib}$(NCURSES_LIB_SUFFIX).a \

			$(1)/usr/lib/$${lib}.a; \

		ln -sf $${lib}$(NCURSES_LIB_SUFFIX).so \

			$(1)/usr/lib/$${lib}.so; \

	done

endef

endif



NCURSES_LINK_TARGET_LIBS = $(call NCURSES_LINK_LIBS, $(TARGET_DIR))

NCURSES_LINK_STAGING_LIBS = $(call NCURSES_LINK_LIBS, $(STAGING_DIR))