From 14bc50bfa1225afa28e9d2da59918939310e2cef Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Tue, 29 Oct 2013 14:28:51 +0100 Subject: cleanup the automatic build list --- mk/build.mk | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) (limited to 'mk') diff --git a/mk/build.mk b/mk/build.mk index f784c99db..112d53e5b 100644 --- a/mk/build.mk +++ b/mk/build.mk @@ -18,13 +18,9 @@ DEFCONFIG= ADK_DEBUG=n \ ADK_SIMPLE_NETWORK_CONFIG=n \ ADK_USE_CCACHE=n \ ADK_TOOLCHAIN_GDB=n \ - ADK_PACKAGE_LIBAU=n \ ADK_PACKAGE_E2FSCK_STATIC=n \ - ADK_PACKAGE_AUFS2_UTIL=n \ ADK_PACKAGE_KEXECINIT=n \ ADK_PACKAGE_INSTALLER=n \ - ADK_PACKAGE_CXXTOOLS_DEV=n \ - ADK_PACKAGE_XORG_SERVER_DEV=n \ ADK_PACKAGE_LM_SENSORS_DETECT=n \ ADK_PACKAGE_PACEMAKER=n \ ADK_PACKAGE_PACEMAKER_MGMTD=n \ @@ -37,20 +33,14 @@ DEFCONFIG= ADK_DEBUG=n \ ADK_PACKAGE_GRUB=n \ ADK_PACKAGE_BASE_FILES=y \ ADK_PACKAGE_CRYPTINIT=n \ - ADK_PACKAGE_HEIMDAL_SERVER=n \ - ADK_PACKAGE_LIBHEIMDAL=n \ ADK_PACKAGE_PAM=n \ - ADK_PACKAGE_PYTHON=n \ ADK_PACKAGE_VIRTINST=n \ ADK_PACKAGE_URLGRABBER=n \ ADK_PACKAGE_PERL=n \ ADK_PACKAGE_LIBSSP=n \ - ADK_PKG_DESKTOP=n \ - ADK_PKG_LAPTOP=n \ + ADK_PKG_XORG=n \ ADK_PKG_MPDBOX=n \ ADK_PKG_DEVELOPMENT=n \ - ADK_PKG_VPN_CLIENT=n \ - ADK_PKG_VPN_SERVER=n \ ADK_TOOLCHAIN_GCC_JAVA=n \ ADK_TOOLCHAIN_GCC_OBJC=n \ ADK_TOOLCHAIN_GCC_USE_SSP=n \ -- cgit v1.2.3 From f4581f42e7e287aff1148da47e490830aa929ea4 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Tue, 29 Oct 2013 14:53:13 +0100 Subject: remove blank line --- mk/host-bottom.mk | 1 - 1 file changed, 1 deletion(-) (limited to 'mk') diff --git a/mk/host-bottom.mk b/mk/host-bottom.mk index 327883a95..dab1bd99b 100644 --- a/mk/host-bottom.mk +++ b/mk/host-bottom.mk @@ -36,7 +36,6 @@ ifneq ($(filter auto,${HOST_STYLE}),) --disable-libtool-lock \ --disable-nls \ ${HOST_CONFIGURE_ARGS} $(MAKE_TRACE) - else cd ${WRKBUILD}; rm -f config.{cache,status}; \ env ${HOST_CONFIGURE_ENV} \ -- cgit v1.2.3 From 1a6d2ebae0efbdee792cb15165dc0ebca9a9831b Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Tue, 29 Oct 2013 15:09:37 +0100 Subject: inverse logic to avoid error message --- mk/buildhlp.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'mk') diff --git a/mk/buildhlp.mk b/mk/buildhlp.mk index 41f09d946..5fdc7011a 100644 --- a/mk/buildhlp.mk +++ b/mk/buildhlp.mk @@ -93,7 +93,7 @@ ifeq ($(strip ${_IN_PACKAGE})$(strip ${_IN_CVTC}),1) else @$(MAKE) -s V=0 prepare WRKDIR=${WRKDIR}.orig PREVENT_PATCH=: NO_CHECKSUM=1 endif - @-test -r ${WRKDIR}/.autoreconf_done && \ + @-test ! -r ${WRKDIR}/.autoreconf_done || \ (cd ${WRKDIR}.orig/${PKG_NAME}-${PKG_VERSION}; \ env ${AUTOTOOL_ENV} autoreconf -if) $(MAKE_TRACE) @rm -rf ${WRKDIR}.orig/${PKG_NAME}-${PKG_VERSION}/autom4te.cache -- cgit v1.2.3 From eee410e8adc42e7a505e0a4903b001caabb3b11f Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Tue, 29 Oct 2013 17:19:17 +0100 Subject: break out after the first error --- mk/build.mk | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) (limited to 'mk') diff --git a/mk/build.mk b/mk/build.mk index 112d53e5b..aeb6bbce0 100644 --- a/mk/build.mk +++ b/mk/build.mk @@ -574,12 +574,14 @@ bulk: echo === building $$arch $$system $$libc on $$(date); \ $(GMAKE) prereq && \ $(GMAKE) ARCH=$$arch SYSTEM=$$system LIBC=$$libc FS=archive defconfig; \ - $(GMAKE) VERBOSE=1 all; if [ $$? -ne 0 ]; then touch .exit;fi; \ + $(GMAKE) VERBOSE=1 all; if [ $$? -ne 0 ]; then touch .exit; exit 1;fi; \ rm .config; \ ) 2>&1 | tee $(TOPDIR)/bin/$${system}_$${arch}_$$libc/build.log; \ + if [ -f .exit ]; break;fi \ done; \ - if [ -f .exit ];then echo "Bulk build failed!"; rm .exit; exit 1;fi \ + if [ -f .exit ]; break;fi \ done <${TOPDIR}/target/arch.lst ;\ + if [ -f .exit ];then echo "Bulk build failed!"; rm .exit; break;fi \ done bulkall: @@ -592,12 +594,14 @@ bulkall: echo === building $$arch $$system $$libc on $$(date); \ $(GMAKE) prereq && \ $(GMAKE) ARCH=$$arch SYSTEM=$$system LIBC=$$libc FS=archive allconfig; \ - $(GMAKE) VERBOSE=1 all; if [ $$? -ne 0 ]; then touch .exit;fi; \ + $(GMAKE) VERBOSE=1 all; if [ $$? -ne 0 ]; then touch .exit; exit 1;fi; \ rm .config; \ ) 2>&1 | tee $(TOPDIR)/bin/$${system}_$${arch}_$$libc/build.log; \ + if [ -f .exit ]; break;fi \ done; \ - if [ -f .exit ];then echo "Bulk build failed!"; rm .exit; exit 1;fi \ + if [ -f .exit ]; break;fi \ done <${TOPDIR}/target/arch.lst ;\ + if [ -f .exit ];then echo "Bulk build failed!"; rm .exit; break;fi \ done bulkallmod: @@ -613,9 +617,11 @@ bulkallmod: $(GMAKE) VERBOSE=1 all; if [ $$? -ne 0 ]; then echo $$system-$$libc >.exit; exit 1;fi; \ rm .config; \ ) 2>&1 | tee $(TOPDIR)/bin/$${system}_$${arch}_$$libc/build.log; \ + if [ -f .exit ]; break;fi \ done; \ - if [ -f .exit ];then echo "Bulk build failed!"; cat .exit;rm .exit; exit 1;fi \ + if [ -f .exit ]; break;fi \ done <${TOPDIR}/target/arch.lst ;\ + if [ -f .exit ];then echo "Bulk build failed!"; cat .exit;rm .exit; break;fi \ done ${TOPDIR}/bin/tools/pkgmaker: $(TOPDIR)/tools/adk/pkgmaker.c $(TOPDIR)/tools/adk/sortfile.c $(TOPDIR)/tools/adk/strmap.c -- cgit v1.2.3 From 2beecae063b63fbd52a7e1c4d8ab1595f7b9c4a3 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Tue, 29 Oct 2013 18:01:38 +0100 Subject: add missing then --- mk/build.mk | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'mk') diff --git a/mk/build.mk b/mk/build.mk index aeb6bbce0..104811819 100644 --- a/mk/build.mk +++ b/mk/build.mk @@ -577,9 +577,9 @@ bulk: $(GMAKE) VERBOSE=1 all; if [ $$? -ne 0 ]; then touch .exit; exit 1;fi; \ rm .config; \ ) 2>&1 | tee $(TOPDIR)/bin/$${system}_$${arch}_$$libc/build.log; \ - if [ -f .exit ]; break;fi \ + if [ -f .exit ]; then break;fi \ done; \ - if [ -f .exit ]; break;fi \ + if [ -f .exit ]; then break;fi \ done <${TOPDIR}/target/arch.lst ;\ if [ -f .exit ];then echo "Bulk build failed!"; rm .exit; break;fi \ done @@ -597,9 +597,9 @@ bulkall: $(GMAKE) VERBOSE=1 all; if [ $$? -ne 0 ]; then touch .exit; exit 1;fi; \ rm .config; \ ) 2>&1 | tee $(TOPDIR)/bin/$${system}_$${arch}_$$libc/build.log; \ - if [ -f .exit ]; break;fi \ + if [ -f .exit ]; then break;fi \ done; \ - if [ -f .exit ]; break;fi \ + if [ -f .exit ]; then break;fi \ done <${TOPDIR}/target/arch.lst ;\ if [ -f .exit ];then echo "Bulk build failed!"; rm .exit; break;fi \ done @@ -617,9 +617,9 @@ bulkallmod: $(GMAKE) VERBOSE=1 all; if [ $$? -ne 0 ]; then echo $$system-$$libc >.exit; exit 1;fi; \ rm .config; \ ) 2>&1 | tee $(TOPDIR)/bin/$${system}_$${arch}_$$libc/build.log; \ - if [ -f .exit ]; break;fi \ + if [ -f .exit ]; then break;fi \ done; \ - if [ -f .exit ]; break;fi \ + if [ -f .exit ]; then break;fi \ done <${TOPDIR}/target/arch.lst ;\ if [ -f .exit ];then echo "Bulk build failed!"; cat .exit;rm .exit; break;fi \ done -- cgit v1.2.3 From a852b043567e2f161899dfcc28ab080bcfe4ec66 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Tue, 29 Oct 2013 21:05:04 +0100 Subject: try to fix ncurses build on buildserver --- mk/host-bottom.mk | 36 ++++++++++++++++++------------------ mk/host.mk | 5 +++++ package/ncurses/Makefile | 4 ++-- 3 files changed, 25 insertions(+), 20 deletions(-) (limited to 'mk') diff --git a/mk/host-bottom.mk b/mk/host-bottom.mk index dab1bd99b..d6ec200c2 100644 --- a/mk/host-bottom.mk +++ b/mk/host-bottom.mk @@ -20,18 +20,19 @@ ${_HOST_CONFIGURE_COOKIE}: ${_HOST_PATCH_COOKIE} ${CP} ${SCRIPT_DIR}/config.guess $$i; \ fi; \ done; -ifneq ($(filter auto,${HOST_STYLE}),) +ifeq ($(strip ${HOST_STYLE}),) cd ${WRKBUILD}; rm -f config.{cache,status}; \ env ${HOST_CONFIGURE_ENV} \ ${BASH} ${WRKSRC}/${CONFIGURE_PROG} \ --program-prefix= \ --program-suffix= \ - --prefix=${STAGING_HOST_DIR}/usr \ - --bindir=${STAGING_HOST_DIR}/usr/bin \ - --datadir=${STAGING_HOST_DIR}/usr/share \ - --mandir=${STAGING_HOST_DIR}/usr/share/man \ - --libexecdir=${STAGING_HOST_DIR}/usr/libexec \ - --sysconfdir=${STAGING_HOST_DIR}/etc \ + --prefix=/usr \ + --bindir=/usr/bin \ + --datadir=/usr/share \ + --mandir=/usr/share/man \ + --libexecdir=/usr/libexec \ + --localstatedir=/var \ + --sysconfdir=/etc \ --disable-dependency-tracking \ --disable-libtool-lock \ --disable-nls \ @@ -42,13 +43,12 @@ else ${BASH} ${WRKSRC}/${CONFIGURE_PROG} \ --program-prefix= \ --program-suffix= \ - --prefix=/usr \ - --bindir=/usr/bin \ - --datadir=/usr/share \ - --mandir=/usr/share/man \ - --libexecdir=/usr/libexec \ - --localstatedir=/var \ - --sysconfdir=/etc \ + --prefix=${STAGING_HOST_DIR}/usr \ + --bindir=${STAGING_HOST_DIR}/usr/bin \ + --datadir=${STAGING_HOST_DIR}/usr/share \ + --mandir=${STAGING_HOST_DIR}/usr/share/man \ + --libexecdir=${STAGING_HOST_DIR}/usr/libexec \ + --sysconfdir=${STAGING_HOST_DIR}/etc \ --disable-dependency-tracking \ --disable-libtool-lock \ --disable-nls \ @@ -67,13 +67,13 @@ hpkg-install: ${ALL_HOSTINST} host-install: ${_HOST_FAKE_COOKIE}: ${_HOST_BUILD_COOKIE} @$(CMD_TRACE) "host installing... " -ifneq ($(filter auto,${HOST_STYLE}),) - cd ${WRKBUILD} && env ${HOST_MAKE_ENV} ${MAKE} -f ${MAKE_FILE} \ - DESTDIR='' ${HOST_FAKE_FLAGS} ${HOST_INSTALL_TARGET} $(MAKE_TRACE) -else +ifeq ($(strip ${HOST_STYLE}),) cd ${WRKBUILD} && env ${HOST_MAKE_ENV} ${MAKE} -f ${MAKE_FILE} \ DESTDIR='${HOST_WRKINST}' ${HOST_FAKE_FLAGS} ${HOST_INSTALL_TARGET} $(MAKE_TRACE) env ${HOST_MAKE_ENV} ${MAKE} hpkg-install $(MAKE_TRACE) +else + cd ${WRKBUILD} && env ${HOST_MAKE_ENV} ${MAKE} -f ${MAKE_FILE} \ + DESTDIR='' ${HOST_FAKE_FLAGS} ${HOST_INSTALL_TARGET} $(MAKE_TRACE) endif rm -rf ${WRKBUILD} ${WRKDIST} ${WRKSRC} exec ${MAKE} host-extract $(MAKE_TRACE) diff --git a/mk/host.mk b/mk/host.mk index 855adf0d1..619ec140e 100644 --- a/mk/host.mk +++ b/mk/host.mk @@ -20,6 +20,11 @@ HOST_FAKE_FLAGS?= HOST_ALL_TARGET?= all HOST_INSTALL_TARGET?= install +HOST_MAKE_ENV+= PATH='${TARGET_PATH}' \ + CFLAGS='$(strip ${CFLAGS_FOR_BUILD})' \ + CXXFLAGS='$(strip ${CXXFLAGS_FOR_BUILD})' \ + CPPFLAGS='$(strip ${CPPFLAGS_FOR_BUILD})' \ + LDFLAGS='$(strip ${LDFLAGS_FOR_BUILD})' HOST_MAKE_FLAGS+= ${HOST_XAKE_FLAGS} V=1 HOST_FAKE_FLAGS+= ${HOST_XAKE_FLAGS} diff --git a/package/ncurses/Makefile b/package/ncurses/Makefile index 4c649aff0..fb3a39eb5 100644 --- a/package/ncurses/Makefile +++ b/package/ncurses/Makefile @@ -50,8 +50,8 @@ ALL_TARGET:= libs INSTALL_TARGET:= install.libs install.data # use sth which does not exist -HOST_ALL_TARGET:= install.includes -HOST_INSTALL_TARGET:= install.progs +HOST_ALL_TARGET:= progs +HOST_INSTALL_TARGET:= install.includes install.progs HOST_CONFIGURE_ARGS+= --without-shared \ --with-build-cc=${CC_FOR_BUILD} \ --with-progs \ -- cgit v1.2.3 From 83c0684ab269fbd83cf1d9e9dc0d771bfeb7d5b0 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Tue, 29 Oct 2013 21:24:11 +0100 Subject: use exit 1 for the last for loop, otherwise hudson thinks everything is build fine --- mk/build.mk | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'mk') diff --git a/mk/build.mk b/mk/build.mk index 104811819..b44247005 100644 --- a/mk/build.mk +++ b/mk/build.mk @@ -559,8 +559,9 @@ bulktoolchain: $(GMAKE) VERBOSE=1 all; if [ $$? -ne 0 ]; then touch .exit;fi; \ rm .config; \ ) 2>&1 | tee $(TOPDIR)/bin/toolchain_$${arch}_$${libc}/build.log; \ - if [ -f .exit ];then echo "Bulk build failed!"; rm .exit; exit 1;fi \ + if [ -f .exit ];then break;fi \ done <${TOPDIR}/target/tarch.lst ;\ + if [ -f .exit ];then echo "Bulk build failed!"; rm .exit; exit 1;fi \ done # build all target architecture, target systems and libc combinations @@ -581,7 +582,7 @@ bulk: done; \ if [ -f .exit ]; then break;fi \ done <${TOPDIR}/target/arch.lst ;\ - if [ -f .exit ];then echo "Bulk build failed!"; rm .exit; break;fi \ + if [ -f .exit ];then echo "Bulk build failed!"; rm .exit; exit 1;fi \ done bulkall: @@ -601,7 +602,7 @@ bulkall: done; \ if [ -f .exit ]; then break;fi \ done <${TOPDIR}/target/arch.lst ;\ - if [ -f .exit ];then echo "Bulk build failed!"; rm .exit; break;fi \ + if [ -f .exit ];then echo "Bulk build failed!"; rm .exit; exit 1;fi \ done bulkallmod: @@ -621,7 +622,7 @@ bulkallmod: done; \ if [ -f .exit ]; then break;fi \ done <${TOPDIR}/target/arch.lst ;\ - if [ -f .exit ];then echo "Bulk build failed!"; cat .exit;rm .exit; break;fi \ + if [ -f .exit ];then echo "Bulk build failed!"; cat .exit;rm .exit; exit 1;fi \ done ${TOPDIR}/bin/tools/pkgmaker: $(TOPDIR)/tools/adk/pkgmaker.c $(TOPDIR)/tools/adk/sortfile.c $(TOPDIR)/tools/adk/strmap.c -- cgit v1.2.3 From 83344e425c57cd3808e734b487c695112f5e551b Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Tue, 29 Oct 2013 21:50:50 +0100 Subject: try to fix rebuild problem --- mk/host-bottom.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'mk') diff --git a/mk/host-bottom.mk b/mk/host-bottom.mk index d6ec200c2..83eb22b0e 100644 --- a/mk/host-bottom.mk +++ b/mk/host-bottom.mk @@ -78,9 +78,9 @@ endif rm -rf ${WRKBUILD} ${WRKDIST} ${WRKSRC} exec ${MAKE} host-extract $(MAKE_TRACE) mkdir -p ${HOST_WRKINST} - touch $@ # avoid rebuild touch ${_HOST_BUILD_COOKIE} ${_HOST_CONFIGURE_COOKIE} + touch $@ ${_HOST_COOKIE}: exec ${MAKE} hostpackage -- cgit v1.2.3 From 5ce633839096d25a684af6978ba9da7d6d34fdaf Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Wed, 30 Oct 2013 15:46:44 +0100 Subject: fix update-patches when WRKDIST is overwritten in the Makefile --- mk/buildhlp.mk | 3 ++- scripts/update-patches | 5 +++++ 2 files changed, 7 insertions(+), 1 deletion(-) (limited to 'mk') diff --git a/mk/buildhlp.mk b/mk/buildhlp.mk index 5fdc7011a..79014ac4b 100644 --- a/mk/buildhlp.mk +++ b/mk/buildhlp.mk @@ -94,7 +94,8 @@ else @$(MAKE) -s V=0 prepare WRKDIR=${WRKDIR}.orig PREVENT_PATCH=: NO_CHECKSUM=1 endif @-test ! -r ${WRKDIR}/.autoreconf_done || \ - (cd ${WRKDIR}.orig/${PKG_NAME}-${PKG_VERSION}; \ + (wrkdist=$(WRKDIST) dir=$${wrkdist#$(WRKDIR)}; \ + cd ${WRKDIR}.orig$${dir}; \ env ${AUTOTOOL_ENV} autoreconf -if) $(MAKE_TRACE) @rm -rf ${WRKDIR}.orig/${PKG_NAME}-${PKG_VERSION}/autom4te.cache @# restore config.sub/config.guess diff --git a/scripts/update-patches b/scripts/update-patches index a180b96be..f4303f841 100644 --- a/scripts/update-patches +++ b/scripts/update-patches @@ -91,6 +91,11 @@ for file in $(cd ${WRKDIST}; find . -type f | sed 's#^\./##'); do echo "DEBUG: $file" >> /tmp/debug [[ ! -e $ORGDIST/$file && $patch_newfiles = 0 ]] && continue [[ $file = configure && $ignore_autoconf = 1 ]] && continue + [[ $file = missing && $ignore_autoconf = 1 ]] && continue + [[ $file = depcomp && $ignore_autoconf = 1 ]] && continue + [[ $file = install-sh && $ignore_autoconf = 1 ]] && continue + [[ $file = aclocal.m4 && $ignore_autoconf = 1 ]] && continue + [[ $file = INSTALL && $ignore_autoconf = 1 ]] && continue [[ $file = config.h.in && $ignore_autoconf = 1 ]] && continue [[ $(basename $file) = Makefile.in && $ignore_autoconf = 1 ]] && continue cmp -s "$ORGDIST/$file" "$WRKDIST/$file" && continue -- cgit v1.2.3