Commit 41a18724 authored by Thomas Petazzoni's avatar Thomas Petazzoni
Browse files

ncurses: better handling for shared/static library 



Now that we have clear options for the three cases of shared only,
static only and shared+static, let's use them in ncurses to pass the
appropriate --{with,without}-{shared,normal} options.

Signed-off-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
Acked-by: default avatar"Yann E. MORIN" <yann.morin.1998@free.fr>
parent 158001f5

package/ncurses/ncurses.mk

+8 −1
Original line number Diff line number Diff line
@@ -15,7 +15,6 @@ NCURSES_LICENSE_FILES = README 
NCURSES_CONFIG_SCRIPTS = ncurses$(NCURSES_LIB_SUFFIX)5-config



NCURSES_CONF_OPTS = \

	$(if $(BR2_STATIC_LIBS),--without-shared,--with-shared) \

	--without-cxx \

	--without-cxx-binding \

	--without-ada \
@@ -36,6 +35,14 @@ ifeq ($(BR2_PACKAGE_BUSYBOX),y) 
	NCURSES_DEPENDENCIES += busybox

endif



ifeq ($(BR2_STATIC_LIBS),y)

NCURSES_CONF_OPTS += --without-shared --with-normal

else ifeq ($(BR2_SHARED_LIBS),y)

NCURSES_CONF_OPTS += --with-shared --without-normal

else ifeq ($(BR2_SHARED_STATIC_LIBS),y)

NCURSES_CONF_OPTS += --with-shared --with-normal

endif



ifeq ($(BR2_PACKAGE_NCURSES_WCHAR),y)

NCURSES_CONF_OPTS += --enable-widec

NCURSES_LIB_SUFFIX = w