Tested it on opensuse 13.2 and it was very nice though building with four
threads on my old single core machine was unnecessary.

On Wed, Feb 18, 2015 at 12:21 AM, Dirk Hohndel <[email protected]> wrote:

> So I picked what seemed like the sane patches and pushed them to the
> v4.4-branch. My goal is to release 4.4.1 tomorrow. Could people take a
> look to make sure I didn't break anything?
>
> The next part I just mentioned in another thread, but maybe more people
> will read this email, so I'll repeat it here:
>
> There's a new build script for people building on Linux and getting
> freaked out by the weird dependencies that we have... Obviously I want
> people to use our packages. But there are another 500 Linux distributions
> out there for which I don't have packages... so this should make things
> easier for people.
>
> if you feel like giving this a try, ideally start from a fresh checkout:
>
> mkdir ~/testfordirk
> cd ~/testfordirk
> git clone -b v4.4-branch git://subsurface-divelog.org/subsurface.git
> ./subsurface/scripts/build.sh
>
> now wait. possibly a while as it builds quite a few things
>
> if it fails, capture the bug and send it to the mailing list
>
> if it doesn't (YAY!) you can run Subsurface like this:
>
> ./subsurface/scripts/run.sh
>
>
> Note: this does NOT attempt to install prerequisits - you can find those
> in the INSTALL file. This also assumes that you have a Qt5 development
> devironment, it will not work on Qt4 based distros.
>
> /D
>
> _______________________________________________
> subsurface mailing list
> [email protected]
> http://lists.subsurface-divelog.org/cgi-bin/mailman/listinfo/subsurface
>



-- 
regards,
Gehad
From e7d9c041cfa652c0cd6d9579cf09525d73ec69ce Mon Sep 17 00:00:00 2001
From: Gehad elrobey <[email protected]>
Date: Wed, 18 Feb 2015 01:22:07 +0200
Subject: [PATCH] Add Make flag variable to control parallel execution

Signed-off-by: Gehad elrobey <[email protected]>
---
 scripts/build.sh | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/scripts/build.sh b/scripts/build.sh
index 44cf5d5..0e9f089 100755
--- a/scripts/build.sh
+++ b/scripts/build.sh
@@ -14,6 +14,8 @@
 # to all kinds of unnecessary pain
 
 SRC=$(pwd)
+MAKEFLAGS=-j4
+
 if [[ ! -d "subsurface" ]] ; then
 	echo "please start this script from the directory containing the Subsurface source directory"
 	exit 1
@@ -53,7 +55,7 @@ if [ ! -f configure ] ; then
 	autoreconf --install
 	./configure --prefix=$SRC/install
 fi
-make -j4
+make $MAKEFLAGS
 make install
 
 cd $SRC
@@ -78,10 +80,10 @@ cmake -DCMAKE_BUILD_TYPE=Release -DQTONLY=TRUE -DQT5BUILD=ON \
 	-DBUILD_MARBLE_APPS=NO \
 	$SRC/marble-source
 cd src/lib/marble
-make -j4
+make $MAKEFLAGS
 make install
 
 cd $SRC/subsurface
 qmake-qt5 LIBDCDEVEL=1 LIBMARBLEDEVEL=$SRC/install SPECIAL_MARBLE_PREFIX=1 LIBGIT2DEVEL=$SRC/libgit2 subsurface.pro
-make -j4
+make $MAKEFLAGS
 
-- 
2.1.0

_______________________________________________
subsurface mailing list
[email protected]
http://lists.subsurface-divelog.org/cgi-bin/mailman/listinfo/subsurface

Reply via email to