[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [websites/build-kde-org/sok-work] /: Lower -j to 2 too see if I can get a successful build while I s
From:       Scarlett Clark <scarlett () scarlettgatelyclark ! com>
Date:       2015-04-01 2:42:08
Message-ID: E1Yd8bY-00062K-81 () scm ! kde ! org
[Download RAW message or body]

Git commit 569369c59820724df96289eccbb4c0894a0a2c5b by Scarlett Clark.
Committed on 01/04/2015 at 02:40.
Pushed by scarlettclark into branch 'sok-work'.

Lower -j to 2 too see if I can get a successful build while I sleep.

M  +1    -0    config/build/qt/project.cfg
M  +1    -1    docker/ubuntu-slave/Dockerfile

http://commits.kde.org/websites/build-kde-org/569369c59820724df96289eccbb4c0894a0a2c5b


diff --git a/config/build/qt/project.cfg b/config/build/qt/project.cfg
index 12bab6d..7df34b5 100644
--- a/config/build/qt/project.cfg
+++ b/config/build/qt/project.cfg
@@ -4,3 +4,4 @@ configureExecutable={sources}/configure
 [Build]
 inSourceBuild=True
 configureCommand=%(configureExecutable)s -fast -debug -separate-debug-info \
-system-zlib -system-libpng -system-libjpeg -system-sqlite -dbus -webkit \
-plugin-sql-mysql -nomake examples -nomake demos -no-phonon -confirm-license \
-opensource -prefix {instPrefix} +makeCommand=%(makeExecutable)s -l {loadLevel} -j 2
\ No newline at end of file
diff --git a/docker/ubuntu-slave/Dockerfile b/docker/ubuntu-slave/Dockerfile
index 37b9d7e..5f4b6d3 100644
--- a/docker/ubuntu-slave/Dockerfile
+++ b/docker/ubuntu-slave/Dockerfile
@@ -4,7 +4,7 @@ MAINTAINER Scarlett Clark <sgclark@kubuntu.org>
 
 #Install Essentials up to qt5
 RUN apt-get update && apt-get -y install openssh-server sudo wget build-essential \
openjdk-6-jre-headless git python-lxml xvfb openbox dbus-x11 psmisc doxygen bzr \
cppcheck gperf bison ruby flex libpolkit-agent-1-dev libpolkit-backend-1-dev \
libpolkit-gobject-1-dev libxslt1-dev docbook-xml docbook-xsl libgcrypt-dev \
libboost1.55-dev gcovr libnm-glib-dev libnm-util-dev libopenal-dev  libsndfile1-dev \
libexiv2-dev libattr1-dev libxapian-dev xsltproc libgpgme11-dev libsasl2-dev \
                libdmtx-dev libqrencode-dev libldap2-dev 
-libical-dev libxcb-composite0-dev libxcb-damage0-dev lib-gtk-3-dev && apt-get -y \
build-dep qtbase5-dev +libical-dev libxcb-composite0-dev libxcb-damage0-dev \
lib-gtk-3-dev modemmanager-qt libxcb-dpms0-dev && apt-get -y build-dep qtbase5-dev  
 #SSH I have master and slave on the same host so I had to get creative with ssh \
ports. update as needed.  EXPOSE 22


[prev in list] [next in list] [prev in thread] [next in thread]