diff options
| author | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2014-12-11 23:50:10 +0100 |
|---|---|---|
| committer | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2014-12-12 00:09:32 +0100 |
| commit | 41a18724021be815e175b012fa94d5e69d4b862d (patch) | |
| tree | 9c32694ce7aa592d54f09a4bf35f838f11c086c4 | |
| parent | 158001f57b47a3fb439ad9093b6703c7edf3f842 (diff) | |
| download | buildroot-41a18724021be815e175b012fa94d5e69d4b862d.tar.gz buildroot-41a18724021be815e175b012fa94d5e69d4b862d.zip | |
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: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Acked-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
| -rw-r--r-- | package/ncurses/ncurses.mk | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/package/ncurses/ncurses.mk b/package/ncurses/ncurses.mk index 645c25c1bc..f54f379ba1 100644 --- a/package/ncurses/ncurses.mk +++ b/package/ncurses/ncurses.mk @@ -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 |
