f3c23487a2
stdenv. In this gcc-wrapper2 I made the ld-wrapper.sh to handle the linking with shared objects through direct pass as ld command arguments of the absolute path to shared objects, instead of using the -L/-l combinations. cmake 'FindXXX.cmake' modules make a strong usage of the dynamic linking directly passing the absolute path to the shared object to the linker, and as our wrapper did not add any -rpath for those, writting the nix expressions for some cmake packages resulted in a lot of tricks, compared to using this gcc-wrapper2. This gcc-wrapper2/ld-wrapper.sh should become the gcc-wrapper/ld-wrapper in a stdenv update. I also updated some cmake expressions to use this gcc-wrapper2, and reduced its tricks. I also updated the cmake setup-hook for it to make cmake not touch any rpath decided at build time, when running the 'make install' of makefiles created by cmake. svn path=/nixpkgs/trunk/; revision=18885
50 lines
1.2 KiB
Bash
Executable file
50 lines
1.2 KiB
Bash
Executable file
addCMakeParams()
|
|
{
|
|
addToSearchPath CMAKE_INCLUDE_PATH $1/include
|
|
addToSearchPath CMAKE_LIBRARY_PATH $1/lib
|
|
addToSearchPath CMAKE_MODULE_PATH $1/share/cmake-@majorVersion@/Modules
|
|
}
|
|
|
|
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" -print0 | xargs -0 replace-literal ${replaceArgs}
|
|
}
|
|
|
|
cmakeConfigurePhase()
|
|
{
|
|
eval "$preConfigure"
|
|
|
|
if test -z "$dontFixCmake"; then
|
|
fixCmakeFiles .
|
|
fi
|
|
|
|
if test -z "$dontUseCmakeBuildDir"; then
|
|
mkdir -p build
|
|
cd build
|
|
cmakeDir=..
|
|
fi
|
|
|
|
if test -z "$dontAddPrefix"; then
|
|
cmakeFlags="-DCMAKE_INSTALL_PREFIX=$prefix $cmakeFlags"
|
|
fi
|
|
|
|
# Avoid cmake resetting the rpath of binaries, on make install
|
|
cmakeFlags="-DCMAKE_SKIP_BUILD_RPATH=ON $cmakeFlags"
|
|
|
|
echo "cmake flags: $cmakeFlags ${cmakeFlagsArray[@]}"
|
|
|
|
cmake ${cmakeDir:-.} $cmakeFlags ${cmakeFlagsArray[@]}
|
|
|
|
eval "$postConfigure"
|
|
}
|
|
|
|
if test -z "$dontUseCmakeConfigure"; then
|
|
configurePhase=cmakeConfigurePhase
|
|
fi
|
|
|
|
envHooks=(${envHooks[@]} addCMakeParams)
|