[Lunar-commits] r16192 - in lunar/branches/stable: etc/lunar usr/share/doc/lunar/module-example var/lib/lunar/compilers var/lib/lunar/functions
Auke Kok
sofar at lunar-linux.org
Sun Aug 21 20:47:03 UTC 2005
Author: sofar
Date: 2005-08-21 20:47:02 +0000 (Sun, 21 Aug 2005)
New Revision: 16192
Modified:
lunar/branches/stable/etc/lunar/config
lunar/branches/stable/usr/share/doc/lunar/module-example/README
lunar/branches/stable/var/lib/lunar/compilers/c++
lunar/branches/stable/var/lib/lunar/compilers/cc
lunar/branches/stable/var/lib/lunar/compilers/g++
lunar/branches/stable/var/lib/lunar/compilers/gcc
lunar/branches/stable/var/lib/lunar/compilers/make
lunar/branches/stable/var/lib/lunar/functions/aliases.lunar
lunar/branches/stable/var/lib/lunar/functions/optimize.lunar
Log:
backport fix: new wrappers, adding gcc compiler path detection, remove reference to non-used core file, and 'aliases' now lives in $MOONBASE.
Modified: lunar/branches/stable/etc/lunar/config
===================================================================
--- lunar/branches/stable/etc/lunar/config 2005-08-21 20:46:54 UTC (rev 16191)
+++ lunar/branches/stable/etc/lunar/config 2005-08-21 20:47:02 UTC (rev 16192)
@@ -22,7 +22,6 @@
FUNCTIONS=/var/lib/lunar/functions
MENUS=/var/lib/lunar/menu
SUSTAINED=/var/lib/lunar/sustained
- ALIASES=/var/lib/lunar/aliases
PLUGIN_DIR=/var/lib/lunar/plugins
SOUND_DIRECTORY=/var/lib/lunar/sound
Modified: lunar/branches/stable/usr/share/doc/lunar/module-example/README
===================================================================
--- lunar/branches/stable/usr/share/doc/lunar/module-example/README 2005-08-21 20:46:54 UTC (rev 16191)
+++ lunar/branches/stable/usr/share/doc/lunar/module-example/README 2005-08-21 20:47:02 UTC (rev 16192)
@@ -70,10 +70,6 @@
Use this file if you need to tweak the compiles sources before it is
installed.
-* PRE_INSTALL
-
-This file lets you prepare the installation process for the package.
-
* POST_INSTALL
When you need to additionally tweak things after installation, this is
@@ -114,6 +110,8 @@
- xinetd.d - for xinetd service definitions
- init.d - for init.d startup scripts
- profile.d - for bash shell settings
+ - plugin.d - for lunar code plugins
+ - skel - for /etc/skel/ files
The file 'services' can be used to add tcp/ip or udp service port
Modified: lunar/branches/stable/var/lib/lunar/compilers/c++
===================================================================
--- lunar/branches/stable/var/lib/lunar/compilers/c++ 2005-08-21 20:46:54 UTC (rev 16191)
+++ lunar/branches/stable/var/lib/lunar/compilers/c++ 2005-08-21 20:47:02 UTC (rev 16192)
@@ -1,8 +1,8 @@
#!/bin/bash
if [ -n "$LUNAR_DEBUG" ] ; then
- echo "++ $CXX_EXT g++ $CCOPT \"$@\"" >&2
+ echo "++ $CXX_EXT ${COMPILER_PATH:-/usr/bin}/g++ $CCOPT \"$@\"" >&2
fi
-$CXX_EXT /usr/bin/g++ $CCOPT "$@"
+$CXX_EXT ${COMPILER_PATH:-/usr/bin}/g++ $CCOPT "$@"
Modified: lunar/branches/stable/var/lib/lunar/compilers/cc
===================================================================
--- lunar/branches/stable/var/lib/lunar/compilers/cc 2005-08-21 20:46:54 UTC (rev 16191)
+++ lunar/branches/stable/var/lib/lunar/compilers/cc 2005-08-21 20:47:02 UTC (rev 16192)
@@ -1,8 +1,8 @@
#!/bin/bash
if [ -n "$LUNAR_DEBUG" ] ; then
- echo "++ $CC_EXT gcc $COPT \"$@\"" >&2
+ echo "++ $CC_EXT ${COMPILER_PATH:-/usr/bin}/gcc $COPT \"$@\"" >&2
fi
-
-$CC_EXT /usr/bin/gcc $COPT "$@"
+
+$CC_EXT ${COMPILER_PATH:-/usr/bin}/gcc $COPT "$@"
Modified: lunar/branches/stable/var/lib/lunar/compilers/g++
===================================================================
--- lunar/branches/stable/var/lib/lunar/compilers/g++ 2005-08-21 20:46:54 UTC (rev 16191)
+++ lunar/branches/stable/var/lib/lunar/compilers/g++ 2005-08-21 20:47:02 UTC (rev 16192)
@@ -1,8 +1,8 @@
#!/bin/bash
if [ -n "$LUNAR_DEBUG" ] ; then
- echo "++ $CXX_EXT g++ $CCOPT \"$@\"" >&2
+ echo "++ $CXX_EXT ${COMPILER_PATH:-/usr/bin}/g++ $CCOPT \"$@\"" >&2
fi
-
-$CXX_EXT /usr/bin/g++ $CCOPT "$@"
+
+$CXX_EXT ${COMPILER_PATH:-/usr/bin}/g++ $CCOPT "$@"
Modified: lunar/branches/stable/var/lib/lunar/compilers/gcc
===================================================================
--- lunar/branches/stable/var/lib/lunar/compilers/gcc 2005-08-21 20:46:54 UTC (rev 16191)
+++ lunar/branches/stable/var/lib/lunar/compilers/gcc 2005-08-21 20:47:02 UTC (rev 16192)
@@ -1,8 +1,8 @@
#!/bin/bash
if [ -n "$LUNAR_DEBUG" ] ; then
- echo "++ $CC_EXT gcc $COPT \"$@\"" >&2
+ echo "++ $CC_EXT ${COMPILER_PATH:-/usr/bin}/gcc $COPT \"$@\"" >&2
fi
-
-$CC_EXT /usr/bin/gcc $COPT "$@"
+
+$CC_EXT ${COMPILER_PATH:-/usr/bin}/gcc $COPT "$@"
Modified: lunar/branches/stable/var/lib/lunar/compilers/make
===================================================================
--- lunar/branches/stable/var/lib/lunar/compilers/make 2005-08-21 20:46:54 UTC (rev 16191)
+++ lunar/branches/stable/var/lib/lunar/compilers/make 2005-08-21 20:47:02 UTC (rev 16192)
@@ -1,8 +1,8 @@
#!/bin/bash
if [ -n "$LUNAR_DEBUG" ] ; then
- echo "++ $MAKE_EXT make ${MAKES:+-j$MAKES} \"$@\"" >&2
+ echo "++ $MAKE_EXT ${MAKE_PATH:-/usr/bin}/make ${MAKES:+-j$MAKES} \"$@\"" >&2
fi
-$MAKE_EXT /usr/bin/make ${MAKES:+-j$MAKES} "$@"
+$MAKE_EXT ${MAKE_PATH:-/usr/bin}/make ${MAKES:+-j$MAKES} "$@"
Modified: lunar/branches/stable/var/lib/lunar/functions/aliases.lunar
===================================================================
--- lunar/branches/stable/var/lib/lunar/functions/aliases.lunar 2005-08-21 20:46:54 UTC (rev 16191)
+++ lunar/branches/stable/var/lib/lunar/functions/aliases.lunar 2005-08-21 20:47:02 UTC (rev 16192)
@@ -13,6 +13,14 @@
# and add it to the dependency chain if needed
unalias() {
local TARGET TARGETS TARGETBYNUM N CHOICE
+ # try to figure out where the aliases file is:
+ if [ -z "$ALIASES" -o ! -f "$ALIASES" ]; then
+ if [ -f "$MOONBASE/aliases" ] ; then
+ ALIASES="$MOONBASE/aliases"
+ else
+ ALIASES="/var/lib/lunar/aliases"
+ fi
+ fi
if [ "${1:0:1}" == "%" ] ; then
debug_msg "unalias($@)"
TARGETS=$(grep "^$1:" $ALIASES | cut -d: -f2-)
Modified: lunar/branches/stable/var/lib/lunar/functions/optimize.lunar
===================================================================
--- lunar/branches/stable/var/lib/lunar/functions/optimize.lunar 2005-08-21 20:46:54 UTC (rev 16191)
+++ lunar/branches/stable/var/lib/lunar/functions/optimize.lunar 2005-08-21 20:47:02 UTC (rev 16192)
@@ -743,8 +743,9 @@
;;
esac
- if [ "$(installed_version gcc | cut -d. -f1,2)" == "3.4" \
- -o "$(installed_version gcc | cut -d. -f1)" == "4" ] ; then
+ local GCC_REALVERSION=$(${COMPILER_PATH:-/usr/bin}/gcc --version | head -n 1 | awk '{print $3}')
+ if [ "$(echo $GCC_REALVERSION | cut -d. -f1,2)" == "3.4" \
+ -o "$(echo $GCC_REALVERSION | cut -d. -f1)" == "4" ] ; then
CFLAGS=$(echo $CFLAGS | sed 's:-mcpu:-mtune:')
CXXFLAGS=$(echo $CXXFLAGS | sed 's:-mcpu:-mtune:')
fi
More information about the Lunar-commits
mailing list