From 1ce65f052d1f4dd38e2d951848d56e2d97a61cfd Mon Sep 17 00:00:00 2001
From: Stefan Lankes <slankes@eonerc.rwth-aachen.de>
Date: Sun, 8 Jan 2017 15:52:14 +0100
Subject: [PATCH] build libhermit.a without testing

---
 .travis.yml  | 25 ++++++++++++++++---------
 Makefile.in  |  7 +++++--
 usr/Makefile |  4 ++--
 3 files changed, 23 insertions(+), 13 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 4300ddf8f..13ba2bdf0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,19 +6,26 @@ language: c
 compiler: gcc
 before_install:
         - sudo apt-get -qq update
-        - sudo apt-get install -y curl qemu-system-x86 nasm texinfo libmpfr-dev libmpc-dev libgmp-dev libisl-dev flex bison
-        - git submodule update --init lwip usr/gcc usr/pte usr/libomp
+        - sudo apt-get install -y curl qemu-system-x86 nasm texinfo libmpfr-dev libmpc-dev libgmp-dev libisl-dev flex bison packaging-dev
+        - git submodule update --init lwip usr/libomp
 script:
+        - cd $TOPDIR
+        - wget https://bintray.com/rwth-os/hermitcore/download_file?file_path=binutils-hermit_2.26.1-1_amd64.deb -O binutils-hermit_2.26.1-1_amd64.deb
+        - sudo dpkg -i ./binutils-hermit_2.26.1-1_amd64.deb
+        - wget https://bintray.com/rwth-os/hermitcore/download_file?file_path=newlib-hermit_2.4.0-1_amd64.deb -O newlib-hermit_2.4.0-1_amd64.deb
+        - sudo dpkg -i ./newlib-hermit_2.4.0-1_amd64.deb
+        - wget https://bintray.com/rwth-os/hermitcore/download_file?file_path=pthread-embedded-hermit_1.0-1_amd64.deb -O pthread-embedded-hermit_1.0-1_amd64.deb
+        - sudo dpkg -i ./pthread-embedded-hermit_1.0-1_amd64.deb
+        - wget https://www.lankes.org/deploy/bootstrap.tar.gz
+        - tar xzf bootstrap.tar.gz
+        - mkdir -p $TOPDIR/tmp/bootstrap
+        - cd -
         - ./configure
-        - wget https://www.lankes.org/deploy/newlib.tar.gz
-        - tar xzf newlib.tar.gz
-        - mv tmp usr/
-        - mv x86 usr/
-        - make T=1 all
-        - make test
+        - make -j2 T=1 all
 env:
         global:
-                - TOPDIR=`pwd`/../..
+                - TOPDIR=/home/travis/build
+                - PATH=$PATH:/opt/hermit/bin:$TOPDIR/x86/bin
                 - PROXY_STR=":hermit:M:7:\\x42::`pwd`/RWTH-OS/HermitCore/tools/proxy"
                 - HERMIT_ISLE=qemu
                 - HERMIT_CPUS=1
diff --git a/Makefile.in b/Makefile.in
index 7467b686c..77cc3f757 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -133,7 +133,10 @@ $(NAME):
 	$Q$(AR_FOR_TARGET) $(ARFLAGS) -o $(NAME) $^
 	$Q$(OBJCOPY_FOR_TARGET) --rename-section .bss=.kbss --rename-section .text=.ktext --rename-section .data=.kdata $(NAME) $(TOPDIR)/usr/$(ARCH)/$(CROSSCOMPREFIX)/lib/$(NAME)
 
-test:
+examples:
+	$Q$(MAKE) -C usr examples
+
+test: demo
 	. ./test.sh
 
 qemu:
@@ -200,6 +203,6 @@ include/hermit/config.inc: include/hermit/config.h
 	@echo [GCC-ASM] $@
 	$Q$(CC_FOR_TARGET) $(CFLAGS) -c -o $@ $<
 
-.PHONY: default all clean qemu gdb usr test toolchain tools
+.PHONY: default all clean qemu gdb usr test toolchain tools examples
 
 include $(addsuffix /Makefile,$(SUBDIRS))
diff --git a/usr/Makefile b/usr/Makefile
index 5c59cbcaa..6b9bae2ee 100644
--- a/usr/Makefile
+++ b/usr/Makefile
@@ -32,7 +32,7 @@ endif
 default:
 	@echo Do not use default rule!
 
-demo:
+examples:
 	@echo Build demo applications
 	$Q$(MAKE) ELFEDIT_FOR_TARGET=$(ELFEDIT_FOR_TARGET) CC_FOR_TARGET=$(CC_FOR_TARGET) CXX_FOR_TARGET=$(CXX_FOR_TARGET) CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET) $(PROFILING_CFLAGS)" LDFLAGS_FOR_TARGET="$(LDFLAGS_FOR_TARGET) $(PROFILING_LDFLAGS)" OBJCOPY_FOR_TARGET=$(OBJCOPY_FOR_TARGET) GO_FOR_TARGET="$(GO_FOR_TARGET)" GOFLAGS_FOR_TARGET="$(GOFLAGS_FOR_TARGET)" -C tests depend
 	$Q$(MAKE) ELFEDIT_FOR_TARGET=$(ELFEDIT_FOR_TARGET) CC_FOR_TARGET=$(CC_FOR_TARGET) CXX_FOR_TARGET=$(CXX_FOR_TARGET) CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET) $(PROFILING_CFLAGS)" LDFLAGS_FOR_TARGET="$(LDFLAGS_FOR_TARGET) $(PROFILING_LDFLAGS)" OBJCOPY_FOR_TARGET=$(OBJCOPY_FOR_TARGET) GO_FOR_TARGET="$(GO_FOR_TARGET)" GOFLAGS_FOR_TARGET="$(GOFLAGS_FOR_TARGET)" -C tests
@@ -70,7 +70,7 @@ $(TMP)/bootstrap:
 	$Q$(MKDIR) $(TMP)/bootstrap
 	$Q$(CD) $(TMP)/bootstrap; $(TOPDIR)/gcc/configure --target=$(TARGET) --prefix=$(TOPDIR)/$(ARCH) --without-headers --disable-multilib --with-isl --with-tune=generic --enable-languages=c,c++,lto --disable-nls --disable-shared --disable-libssp --disable-libgomp --enable-threads=posix --enable-tls --enable-lto --disable-symvers && $(MAKE) $(NJOBS) all-gcc $(TP) && $(MAKE) install-gcc $(TP)
 
-toolchain: $(TMP)/newlib libpthread $(TMP)/gcc libs demo
+toolchain: $(TMP)/newlib libpthread $(TMP)/gcc libs
 
 $(TMP)/newlib:
 	@echo Build newlib