mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-22 13:41:26 +00:00
Code Issues Wiki Activity

gcc5: split $doc into $man and $info

Browse source 
... because cc-wrapper is meant to propagate man pages into user envs,
and info pages are rather large.

Also replace the duplicate g++ and gcc man1 pages by a symlink.
This commit is contained in:
Vladimír Čunát 2015-10-25 11:38:07 +01:00
parent 55d129609d
commit efcad4c910
3 changed files with 12 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkgs/build-support/cc-wrapper/default.nix
View file

@ -140,7 +140,7 @@ stdenv.mkDerivation {
# Propagate the wrapped cc so that if you install the wrapper,
# you get tools like gcov, the manpages, etc. as well (including
# for binutils and Glibc).
echo ${cc} ${binutils_bin} ${libc_bin} > $out/nix-support/propagated-user-env-packages
echo ${cc} ${cc.man or ""} ${binutils_bin} ${libc_bin} > $out/nix-support/propagated-user-env-packages
echo ${toString extraPackages} > $out/nix-support/propagated-native-build-inputs
''

2
pkgs/development/compilers/gcc/5/default.nix
View file

@ -215,7 +215,7 @@ stdenv.mkDerivation ({
inherit patches;
outputs = [ "out" "lib" "doc" ];
outputs = [ "out" "lib" "man" "info" ];
setOutputFlags = false;
NIX_NO_SELF_RPATH = true;

19
pkgs/development/compilers/gcc/builder.sh
View file

@ -211,16 +211,14 @@ preInstall() {
postInstall() {
# Move runtime libraries to $lib.
mkdir -p $lib/lib
ln -s lib $lib/lib64
mv -v $out/lib/lib*.so $out/lib/lib*.so.*[0-9] $out/lib/*.la $lib/lib/
for i in $lib/lib/*.la; do
substituteInPlace $i --replace $out $lib
done
_moveToOutput "lib/lib*.so*" "$lib"
_moveToOutput "lib/lib*.la" "$lib"
ln -s lib "$lib/lib64" # for *.la
_moveToOutput "share/gcc-*/python" "$lib"
# Remove precompiled headers for now. They are very big and
# probably not very useful yet.
find $out/include -name "*.gch" -exec rm -rf {} \; -prune
for i in "$lib"/lib/*.{la,py}; do
substituteInPlace "$i" --replace "$out" "$lib"
done
# Remove `fixincl' to prevent a retained dependency on the
# previous gcc.
@ -266,6 +264,9 @@ postInstall() {
paxmark r $out/libexec/gcc/*/*/{cc1,cc1plus}
eval "$postInstallGhdl"
# Two identical man pages are shipped (moving and compressing is done later)
ln -sf gcc.1 "$out"/share/man/man1/g++.1
}
genericBuild