diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2019-07-04 09:19:40 +0200 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2019-07-04 09:19:42 +0200 |
| commit | 13f3274359d1bb8a4d5d2510328da62bf83205e3 (patch) | |
| tree | ef107447336f871794c3fa6953732914c59c83a9 | |
| parent | ec87da2afc85eaa2a7cdee32292043bfde36b087 (diff) | |
| download | ptxdist-13f3274359d1bb8a4d5d2510328da62bf83205e3.tar.gz ptxdist-13f3274359d1bb8a4d5d2510328da62bf83205e3.tar.xz | |
ncurses: order configure options
Turn NCURSES_AUTOCONF_SHARED into a macro with options to order the
configure options properly.
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
| -rw-r--r-- | rules/host-ncurses.make | 4 | ||||
| -rw-r--r-- | rules/ncurses.make | 11 |
2 files changed, 8 insertions, 7 deletions
diff --git a/rules/host-ncurses.make b/rules/host-ncurses.make index bd3c897e8..74f28dd29 100644 --- a/rules/host-ncurses.make +++ b/rules/host-ncurses.make @@ -21,9 +21,7 @@ HOST_PACKAGES-$(PTXCONF_HOST_NCURSES) += host-ncurses HOST_NCURSES_CONF_TOOL := autoconf HOST_NCURSES_CONF_OPT = \ $(HOST_AUTOCONF) \ - $(NCURSES_AUTOCONF_SHARED) \ - --with-progs \ - --without-shared + $(call NCURSES_AUTOCONF_SHARED,NCURSES_SHARED_HOST) # ---------------------------------------------------------------------------- # Install diff --git a/rules/ncurses.make b/rules/ncurses.make index ba5b9f179..b8671ba4c 100644 --- a/rules/ncurses.make +++ b/rules/ncurses.make @@ -33,14 +33,18 @@ NCURSES_CONF_ENV := \ $(CROSS_ENV) \ TIC_PATH="$(PTXDIST_SYSROOT_HOST)/bin/tic" +NCURSES_SHARED_TARGET := y +NCURSES_SHARED_HOST := + # NOTE: reentrant enables opaque, which breaks other packages # pthread enables reentrant, so don't enable it either -NCURSES_AUTOCONF_SHARED := \ +NCURSES_AUTOCONF_SHARED = \ --without-ada \ --without-cxx \ --without-cxx-binding \ --enable-db-install \ --without-manpages \ + --$(call ptx/wow,$(1))-progs \ --without-tack \ --without-tests \ --with-curses-h \ @@ -48,6 +52,7 @@ NCURSES_AUTOCONF_SHARED := \ --enable-pc-files \ --enable-mixed-case \ --without-libtool \ + --$(call ptx/wwo,$(1))-shared \ --with-normal \ --without-debug \ --without-profile \ @@ -82,9 +87,7 @@ NCURSES_AUTOCONF_SHARED := \ NCURSES_CONF_OPT := \ $(CROSS_AUTOCONF_USR) \ - $(NCURSES_AUTOCONF_SHARED) \ - --without-progs \ - --with-shared + $(call NCURSES_AUTOCONF_SHARED,NCURSES_SHARED_TARGET) # ---------------------------------------------------------------------------- # Install |