From d1ee3be7f4b966174d673876f961b44e37b4c85a Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Thu, 24 Oct 2013 14:59:22 +0200 Subject: add host build infrastructure; convert file, ncurses, glib and ruby to it. remove unneeded hacks for openldap and mesalib --- package/ncurses/Makefile | 53 +++++++++++++++---------- package/ncurses/patches/patch-configure | 16 -------- package/ncurses/patches/patch-misc_run_tic_in | 33 --------------- package/ncurses/patches/patch-misc_terminfo_src | 8 ++-- package/ncurses/patches/patch-progs_Makefile_in | 11 ----- 5 files changed, 35 insertions(+), 86 deletions(-) delete mode 100644 package/ncurses/patches/patch-configure delete mode 100644 package/ncurses/patches/patch-misc_run_tic_in delete mode 100644 package/ncurses/patches/patch-progs_Makefile_in (limited to 'package/ncurses') diff --git a/package/ncurses/Makefile b/package/ncurses/Makefile index c72b4b279..b923e8fa3 100644 --- a/package/ncurses/Makefile +++ b/package/ncurses/Makefile @@ -4,9 +4,9 @@ include ${TOPDIR}/rules.mk PKG_NAME:= ncurses -PKG_VERSION:= 5.7 -PKG_RELEASE:= 5 -PKG_MD5SUM:= cce05daf61a64501ef6cd8da1f727ec6 +PKG_VERSION:= 5.9 +PKG_RELEASE:= 1 +PKG_MD5SUM:= 8cb9c412e5f2d96bc6f459aa8c6282a1 PKG_DESCR:= a terminal handling library PKG_SECTION:= libs PKG_URL:= http://www.gnu.org/software/ncurses/ @@ -17,8 +17,10 @@ PKG_OPTS:= dev PKG_FLAVOURS_LIBNCURSES:= FULL_TERMINFO PKGFD_FULL_TERMINFO:= install the complete set of terminfo files as provided upstream +include ${TOPDIR}/mk/host.mk include ${TOPDIR}/mk/package.mk +$(eval $(call HOST_template,LIBNCURSES,libncurses,${PKG_VERSION}-${PKG_RELEASE})) $(eval $(call PKG_template,LIBNCURSES,libncurses,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) TARGET_CFLAGS+= -lgcc @@ -27,40 +29,46 @@ CONFIGURE_ARGS+= --without-cxx \ --without-cxx-binding \ --with-build-cc=${CC_FOR_BUILD} \ --without-progs \ - --with-fallbacks \ --disable-termcap \ + --enable-symlinks \ --without-ada \ --with-shared \ - --with-normal \ --without-debug \ --without-profile \ --without-gpm \ + --without-manpages \ + --without-tests \ --enable-overwrite \ --with-terminfo-dirs=/usr/share/terminfo \ --with-default-terminfo-dir=/usr/share/terminfo \ --disable-big-core \ --disable-home-terminfo \ --without-rcs-ids \ - --enable-const \ - --enable-echo + --enable-const ALL_TARGET:= libs INSTALL_TARGET:= install.libs install.data -pre-configure: - # create tic host binary - (cd ${WRKBUILD}; rm -rf config.{cache,status} ; \ - ./configure \ - --with-shared \ - --with-build-cc=${CC_FOR_BUILD} \ - --with-progs \ - --without-debug \ - --without-profile \ - ); - ${MAKE} -C ${WRKBUILD}/include - ${MAKE} -C ${WRKBUILD}/progs - ${CP} ${WRKBUILD}/progs/tic ${STAGING_HOST_DIR}/bin - find ${WRKBUILD} -name *.o -exec rm {} \; - find ${WRKBUILD} -name *.a -exec rm {} \; +# use sth which does not exist +HOST_ALL_TARGET:= progs +HOST_INSTALL_TARGET:= install.includes install.progs +HOST_CONFIGURE_ARGS+= --without-shared \ + --with-build-cc=${CC_FOR_BUILD} \ + --with-progs \ + --with-ticlib \ + --disable-tic-depends \ + --enable-symlinks \ + --without-manpages \ + --without-tests \ + --without-cxx \ + --without-cxx-binding \ + --without-gpm \ + --without-ada \ + --disable-termcap \ + --without-debug \ + --without-profile + +libncurses-hostinstall: + ${CP} ${HOST_WRKINST}/usr/bin/* ${STAGING_HOST_DIR}/usr/bin libncurses-install: # this is installed as libncurses - make libcurses a "link" @@ -83,4 +91,5 @@ else done endif +include ${TOPDIR}/mk/host-bottom.mk include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/ncurses/patches/patch-configure b/package/ncurses/patches/patch-configure deleted file mode 100644 index 1ef36c733..000000000 --- a/package/ncurses/patches/patch-configure +++ /dev/null @@ -1,16 +0,0 @@ ---- ncurses-5.7.orig/configure 2008-10-26 02:04:38.000000000 +0200 -+++ ncurses-5.7/configure 2009-11-15 22:44:41.000000000 +0100 -@@ -3985,13 +3985,6 @@ echo "${ECHO_T}$BUILD_LIBS" >&6 - - : ${BUILD_CC:='${CC}'} - -- if ( test "$BUILD_CC" = "$CC" || test "$BUILD_CC" = '${CC}' ) ; then -- { { echo "$as_me:3989: error: Cross-build requires two compilers. --Use --with-build-cc to specify the native compiler." >&5 --echo "$as_me: error: Cross-build requires two compilers. --Use --with-build-cc to specify the native compiler." >&2;} -- { (exit 1); exit 1; }; } -- fi - - else - : ${BUILD_CC:='${CC}'} diff --git a/package/ncurses/patches/patch-misc_run_tic_in b/package/ncurses/patches/patch-misc_run_tic_in deleted file mode 100644 index b4c917fb8..000000000 --- a/package/ncurses/patches/patch-misc_run_tic_in +++ /dev/null @@ -1,33 +0,0 @@ ---- ncurses-5.7.orig/misc/run_tic.in 2006-10-28 21:43:30.000000000 +0200 -+++ ncurses-5.7/misc/run_tic.in 2009-12-30 15:14:43.273450029 +0100 -@@ -58,22 +58,25 @@ echo '** Building terminfo database, ple - - test -z "${DESTDIR}" && DESTDIR= - -+# original comment: - # Allow tic to run either from the install-path, or from the build-directory. - # Do not do this if we appear to be cross-compiling. In that case, we rely - # on the host's copy of tic to compile the terminfo database. --if test "$THAT_CC" = "$THIS_CC" ; then -+# -- end comment -- -+# ATTENTION: Always use native tic from build environment -+#if test "$THAT_CC" = "$THIS_CC" ; then - case "$PATH" in - :*) PATH=../progs:../lib:${DESTDIR}$bindir$PATH ;; - *) PATH=../progs:../lib:${DESTDIR}$bindir:$PATH ;; - esac - export PATH - SHLIB="sh $srcdir/shlib" --else -+#else - # Cross-compiling, so don't set PATH or run shlib. --SHLIB= -+#SHLIB= - # reset $suffix, since it applies to the target, not the build platform. --suffix= --fi -+#suffix= -+#fi - - - # set another env var that doesn't get reset when `shlib' runs, so `shlib' uses diff --git a/package/ncurses/patches/patch-misc_terminfo_src b/package/ncurses/patches/patch-misc_terminfo_src index 47535d1cb..865759cb2 100644 --- a/package/ncurses/patches/patch-misc_terminfo_src +++ b/package/ncurses/patches/patch-misc_terminfo_src @@ -1,6 +1,6 @@ ---- ncurses-5.7.orig/misc/terminfo.src 2008-10-13 01:03:54.000000000 +0200 -+++ ncurses-5.7/misc/terminfo.src 2010-07-15 17:30:24.852569567 +0200 -@@ -3965,6 +3965,171 @@ rxvt-cygwin-native|rxvt terminal emulato +--- ncurses-5.9.orig/misc/terminfo.src 2011-02-20 21:46:53.000000000 +0100 ++++ ncurses-5.9/misc/terminfo.src 2013-10-23 20:00:07.000000000 +0200 +@@ -4208,6 +4208,175 @@ rxvt-cygwin-native|rxvt terminal emulato rxvt-16color|xterm with 16 colors like aixterm, ncv#32, use=ibm+16color, use=rxvt, @@ -169,6 +169,6 @@ + fsl=\007, + dsl=\E]2;\007, + - # mrxvt 0.5.3 + # mrxvt 0.5.4 # # mrxvt is based on rxvt 2.7.11, but has by default XTERM_FKEYS defined, which diff --git a/package/ncurses/patches/patch-progs_Makefile_in b/package/ncurses/patches/patch-progs_Makefile_in deleted file mode 100644 index db8b6a74b..000000000 --- a/package/ncurses/patches/patch-progs_Makefile_in +++ /dev/null @@ -1,11 +0,0 @@ ---- ncurses-5.7.orig/progs/Makefile.in 2008-09-07 15:58:55.000000000 +0200 -+++ ncurses-5.7/progs/Makefile.in 2010-07-26 17:44:33.000000000 +0200 -@@ -109,7 +109,7 @@ LDFLAGS_SHARED = $(LDFLAGS) $(CFLAGS_SHA - - LDFLAGS_DEFAULT = $(LDFLAGS_@DFT_UPR_MODEL@) - --LIBS_TIC = @LDFLAGS_STATIC@ @TICS_ARGS@ @TINFO_ARGS@ @LDFLAGS_SHARED@ @LD_MODEL@ @LIBS@ -+LIBS_TIC = ../lib/libncurses.a - LDFLAGS_TIC = $(LDFLAGS_@DFT_UPR_MODEL@) $(LIBS_TIC) - - LIBS_TINFO = @LDFLAGS_STATIC@ @TINFO_ARGS@ @LDFLAGS_SHARED@ @LD_MODEL@ @LIBS@ -- cgit v1.2.3