Mercurial > mxe-octave
changeset 4826:4ee8962905ad
ncurses: also build wide char and tinfo libraries
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Wed, 29 Aug 2018 17:21:58 -0400 |
| parents | fc4834de8bae |
| children | 6834d305f658 |
| files | src/ncurses.mk |
| diffstat | 1 files changed, 28 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ncurses.mk Tue Aug 28 10:32:38 2018 -0400 +++ b/src/ncurses.mk Wed Aug 29 17:21:58 2018 -0400 @@ -30,14 +30,13 @@ endif endif -define $(PKG)_BUILD - cd '$(1)' && ./configure \ +$(PKG)_COMMON_CONFIG_OPTS := \ $(CONFIGURE_CPPFLAGS) $(CONFIGURE_LDFLAGS) \ $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ --prefix=$(HOST_PREFIX) \ --disable-home-terminfo \ + --with-termlib \ --enable-sp-funcs \ - --enable-term-driver \ --enable-interop \ --without-debug \ --without-ada \ @@ -46,13 +45,37 @@ CONFIG_SITE=/dev/null \ $($(PKG)_CONFIG_OPTS) +define $(PKG)_BUILD + + ## Normal char version: + + mkdir '$(1)/.build' && cd '$(1)/.build' && ../configure \ + $($(PKG)_COMMON_CONFIG_OPTS) + # MSVC generates invalid code in panel library when using -O2 # command-line flag. Bug is reported. Disable optimization for # the time being. if test x$(MXE_SYSTEM) = xmsvc; then \ - find '$(1)' -name Makefile \ + find '$(1)/.build' -name Makefile \ -exec $(SED) -i 's,-\<O2\>,,' {} \; ; \ fi - $(MAKE) -C '$(1)' -j '$(JOBS)' install DESTDIR='$(3)' + $(MAKE) -C '$(1)/.build' -j '$(JOBS)' install DESTDIR='$(3)' + + ## Wide char version: + + mkdir '$(1)/.build-widec' && cd '$(1)/.build-widec' && ../configure \ + --enable-widec \ + $($(PKG)_COMMON_CONFIG_OPTS) + + # MSVC generates invalid code in panel library when using -O2 + # command-line flag. Bug is reported. Disable optimization for + # the time being. + if test x$(MXE_SYSTEM) = xmsvc; then \ + find '$(1)/.build-widec' -name Makefile \ + -exec $(SED) -i 's,-\<O2\>,,' {} \; ; \ + fi + + $(MAKE) -C '$(1)/.build-widec' -j '$(JOBS)' install DESTDIR='$(3)' + endef