diff options
author | Michael Olbrich <m.olbrich@pengutronix.de> | 2008-06-04 08:47:37 +0000 |
---|---|---|
committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2008-06-04 08:47:37 +0000 |
commit | cf9dd5c24a0cac657a7015018ed7830442fd0acf (patch) | |
tree | 746f3d2d3cefbe0f236af4c7a7eccb9262070197 /rules/ncurses.make | |
parent | bd51dc09d27b780bdb2f5ba84b3580a70cfee6b6 (diff) | |
download | ptxdist-cf9dd5c24a0cac657a7015018ed7830442fd0acf.tar.gz ptxdist-cf9dd5c24a0cac657a7015018ed7830442fd0acf.tar.xz |
* ncurses builds host tools with header files that are generated for
the cross toolchain. This fails if e.g. "wint_t" is defined in the
cross toolchain but not the host toolchain.
Solution: Build the host tools in a host package and copy them at
the beginning of the compile stage.
git-svn-id: https://svn.pengutronix.de/svn/ptxdist/trunks/ptxdist-trunk@8290 33e552b5-05e3-0310-8538-816dae2090ed
Diffstat (limited to 'rules/ncurses.make')
-rw-r--r-- | rules/ncurses.make | 32 |
1 files changed, 27 insertions, 5 deletions
diff --git a/rules/ncurses.make b/rules/ncurses.make index 514979446..458feeda9 100644 --- a/rules/ncurses.make +++ b/rules/ncurses.make @@ -42,7 +42,10 @@ NCURSES_PATH := PATH=$(CROSS_PATH) NCURSES_ENV := $(CROSS_ENV) NCURSES_AUTOCONF := \ - $(CROSS_AUTOCONF_USR) \ + $(CROSS_AUTOCONF_USR) + +# also used by host-ncurses +SHARED_NCURSES_AUTOCONF := \ --libdir=/lib \ --with-normal \ --with-shared \ @@ -56,17 +59,36 @@ NCURSES_AUTOCONF := \ # enable wide char support on demand only ifdef PTXCONF_NCURSES_WIDE_CHAR -NCURSES_AUTOCONF += --enable-widec +SHARED_NCURSES_AUTOCONF += --enable-widec else -NCURSES_AUTOCONF += --disable-widec +SHARED_NCURSES_AUTOCONF += --disable-widec endif ifdef PTXCONF_NCURSES_BIG_CORE -NCURSES_AUTOCONF += --enable-big-core +SHARED_NCURSES_AUTOCONF += --enable-big-core else -NCURSES_AUTOCONF += --disable-big-core +SHARED_NCURSES_AUTOCONF += --disable-big-core endif +$(STATEDIR)/ncurses.prepare: + @$(call targetinfo) + cd $(NCURSES_DIR) && \ + $(NCURSES_PATH) $(NCURSES_ENV) \ + ./configure $(NCURSES_AUTOCONF) $(SHARED_NCURSES_AUTOCONF) + @$(call touch) + +# ---------------------------------------------------------------------------- +# Compile +# ---------------------------------------------------------------------------- + +ncurses_compile: $(STATEDIR)/ncurses.compile + +$(STATEDIR)/ncurses.compile: + @$(call targetinfo) + cd $(HOST_NCURSES_DIR)/ncurses && cp make_keys make_hash $(NCURSES_DIR)/ncurses/ + cd $(NCURSES_DIR) && $(NCURSES_PATH) $(MAKE) $(PARALLELMFLAGS) + @$(call touch) + # ---------------------------------------------------------------------------- # Install # ---------------------------------------------------------------------------- |