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

* Merged most of the stdenv-updates branch. Some stuff didn't

Browse Source 
merge cleanly right away (kde-4, kernel stuff) so it should be
  merged later.  But the stdenv stuff is all there.

svn path=/nixpkgs/branches/stdenv-updates-merge/; revision=10793
This commit is contained in:
Eelco Dolstra
2008-02-20 23:02:41 +00:00
parent 3a49502530 0032a3245e f4eda0eb22 0b2d493521 a4512a4a49 2ca177e6ae 81429b0ac2 b37f504680 8ea549b319 805424e33f dd184fa88d 9e0a642955 f516036cbb 71353ce929 bcb28f63a0 f5bf68f9a8
commit e12b421add
211 changed files with 1399 additions and 4020 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/tools/build-managers/cmake/setup-hook.sh
+27 -26
View File
@@ -1,48 +1,49 @@
addCMakeParamsInclude()
{
if [ -d $1/include ]; then
export CMAKE_INCLUDE_PATH="${CMAKE_INCLUDE_PATH}${CMAKE_INCLUDE_PATH:+:}$1/include"
fi
addToSearchPath CMAKE_INCLUDE_PATH /include "" $1
}
addCMakeParamsLibs()
{
if [ -d $1/lib ]; then
export CMAKE_LIBRARY_PATH="${CMAKE_LIBRARY_PATH}${CMAKE_LIBRARY_PATH:+:}$1/lib"
fi
addToSearchPath CMAKE_LIBRARY_PATH /lib "" $1
}
addCMakeModulePath()
{
addToSearchPath CMAKE_MODULE_PATH /share/cmake-2.4/Modules "" $1
}
fixCmakeFiles()
{
local replaceArgs;
echo "Fixing cmake files"
replaceArgs="-e -f -L -T /usr /FOO"
replaceArgs="${replaceArgs} -a NO_DEFAULT_PATH \"\" -a NO_SYSTEM_PATH \"\""
find $1 -type f -name "*.cmake" | xargs replace-literal ${replaceArgs}
local replaceArgs;
echo "Fixing cmake files"
replaceArgs="-e -f -L -T /usr /FOO"
replaceArgs="${replaceArgs} -a NO_DEFAULT_PATH \"\" -a NO_SYSTEM_PATH \"\""
find $1 -type f -name "*.cmake" | xargs replace-literal ${replaceArgs}
}
cmakePostUnpack()
{
sourceRoot=$sourceRoot/build
mkdir -v $sourceRoot
echo source root reset to $sourceRoot
sourceRoot=$sourceRoot/build
mkdir -v $sourceRoot
echo source root reset to $sourceRoot
if [ -z "$dontFixCmake" ]; then
fixCmakeFiles .
fi
if [ -z "$dontFixCmake" ]; then
fixCmakeFiles .
fi
if [ -z "$configureScript" ]; then
configureScript="cmake .."
fi
if [ -z "$dontAddPrefix" ]; then
dontAddPrefix=1
configureFlags="-DCMAKE_INSTALL_PREFIX=$out $configureFlags"
fi
if [ -z "$configureScript" ]; then
configureScript="cmake .."
fi
if [ -z "$dontAddPrefix" ]; then
dontAddPrefix=1
configureFlags="-DCMAKE_INSTALL_PREFIX=$out $configureFlags"
fi
}
if [ -z "$noCmakeTewaks" ]; then
postUnpack="cmakePostUnpack${postUnpack:+; }${postUnpack}"
postUnpack="cmakePostUnpack${postUnpack:+; }${postUnpack}"
fi;
envHooks=(${envHooks[@]} addCMakeParamsInclude addCMakeParamsLibs)
envHooks=(${envHooks[@]} addCMakeParamsInclude addCMakeParamsLibs addCMakeModulePath)
pkgs/development/tools/build-managers/gnumake/log.patch
+14 -13
View File
@@ -1,6 +1,6 @@
diff -rc make-orig/job.c make-3.81/job.c
*** make-orig/job.c 2006-03-20 04:03:04.000000000 +0100
--- make-3.81/job.c 2006-06-21 17:31:52.000000000 +0200
diff -rc make-3.81-orig/job.c make-3.81/job.c
*** make-3.81-orig/job.c 2006-03-20 04:03:04.000000000 +0100
--- make-3.81/job.c 2008-02-20 17:41:25.000000000 +0100
***************
*** 1083,1089 ****
appear. */
@@ -18,9 +18,9 @@ diff -rc make-orig/job.c make-3.81/job.c
/* Tell update_goal_chain that a command has been started on behalf of
this target. It is important that this happens here and not in
diff -rc make-orig/main.c make-3.81/main.c
*** make-orig/main.c 2006-03-20 03:36:37.000000000 +0100
--- make-3.81/main.c 2006-06-21 17:48:43.000000000 +0200
diff -rc make-3.81-orig/main.c make-3.81/main.c
*** make-3.81-orig/main.c 2006-03-20 03:36:37.000000000 +0100
--- make-3.81/main.c 2008-02-20 17:41:25.000000000 +0100
***************
*** 886,891 ****
--- 886,900 ----
@@ -83,9 +83,9 @@ diff -rc make-orig/main.c make-3.81/main.c
+
+ int logNestingStdout = 0;
+ int logNestingStderr = 0;
diff -rc make-orig/make.h make-3.81/make.h
*** make-orig/make.h 2006-02-16 00:54:43.000000000 +0100
--- make-3.81/make.h 2006-06-21 17:39:35.000000000 +0200
diff -rc make-3.81-orig/make.h make-3.81/make.h
*** make-3.81-orig/make.h 2006-02-16 00:54:43.000000000 +0100
--- make-3.81/make.h 2008-02-20 17:41:25.000000000 +0100
***************
*** 609,611 ****
--- 609,613 ----
@@ -94,15 +94,16 @@ diff -rc make-orig/make.h make-3.81/make.h
+ extern int logNestingStdout;
+ extern int logNestingStderr;
diff -rc make-orig/remake.c make-3.81/remake.c
*** make-orig/remake.c 2006-03-20 03:36:37.000000000 +0100
--- make-3.81/remake.c 2006-06-21 17:31:52.000000000 +0200
diff -rc make-3.81-orig/remake.c make-3.81/remake.c
*** make-3.81-orig/remake.c 2006-03-20 03:36:37.000000000 +0100
--- make-3.81/remake.c 2008-02-20 17:44:01.000000000 +0100
***************
*** 1120,1126 ****
--- 1120,1130 ----
--- 1120,1131 ----
/* The normal case: start some commands. */
if (!touch_flag || file->cmds->any_recurse)
{
+ log_working_directory (1);
+ fprintf(stderr, "\e[pbuilding %s\n", file->name);
+ logNestingStderr++;
execute_file_commands (file);