zsh/pth/zsync: cross fixes (#65780)

zsh/pth/zsync: cross fixes
This commit is contained in:
Jörg Thalheim 2019-08-14 07:15:01 +01:00 committed by GitHub
commit cf5f02b4bb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 4 deletions

View File

@ -10,6 +10,8 @@ stdenv.mkDerivation rec {
preConfigure = stdenv.lib.optionalString stdenv.isAarch32 '' preConfigure = stdenv.lib.optionalString stdenv.isAarch32 ''
configureFlagsArray=("CFLAGS=-DJB_SP=8 -DJB_PC=9") configureFlagsArray=("CFLAGS=-DJB_SP=8 -DJB_PC=9")
'' + stdenv.lib.optionalString (stdenv.hostPlatform.libc == "glibc") ''
configureFlagsArray+=("ac_cv_check_sjlj=ssjlj")
''; '';
meta = with stdenv.lib; { meta = with stdenv.lib; {
@ -17,6 +19,5 @@ stdenv.mkDerivation rec {
homepage = https://www.gnu.org/software/pth; homepage = https://www.gnu.org/software/pth;
license = licenses.lgpl21Plus; license = licenses.lgpl21Plus;
platforms = platforms.all; platforms = platforms.all;
broken = stdenv.hostPlatform != stdenv.buildPlatform && stdenv.hostPlatform.isAarch64;
}; };
} }

View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, ncurses, pcre }: { stdenv, fetchurl, ncurses, pcre, buildPackages }:
let let
version = "5.7.1"; version = "5.7.1";
@ -7,7 +7,6 @@ let
url = "mirror://sourceforge/zsh/zsh-${version}-doc.tar.xz"; url = "mirror://sourceforge/zsh/zsh-${version}-doc.tar.xz";
sha256 = "1d1r88n1gfdavx4zy3svl1gljrvzim17jb2r834hafg2a016flrh"; sha256 = "1d1r88n1gfdavx4zy3svl1gljrvzim17jb2r834hafg2a016flrh";
}; };
in in
stdenv.mkDerivation { stdenv.mkDerivation {
@ -61,7 +60,11 @@ else
fi fi
fi fi
EOF EOF
$out/bin/zsh -c "zcompile $out/etc/zprofile" ${if stdenv.hostPlatform == stdenv.buildPlatform then ''
$out/bin/zsh -c "zcompile $out/etc/zprofile"
'' else ''
${stdenv.lib.getBin buildPackages.zsh}/bin/zsh -c "zcompile $out/etc/zprofile"
''}
mv $out/etc/zprofile $out/etc/zprofile_zwc_is_used mv $out/etc/zprofile $out/etc/zprofile_zwc_is_used
''; '';
# XXX: patch zsh to take zwc if newer _or equal_ # XXX: patch zsh to take zwc if newer _or equal_

View File

@ -8,6 +8,8 @@ stdenv.mkDerivation rec {
sha256 = "1wjslvfy76szf0mgg2i9y9q30858xyjn6v2acc24zal76d1m778b"; sha256 = "1wjslvfy76szf0mgg2i9y9q30858xyjn6v2acc24zal76d1m778b";
}; };
makeFlags = [ "AR=${stdenv.cc.bintools.targetPrefix}ar" ];
meta = { meta = {
homepage = http://zsync.moria.org.uk/; homepage = http://zsync.moria.org.uk/;
description = "File distribution system using the rsync algorithm"; description = "File distribution system using the rsync algorithm";