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

Updating the gcc-wrapper with the changes done in trunk's gcc-wrapper2.

Browse Source 
Removing any reference to the gcc-wrapper2, as now the gcc-wrapper already conveys
the changes, I created gcc-wrapper2 in trunk for.


svn path=/nixpkgs/branches/stdenv-updates/; revision=18913
This commit is contained in:
Lluís Batlle i Rossell 2009-12-12 18:48:07 +00:00
parent dae3eb2383
commit 6bacb66dd3
2 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/build-support/gcc-wrapper/ld-wrapper.sh
View File

@ -81,6 +81,9 @@ if test "$NIX_DONT_SET_RPATH" != "1"; then
elif test "$p" = "-L"; then elif test "$p" = "-L"; then
addToLibPath ${p2} addToLibPath ${p2}
n=$((n + 1)) n=$((n + 1))
elif $(echo "$p" | grep -q '\.so\($\|\.\)'); then
path="$(dirname "$p")";
addToLibPath "${path}"
fi fi
n=$((n + 1)) n=$((n + 1))
done done
@ -113,6 +116,12 @@ if test "$NIX_DONT_SET_RPATH" != "1"; then
# I haven't seen `-l foo', but you never know... # I haven't seen `-l foo', but you never know...
addToRPath $i addToRPath $i
break break
elif $(echo "$p" | grep -q '\.so\($\|\.\)'); then
path="$(dirname "$p")";
if test "$path" == "$i"; then
addToRPath $i
break;
fi
fi fi
n=$((n + 1)) n=$((n + 1))
done done

20
pkgs/top-level/all-packages.nix
View File

@ -1807,7 +1807,6 @@ let
}); });
gcc44 = useFromStdenv "gcc" gcc44_real; gcc44 = useFromStdenv "gcc" gcc44_real;
gcc44_wrapper2 = wrapGCC2 gcc44.gcc;
gcc43 = lowPrio (wrapGCC (makeOverridable (import ../development/compilers/gcc-4.3) { gcc43 = lowPrio (wrapGCC (makeOverridable (import ../development/compilers/gcc-4.3) {
inherit stdenv fetchurl texinfo gmp mpfr noSysDirs; inherit stdenv fetchurl texinfo gmp mpfr noSysDirs;
@ -2283,7 +2282,6 @@ let
}; };
wrapGCC = wrapGCCWith (import ../build-support/gcc-wrapper) glibc; wrapGCC = wrapGCCWith (import ../build-support/gcc-wrapper) glibc;
wrapGCC2 = wrapGCCWith (import ../build-support/gcc-wrapper2) glibc;
wrapGCCCross = wrapGCCCross =
{gcc, libc, binutils, cross, shell ? "", name ? "gcc-cross-wrapper"}: {gcc, libc, binutils, cross, shell ? "", name ? "gcc-cross-wrapper"}:
@ -4357,8 +4355,7 @@ let
}; };
openal = import ../development/libraries/openal { openal = import ../development/libraries/openal {
inherit fetchurl cmake alsaLib; inherit fetchurl stdenv cmake alsaLib;
stdenv = overrideGCC stdenv gcc43_wrapper2;
}; };
# added because I hope that it has been easier to compile on x86 (for blender) # added because I hope that it has been easier to compile on x86 (for blender)
@ -6387,14 +6384,12 @@ let
}; };
autopanosiftc = import ../applications/graphics/autopanosiftc { autopanosiftc = import ../applications/graphics/autopanosiftc {
inherit fetchurl cmake libpng libtiff libjpeg panotools libxml2; inherit fetchurl stdenv cmake libpng libtiff libjpeg panotools libxml2;
stdenv = overrideGCC stdenv gcc43_wrapper2;
}; };
avidemux = import ../applications/video/avidemux { avidemux = import ../applications/video/avidemux {
inherit fetchurl cmake pkgconfig libxml2 qt4 gettext SDL libxslt x264 inherit fetchurl stdenv cmake pkgconfig libxml2 qt4 gettext SDL libxslt x264
alsaLib lame faac faad2 libvorbis; alsaLib lame faac faad2 libvorbis;
stdenv = overrideGCC stdenv gcc43_wrapper2;
inherit (gtkLibs) gtk; inherit (gtkLibs) gtk;
inherit (xlibs) libXv pixman libpthreadstubs libXau libXdmcp; inherit (xlibs) libXv pixman libpthreadstubs libXau libXdmcp;
}; };
@ -6925,8 +6920,7 @@ let
}; };
freepv = import ../applications/graphics/freepv { freepv = import ../applications/graphics/freepv {
inherit fetchurl mesa freeglut libjpeg zlib cmake libxml2 libpng; inherit fetchurl stdenv mesa freeglut libjpeg zlib cmake libxml2 libpng;
stdenv = overrideGCC stdenv gcc43_wrapper2;
inherit (xlibs) libX11 libXxf86vm; inherit (xlibs) libX11 libXxf86vm;
}; };
@ -7076,11 +7070,10 @@ let
}; };
hugin = import ../applications/graphics/hugin { hugin = import ../applications/graphics/hugin {
inherit fetchurl cmake panotools libtiff libpng boost pkgconfig inherit fetchurl stdenv cmake panotools libtiff libpng boost pkgconfig
exiv2 gettext ilmbase enblendenfuse autopanosiftc; exiv2 gettext ilmbase enblendenfuse autopanosiftc;
inherit wxGTK; inherit wxGTK;
openexr = openexr_1_6_1; openexr = openexr_1_6_1;
stdenv = overrideGCC stdenv gcc43_wrapper2;
}; };
i810switch = import ../applications/misc/i810 { i810switch = import ../applications/misc/i810 {
@ -7443,8 +7436,7 @@ let
}; };
paraview = import ../applications/graphics/paraview { paraview = import ../applications/graphics/paraview {
inherit fetchurl cmake qt4; inherit fetchurl stdenv cmake qt4;
stdenv = overrideGCC stdenv gcc43_wrapper2;
}; };
partitionManager = import ../tools/misc/partition-manager { partitionManager = import ../tools/misc/partition-manager {