[Devil-linux-commit] build/scripts LPRng, 1.6, 1.7 build.sh, 1.102, 1.103 dev86, 1.2, 1.3 settings, 1.58, 1.59

[Heiko Z. <smi...@us...>]

Update of /cvsroot/devil-linux/build/scripts
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv23735/scripts

Modified Files:
	LPRng build.sh dev86 settings 
Log Message:
some change for make -jX
new command "make buildorder"
build order is now only generated if it doesn't exist or is invoked via
"make buildorder"


Index: build.sh
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/build.sh,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -d -r1.102 -r1.103
--- build.sh	16 Apr 2008 13:19:15 -0000	1.102
+++ build.sh	4 Oct 2009 12:29:18 -0000	1.103
@@ -278,6 +278,11 @@
 			echo running prepare
 			./prepare prepare || exit 1
 
+			if [ ! -d $DL_DIR/scripts/.buildorder ]; then
+			    $MYSELF buildorder || exit 1
+			fi
+			;;
+	buildorder)
 			if [ ! -e /sbin/insserv ]; then
 				echo "insserv not found"
 				SCRIPT=insserv
@@ -297,7 +302,6 @@
 				fi
 				popd
 			fi
-
 			echo "configuring order of scripts (this could take a while)"
 			rm -rf $DL_DIR/scripts/.buildorder &> /dev/null
 			mkdir -p $DL_DIR/scripts/.buildorder/rc{S,0,1,2,3,4,5,6}.d

Index: LPRng
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/LPRng,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- LPRng	9 Sep 2009 19:49:32 -0000	1.6
+++ LPRng	4 Oct 2009 12:29:18 -0000	1.7
@@ -33,7 +33,7 @@
 			replace_str ./Makefile.in 'SHELL="@SHELL@"' 'SHELL=@SHELL@' &&
 			./configure --prefix=/usr  --localstatedir=/var --sysconfdir=/etc \
 			    --with-userid=lpadmin --with-groupid=lpadmin --disable-nls --with-pic --disable-werror || exit 1
-			make $PMAKE all || exit 1
+			make all || exit 1
 			strip_debug
 		fi
 		;;

Index: dev86
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/dev86,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- dev86	25 Jun 2008 17:13:17 -0000	1.2
+++ dev86	4 Oct 2009 12:29:18 -0000	1.3
@@ -26,9 +26,9 @@
 case $1 in
     build )
         if [ "$CONFIG_GCC_HARDENED" = "y" ]; then
-            make $PMAKE CC="gcc -U_FORTIFY_SOURCE -fno-PIE -nopie -fno-stack-protector" all || exit 1
+            make CC="gcc -U_FORTIFY_SOURCE -fno-PIE -nopie -fno-stack-protector" all || exit 1
         else
-            make $PMAKE all || exit 1
+            make all || exit 1
         fi
 
         strip_debug

Index: settings
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/settings,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -d -r1.58 -r1.59
--- settings	2 Oct 2009 12:31:59 -0000	1.58
+++ settings	4 Oct 2009 12:29:18 -0000	1.59
@@ -43,7 +43,7 @@
 fi
 
 PMAKE=""
-#test -n "$CONFIG_PMAKE" && PMAKE="-j ${CONFIG_PMAKE}"
+test -n "$CONFIG_PMAKE" && PMAKE="-j ${CONFIG_PMAKE}"
 test -n "$CONFIG_PARALLEL_JOBS" || CONFIG_PARALLEL_JOBS=1
 
 CONF_HOST="i$CONFIG_CPU-pc-linux-gnu"