glibc-multi: fix with multiple outputs

This commit is contained in:
Vladimír Čunát 2015-12-05 17:40:37 +01:00
parent e2f5ba1937
commit 244f985461

View file

@ -3,32 +3,26 @@
let let
nameVersion = builtins.parseDrvName glibc.name; nameVersion = builtins.parseDrvName glibc.name;
glibc64 = glibc;
in in
runCommand "${nameVersion.name}-multi-${nameVersion.version}" runCommand "${nameVersion.name}-multi-${nameVersion.version}"
{ inherit glibc32; { outputs = [ "dev" "out" "bin" ]; } # TODO: no static version here (yet)
glibc64 = glibc;
}
'' ''
mkdir -p $out mkdir -p "$out/lib"
ln -s $glibc64/* $out/ ln -s '${glibc64.out}'/lib/* "$out/lib"
ln -s '${glibc32.out}/lib' "$out/lib/32"
rm $out/lib $out/lib64 ln -s lib "$out/lib64"
mkdir -p $out/lib
ln -s $glibc64/lib/* $out/lib
ln -s $glibc32/lib $out/lib/32
ln -s lib $out/lib64
# fixing ldd RLTDLIST # fixing ldd RLTDLIST
rm $out/bin mkdir -p "$bin/bin"
cp -rs $glibc64/bin $out cp -s '${glibc64.bin}'/bin/* "$bin/bin/"
chmod u+w $out/bin rm "$bin/bin/ldd"
rm $out/bin/ldd
sed -e "s|^RTLDLIST=.*$|RTLDLIST=\"$out/lib/ld-linux-x86-64.so.2 $out/lib/32/ld-linux.so.2\"|g" \ sed -e "s|^RTLDLIST=.*$|RTLDLIST=\"$out/lib/ld-linux-x86-64.so.2 $out/lib/32/ld-linux.so.2\"|g" \
$glibc64/bin/ldd > $out/bin/ldd '${glibc64.bin}/bin/ldd' > "$bin/bin/ldd"
chmod 555 $out/bin/ldd chmod +x "$bin/bin/ldd"
rm $out/include mkdir "$dev"
cp -rs $glibc32/include $out cp -rs '${glibc32}'/include "$dev/"
chmod -R u+w $out/include chmod +w -R "$dev"
cp -rsf $glibc64/include $out cp -rsf '${glibc64}'/include "$dev/"
'' ''