From 2668c259b71369bd39ac222894c15363d6668c40 Mon Sep 17 00:00:00 2001
From: Jonathan Bauer
Date: Tue, 19 Mar 2013 16:00:42 +0100
Subject: use all cores by make through MAKEFLAGS

---
 remote/modules/systemd/systemd.build | 18 +++++++++---------
 remote/modules/systemd/systemd.conf  |  2 ++
 2 files changed, 11 insertions(+), 9 deletions(-)

(limited to 'remote/modules/systemd')

diff --git a/remote/modules/systemd/systemd.build b/remote/modules/systemd/systemd.build
index bb58fc1c..57fb705e 100644
--- a/remote/modules/systemd/systemd.build
+++ b/remote/modules/systemd/systemd.build
@@ -3,8 +3,7 @@
 fetch_source () {
 	if [ ! -e .fetched_source ]; then 
 		download_untar "$URL" "src/"
-		local LIBKMOD_VERSION="kmod-12"
-		download_untar "http://www.kernel.org/pub/linux/utils/kernel/kmod/${LIBKMOD_VERSION}.tar.gz" "src/"
+		download_untar "$LIBKMOD_URL" "src/"
 		touch .fetched_source
 	fi
 }	
@@ -12,21 +11,22 @@ fetch_source () {
 build () {
 	if [ ! -e .built ]; then
 		#build libkmod
-		cd "src/$LIBKMOD_VERSION/"
+		cd "${MODULE_DIR}/src/$LIBKMOD_VERSION"
+		pwarning "$(pwd)"
 		./configure
-		make -j5
-		make install
-		cd -
+		make || perror "make failed."
+		make install || perror "make install failed."
+		cd - &> /dev/null
 
 		#build systemd
-		cd "src/$VERSION/"
+		cd "${MODULE_DIR}/src/$VERSION"
 		pinfo "calling configure"
 		./configure --disable-manpages --enable-split-usr --sysconfdir="/etc" --enable-gtk-doc-html=no || perror "configure failed."
 		pinfo "calling make"
-		make -j5 || perror "make failed."
+		make || perror "make failed."
 		pinfo "calling make install"
 		DESTDIR="${MODULE_BUILD_DIR}" make install || perror "make install failed."
-		cd -
+		cd - &> /dev/null
 		touch .built
 	fi
 }
diff --git a/remote/modules/systemd/systemd.conf b/remote/modules/systemd/systemd.conf
index c5e72aeb..634828bd 100644
--- a/remote/modules/systemd/systemd.conf
+++ b/remote/modules/systemd/systemd.conf
@@ -1,5 +1,7 @@
 VERSION=systemd-197
 URL=http://www.freedesktop.org/software/systemd/${VERSION}.tar.xz
+LIBKMOD_VERSION="kmod-12"
+LIBKMOD_URL="http://www.kernel.org/pub/linux/utils/kernel/kmod/${LIBKMOD_VERSION}.tar.gz"
 REQUIRED_DEPENDENCIES="	intltool
 			gperf
 			dbus
-- 
cgit v1.2.3-55-g7522