[Lunar-commits] <lunar> backmerge theedge ->lunar including: -o fix by moe in lsb/init-functions adding make wrapper queue run fix (LIN) wrapper fixes
Auke Kok
sofar at lunar-linux.org
Mon Jul 2 04:43:02 CEST 2012
commit 9b771ac2fc6ebcc435eaa94bb5acafcbc72b0e6b
Author: Auke Kok <sofar at lunar-linux.org>
Date: Thu May 26 11:35:46 2005 +0000
backmerge theedge ->lunar including:
-o fix by moe in lsb/init-functions
adding make wrapper
queue run fix (LIN)
wrapper fixes
---
lib/lsb/init-functions | 2 +-
var/lib/lunar/compilers/c++ | 2 +-
var/lib/lunar/compilers/cc | 2 +-
var/lib/lunar/compilers/g++ | 2 +-
var/lib/lunar/compilers/gcc | 2 +-
var/lib/lunar/compilers/make | 10 ++++++++++
var/lib/lunar/functions/build.lunar | 14 +-------------
var/lib/lunar/functions/optimize.lunar | 12 ++++--------
var/lib/lunar/plugins/postbuild-generic.plugin | 4 ++++
var/lib/lunar/unset.sh | 1 -
10 files changed, 24 insertions(+), 27 deletions(-)
diff --git a/lib/lsb/init-functions b/lib/lsb/init-functions
index 75106ae..a69afd6 100644
--- a/lib/lsb/init-functions
+++ b/lib/lsb/init-functions
@@ -178,7 +178,7 @@ prload () {
mkpid () {
if [ ! -e $PIDFILE ] ; then
echo -n "[PID] "
- /bin/pgrep -P 1 "^$PROCESS_BASE$" > $PIDFILE && return 0 || return -1
+ /bin/pgrep -o -P 1 "^$PROCESS_BASE$" > $PIDFILE && return 0 || return -1
else
return
fi
diff --git a/var/lib/lunar/compilers/c++ b/var/lib/lunar/compilers/c++
index 4ee422d..1b63334 100755
--- a/var/lib/lunar/compilers/c++
+++ b/var/lib/lunar/compilers/c++
@@ -3,7 +3,7 @@
export PATH=${PATH/\/var\/lib\/lunar\/compilers:/}
if [ -n "$LUNAR_DEBUG" ] ; then
- echo "++ $CXX_EXT g++ $CCOPT \"$@\"" > /dev/stderr
+ echo "++ $CXX_EXT g++ $CCOPT \"$@\"" >&2
fi
$CXX_EXT g++ $CCOPT "$@"
diff --git a/var/lib/lunar/compilers/cc b/var/lib/lunar/compilers/cc
index b209ce6..b415866 100755
--- a/var/lib/lunar/compilers/cc
+++ b/var/lib/lunar/compilers/cc
@@ -3,7 +3,7 @@
export PATH=${PATH/\/var\/lib\/lunar\/compilers:/}
if [ -n "$LUNAR_DEBUG" ] ; then
- echo "++ $CC_EXT gcc $COPT \"$@\"" > /dev/stderr
+ echo "++ $CC_EXT gcc $COPT \"$@\"" >&2
fi
$CC_EXT gcc $COPT "$@"
diff --git a/var/lib/lunar/compilers/g++ b/var/lib/lunar/compilers/g++
index a6e9ebf..18226d0 100755
--- a/var/lib/lunar/compilers/g++
+++ b/var/lib/lunar/compilers/g++
@@ -3,7 +3,7 @@
export PATH=${PATH/\/var\/lib\/lunar\/compilers:/}
if [ -n "$LUNAR_DEBUG" ] ; then
- echo "++ $CXX_EXT g++ $CCOPT \"$@\"" > /dev/stderr
+ echo "++ $CXX_EXT g++ $CCOPT \"$@\"" >&2
fi
$CXX_EXT g++ $CCOPT "$@"
diff --git a/var/lib/lunar/compilers/gcc b/var/lib/lunar/compilers/gcc
index b209ce6..b415866 100755
--- a/var/lib/lunar/compilers/gcc
+++ b/var/lib/lunar/compilers/gcc
@@ -3,7 +3,7 @@
export PATH=${PATH/\/var\/lib\/lunar\/compilers:/}
if [ -n "$LUNAR_DEBUG" ] ; then
- echo "++ $CC_EXT gcc $COPT \"$@\"" > /dev/stderr
+ echo "++ $CC_EXT gcc $COPT \"$@\"" >&2
fi
$CC_EXT gcc $COPT "$@"
diff --git a/var/lib/lunar/compilers/make b/var/lib/lunar/compilers/make
new file mode 100755
index 0000000..5349e60
--- /dev/null
+++ b/var/lib/lunar/compilers/make
@@ -0,0 +1,10 @@
+#!/bin/bash
+
+export PATH=${PATH/\/var\/lib\/lunar\/compilers:/}
+
+if [ -n "$LUNAR_DEBUG" ] ; then
+ echo "++ $MAKE_EXT make ${MAKES:+-j$MAKES} \"$@\"" >&2
+fi
+
+$MAKE_EXT make ${MAKES:+-j$MAKES} "$@"
+
diff --git a/var/lib/lunar/functions/build.lunar b/var/lib/lunar/functions/build.lunar
index 6107aa4..9096158 100644
--- a/var/lib/lunar/functions/build.lunar
+++ b/var/lib/lunar/functions/build.lunar
@@ -185,19 +185,7 @@ default_cvs_config() {
default_make() {
debug_msg "default_make ($@)"
verbose_msg "running \"default_make\""
- # This code is simular to the optimize_make function from optimize.lunar
- # This is needed because bash does not expand aliases in functions
- if module_installed openmosix-tools ; then
- if [[ "$MAKES" > 1 ]] ; then
- mosrun -h make -j$MAKES
- else
- mosrun -h make
- fi
- elif [[ $MAKES > 1 ]] ; then
- make -j$MAKES
- else
- make
- fi &&
+ make &&
prepare_install &&
make install
} > $C_FIFO 2>&1
diff --git a/var/lib/lunar/functions/optimize.lunar b/var/lib/lunar/functions/optimize.lunar
index bc6fed2..c366605 100644
--- a/var/lib/lunar/functions/optimize.lunar
+++ b/var/lib/lunar/functions/optimize.lunar
@@ -60,14 +60,8 @@ optimize_make() {
unset MAKES
fi
if module_installed linux-openmosix; then
- alias make="mosrun -h make"
- if [[ "$MAKES" > 1 ]] ; then
- alias make="mosrun -h make -j$MAKES"
- fi
- elif [[ $MAKES > 1 ]] ; then
- alias make="make -j$MAKES"
+ $MAKE_EXT="$MAKE_EXT mosrun -h"
fi
- verbose_msg "make=\"$(which make)\", MAKES=\"$MAKES\""
}
@@ -757,11 +751,13 @@ ADDON=( ) > /etc/lunar/local/optimizations
export CC_EXT
export CXX_EXT
- export CFLAGS
+ export MAKE_EXT
export COPT
export CCOPT
+ export CFLAGS
export CXXFLAGS
export LDFLAGS
+ export MAKES
use_wrappers
verbose_msg "BUILD=\"$BUILD\""
diff --git a/var/lib/lunar/plugins/postbuild-generic.plugin b/var/lib/lunar/plugins/postbuild-generic.plugin
index 8555d79..27a1536 100644
--- a/var/lib/lunar/plugins/postbuild-generic.plugin
+++ b/var/lib/lunar/plugins/postbuild-generic.plugin
@@ -46,6 +46,10 @@ gather_docs()
# copy it over to the doc directory creating directories as needed
verbose_msg "Installing extra documentation to: ${DOC_DIR}/${FILE}"
install -D -m 644 ${FILE} ${DOC_DIR}/${FILE}
+ elif [ -d ${FILE} ] ; then
+ # copy the directory to the docdir
+ verbose_msg "Installing extra documentation to: ${DOC_DIR}/${FILE}"
+ cp -a ${FILE} ${DOC_DIR}/
fi
done
devoke_installwatch
diff --git a/var/lib/lunar/unset.sh b/var/lib/lunar/unset.sh
index 8ce354f..755b2e2 100644
--- a/var/lib/lunar/unset.sh
+++ b/var/lib/lunar/unset.sh
@@ -44,7 +44,6 @@ unset KDE_URL
unset KERNEL_URL
unset LDD_CHECK
unset LDF
-unset LIN
unset LINES
unset LOCAL_CONFIG
unset LOCAL_EXCLUDED
More information about the Lunar-commits
mailing list