Merge pull request #21368 from spacekitteh/patch-23

ncurses: Create ABI-version'd libtinfo
This commit is contained in:
Nikolay Amiantov 2016-12-26 01:54:59 +03:00 committed by GitHub
commit 921bdb7ad3

View file

@ -91,6 +91,9 @@ stdenv.mkDerivation rec {
if [ -e "$out/lib/lib''${library}$suffix.$dylibtype" ]; then
ln -svf lib''${library}$suffix.$dylibtype $out/lib/lib$library$newsuffix.$dylibtype
ln -svf lib''${library}$suffix.$dylibtype.${abiVersion} $out/lib/lib$library$newsuffix.$dylibtype.${abiVersion}
# make libtinfo symlinks
ln -svf lib''${library}$suffix.$dylibtype $out/lib/libtinfo$newsuffix.$dylibtype
ln -svf lib''${library}$suffix.$dylibtype.${abiVersion} $out/lib/libtinfo$newsuffix.$dylibtype.${abiVersion}
fi
done
for statictype in a dll.a la; do
@ -102,9 +105,6 @@ stdenv.mkDerivation rec {
done
done
# create libtinfo symlink
ln -svf $out/lib/libncurses.$dylibtype $out/libtinfo.$dylibtype
# move some utilities to $bin
# these programs are used at runtime and don't really belong in $dev
moveToOutput "bin/clear" "$out"