Adding a new version of the gcc-wrapper, named gcc-wrapper2, in order not to rebuild

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
This commit is contained in:
Lluís Batlle i Rossell
2009-12-10 22:19:52 +00:00
parent 164eb9c699
commit f3c23487a2
16 changed files with 606 additions and 136 deletions
@@ -1,35 +1,15 @@
{ fetchurl, stdenv, cmake, qt4 }:
stdenv.mkDerivation {
name = "paraview-3.4.0";
name = "paraview-3.6.1";
src = fetchurl {
url = http://www.paraview.org/files/v3.4/paraview-3.4.0.tar.gz;
sha256 = "27544f442e957e9aa60b32c674f2dcd84fffeecc9a40071ef6e305333413187d";
url = http://www.paraview.org/files/v3.6/paraview-3.6.1.tar.gz;
sha256 = "1dh0dqbdvjagy122nbwr1gg03ck2if2aqqbvzcpkx38sz12cjh7h";
};
patches = [ ./include-qobject.patch ];
# I added these flags to get all the rpaths right, which I guess they are
# taken from the qt4 sources. Not very nice.
cmakeFlags = "-DCMAKE_SHARED_LINKER_FLAGS=\"-Wl,-rpath,$out/lib/paraview-3.4\"" +
" -DCMAKE_EXE_LINKER_FLAGS=\"-Wl,-rpath,$out/lib/paraview-3.4" +
" -lpng12 -lSM -lICE -lXrender -lXrandr -lXcursor -lXinerama" +
" -lXfixes -lfreetype -lfontconfig -lXext -lX11 -lssl -lXt -lz\"" +
" -DCMAKE_SKIP_BUILD_RPATH=ON" +
" -DCMAKE_BUILD_TYPE=Release" +
" -DCMAKE_INSTALL_PREFIX=$out";
dontUseCmakeConfigure = true;
# I rewrote the configure phase to get the $out references evaluated in
# cmakeFlags
configurePhase = ''
set -x
mkdir -p build;
cd build
eval -- "cmake .. $cmakeFlags"
set +x
'';
preConfigure = ''
export NIX_LDFLAGS="$NIX_LDFLAGS -rpath $out/lib/paraview-3.6"
'';
buildInputs = [ cmake qt4 ];