summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Olbrich <m.olbrich@pengutronix.de>2015-06-30 10:46:55 +0200
committerMichael Olbrich <m.olbrich@pengutronix.de>2015-06-30 10:49:47 +0200
commitfecc55c94fe0d7a5a339014ee72562ff3d58b3fe (patch)
treeb98c3d5de3f565da9d8854e44cd2c8318e79a1a3
parent99cb72d63bfb5accfaec3ce5d9db892b55efe0e1 (diff)
downloadptxdist-fecc55c94fe0d7a5a339014ee72562ff3d58b3fe.tar.gz
ptxdist-fecc55c94fe0d7a5a339014ee72562ff3d58b3fe.tar.xz
host-ncurses: don't build shared libraries
Otherwise they might be used by the kernel kconfig tools. This is now necessary because 'make menuconfig' is now called with the toolchain wrappers set up correctly. Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
-rw-r--r--rules/host-ncurses.make6
-rw-r--r--rules/ncurses.make2
2 files changed, 5 insertions, 3 deletions
diff --git a/rules/host-ncurses.make b/rules/host-ncurses.make
index 3d60d9ae8..b072d9b41 100644
--- a/rules/host-ncurses.make
+++ b/rules/host-ncurses.make
@@ -23,7 +23,8 @@ HOST_PACKAGES-$(PTXCONF_HOST_NCURSES) += host-ncurses
HOST_NCURSES_CONF_TOOL := autoconf
HOST_NCURSES_CONF_OPT = \
$(HOST_AUTOCONF) \
- $(NCURSES_AUTOCONF_SHARED)
+ $(NCURSES_AUTOCONF_SHARED) \
+ --without-shared
HOST_NCURSES_CPPFLAGS := -P
@@ -34,8 +35,9 @@ HOST_NCURSES_CPPFLAGS := -P
$(STATEDIR)/host-ncurses.install:
@$(call targetinfo)
@$(call world/install, HOST_NCURSES)
-# # don't install headers, so packages like the kernel don't use it
+# # don't install headers or libs, so packages like the kernel don't use it
@rm -r $(HOST_NCURSES_PKGDIR)/include
+ @rm -r $(HOST_NCURSES_PKGDIR)/lib/*.a
@$(call touch)
# vim: syntax=make
diff --git a/rules/ncurses.make b/rules/ncurses.make
index f33ff35a1..08768ca2f 100644
--- a/rules/ncurses.make
+++ b/rules/ncurses.make
@@ -41,7 +41,6 @@ NCURSES_AUTOCONF_SHARED := \
--libdir=/$(CROSS_LIB_DIR) \
--without-debug \
--without-normal \
- --with-shared \
--without-ada \
--without-gpm \
--without-manpages \
@@ -79,6 +78,7 @@ endif
NCURSES_AUTOCONF := \
$(CROSS_AUTOCONF_USR) \
$(NCURSES_AUTOCONF_SHARED) \
+ --with-shared \
--without-progs
# ----------------------------------------------------------------------------