From 4140a168624fe4c1333efbbb7c3ad55db26217e3 Mon Sep 17 00:00:00 2001 From: Stefan Lankes Date: Tue, 17 Jan 2017 20:47:25 +0100 Subject: [PATCH] add building of all user-level libs --- .travis.yml | 4 ++-- debian/rules | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 90387f122..0d84a836b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,8 +8,8 @@ before_install: - echo "deb https://dl.bintray.com/rwth-os/hermitcore vivid main" | sudo tee -a /etc/apt/sources.list - 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 packaging-dev - - sudo apt-get install -y --force-yes binutils-hermit gcc-hermit-bootstrap - #- sudo apt-get install -y --force-yes binutils-hermit libhermit newlib-hermit pthread-embedded-hermit gcc-hermit + #- sudo apt-get install -y --force-yes binutils-hermit gcc-hermit-bootstrap + - sudo apt-get install -y --force-yes binutils-hermit libhermit newlib-hermit pthread-embedded-hermit gcc-hermit - git submodule update --init lwip usr/libomp script: diff --git a/debian/rules b/debian/rules index 05ef373ac..9f0e5f692 100755 --- a/debian/rules +++ b/debian/rules @@ -8,7 +8,7 @@ export DEB_BUILD_OPTS = nocheck %: - dh $@ --parallel + dh $@ #--parallel override_dh_auto_configure: ./configure --prefix=`pwd`/debian/libhermit/opt/hermit @@ -18,14 +18,14 @@ override_dh_auto_build: make arch/x86/kernel/boot.h dh_auto_build - #make libs + make libs override_dh_auto_test: @echo "tests are disabled" override_dh_auto_install: - make install_libhermit - #make install + #make install_libhermit + make install # delete unneded files that would cause conflicts rm -rf `-pwd`/debian/libhermit/opt/hermit/share/info/dir