public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

PATH_DELIMITER added and some trailing whitespaces removed

Browse Source 
svn path=/nixpkgs/trunk/; revision=9320
This commit is contained in:
Marc Weber 2007-09-13 09:34:21 +00:00
parent 511519f031
commit 78587bf74b
1 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
pkgs/stdenv/generic/setup-new-2.sh
View File

@ -3,6 +3,12 @@ set -x
test -z $NIX_GCC && NIX_GCC=@gcc@ test -z $NIX_GCC && NIX_GCC=@gcc@
if [ -z ${system##*cygwin*} ]; then
PATH_DELIMITER=;
else
PATH_DELIMITER=;
fi
# Set up the initial path. # Set up the initial path.
PATH= PATH=
@ -40,7 +46,7 @@ if test -f $NIX_GCC/nix-support/setup-hook; then
source $NIX_GCC/nix-support/setup-hook source $NIX_GCC/nix-support/setup-hook
fi fi
# Ensure that the given directories exists. # Ensure that the given directories exists.
ensureDir() { ensureDir() {
local dir local dir
@ -92,13 +98,13 @@ findInputs()
return 0 return 0
;; ;;
esac esac
pkgs="$pkgs $pkg " pkgs="$pkgs $pkg "
if test -f $pkg/nix-support/setup-hook; then if test -f $pkg/nix-support/setup-hook; then
source $pkg/nix-support/setup-hook source $pkg/nix-support/setup-hook
fi fi
if test -f $pkg/nix-support/propagated-build-inputs; then if test -f $pkg/nix-support/propagated-build-inputs; then
for i in $(cat $pkg/nix-support/propagated-build-inputs); do for i in $(cat $pkg/nix-support/propagated-build-inputs); do
findInputs $i findInputs $i
@ -237,7 +243,7 @@ substitute() {
touch $sedScript touch $sedScript
local n p pattern replacement varName local n p pattern replacement varName
for ((n = 2; n < ${#params[*]}; n += 1)); do for ((n = 2; n < ${#params[*]}; n += 1)); do
p=${params[$n]} p=${params[$n]}
@ -283,7 +289,7 @@ substituteInPlace() {
substituteAll() { substituteAll() {
local input="$1" local input="$1"
local output="$2" local output="$2"
# Select all environment variables that start with a lowercase character. # Select all environment variables that start with a lowercase character.
for envVar in $(env | sed "s/^[^a-z].*//" | sed "s/^\([^=]*\)=.*/\1/"); do for envVar in $(env | sed "s/^[^a-z].*//" | sed "s/^\([^=]*\)=.*/\1/"); do
if test "$NIX_DEBUG" = "1"; then if test "$NIX_DEBUG" = "1"; then
@ -293,7 +299,7 @@ substituteAll() {
done done
substitute "$input" "$output" $args substitute "$input" "$output" $args
} }
###################################################################### ######################################################################
@ -616,7 +622,7 @@ buildW() {
fi fi
eval "$preBuild" eval "$preBuild"
echo "make flags: $makeFlags ${makeFlagsArray[@]} $buildFlags ${buildFlagsArray[@]}" echo "make flags: $makeFlags ${makeFlagsArray[@]} $buildFlags ${buildFlagsArray[@]}"
make \ make \
$makeFlags "${makeFlagsArray[@]}" \ $makeFlags "${makeFlagsArray[@]}" \
@ -732,7 +738,7 @@ fixupW() {
for d in $forceShare; do for d in $forceShare; do
if test -d "$prefix/$d"; then if test -d "$prefix/$d"; then
if test -d "$prefix/share/$d"; then if test -d "$prefix/share/$d"; then
echo "Both $d/ and share/$d/ exists!" echo "Both $d/ and share/$d/ exists!"
else else
echo Fixing location of $dir/ subdirectory echo Fixing location of $dir/ subdirectory
ensureDir $prefix/share ensureDir $prefix/share
@ -746,8 +752,8 @@ fixupW() {
fi fi
done; done;
fi fi
# TODO : strip _only_ ELF executables, and return || fail here... # TODO : strip _only_ ELF executables, and return || fail here...
if test -z "$dontStrip"; then if test -z "$dontStrip"; then
echo "Stripping debuging symbols from files in" echo "Stripping debuging symbols from files in"
@ -793,7 +799,7 @@ distW() {
fi fi
eval "$preDist" eval "$preDist"
if test -z "$distTarget"; then if test -z "$distTarget"; then
distTarget="dist" distTarget="dist"
fi fi
@ -846,7 +852,7 @@ genericBuild() {
dumpVars dumpVars
eval "$i" eval "$i"
done done
stopNest stopNest
} }