summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Korsgaard <jacmet@sunsite.dk>2012-06-29 14:11:50 (GMT)
committer Peter Korsgaard <jacmet@sunsite.dk>2012-06-29 14:40:04 (GMT)
commit311a58303f06bdb89aa8e2af3945b552235e319a (patch)
tree9afd7abc036498e8e2303398af197e1041ca8c90
parentdf2b9516eaa6fc59b8bd847fa0af7ada99e59ad6 (diff)
downloadbuildroot-311a58303f06bdb89aa8e2af3945b552235e319a.tar.gz
buildroot-311a58303f06bdb89aa8e2af3945b552235e319a.tar.bz2
ncurses: build statically when BR2_PREFER_STATIC_LIB
--disable-static is no more. Only try to install .so files if not configured for static linking. Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
-rw-r--r--package/ncurses/ncurses.mk11
1 files changed, 7 insertions, 4 deletions
diff --git a/package/ncurses/ncurses.mk b/package/ncurses/ncurses.mk
index 10a55dd..afeb41b 100644
--- a/package/ncurses/ncurses.mk
+++ b/package/ncurses/ncurses.mk
@@ -29,7 +29,7 @@ NCURSES_INSTALL_STAGING = YES
NCURSES_DEPENDENCIES = host-ncurses
NCURSES_CONF_OPT = \
- --with-shared \
+ $(if $(BR2_PREFER_STATIC_LIB),--without-shared,--with-shared) \
--without-cxx \
--without-cxx-binding \
--without-ada \
@@ -41,8 +41,7 @@ NCURSES_CONF_OPT = \
--enable-echo \
--enable-const \
--enable-overwrite \
- --enable-broken_linker \
- --disable-static
+ --enable-broken_linker
ifneq ($(BR2_ENABLE_DEBUG),y)
NCURSES_CONF_OPT += --without-debug
@@ -79,6 +78,8 @@ define NCURSES_INSTALL_TARGET_DEVFILES
endef
endif
+ifneq ($(BR2_PREFER_STATIC_LIB),y)
+
ifeq ($(BR2_PACKAGE_NCURSES_TARGET_PANEL),y)
define NCURSES_INSTALL_TARGET_PANEL
cp -dpf $(NCURSES_DIR)/lib/libpanel.so* $(TARGET_DIR)/usr/lib/
@@ -97,9 +98,11 @@ define NCURSES_INSTALL_TARGET_MENU
endef
endif
+endif
+
define NCURSES_INSTALL_TARGET_CMDS
mkdir -p $(TARGET_DIR)/usr/lib
- cp -dpf $(NCURSES_DIR)/lib/libncurses.so* $(TARGET_DIR)/usr/lib/
+ $(if $(BR2_PREFER_STATIC_LIB),,cp -dpf $(NCURSES_DIR)/lib/libncurses.so* $(TARGET_DIR)/usr/lib/)
$(NCURSES_INSTALL_TARGET_PANEL)
$(NCURSES_INSTALL_TARGET_FORM)
$(NCURSES_INSTALL_TARGET_MENU)