Merge pull request #25981 from rimmington/cython-arm-pr

cython: build on 32-bit ARM
This commit is contained in:
Frederik Rietdijk 2017-05-22 09:16:08 +02:00 committed by GitHub
commit 64a924a96b

View File

@ -4253,11 +4253,11 @@ in {
sha256 = "01h3lrf6d98j07iakifi81qjszh6faa37ibx7ylva1vsqbwx2hgi"; sha256 = "01h3lrf6d98j07iakifi81qjszh6faa37ibx7ylva1vsqbwx2hgi";
}; };
# On i686-linux and Python 2.x this test fails because the result is "3L" # With Python 2.x on i686-linux or 32-bit ARM this test fails because the
# instead of "3", so let's fix it in-place. # result is "3L" instead of "3", so let's fix it in-place.
# #
# Upstream issue: https://github.com/cython/cython/issues/1548 # Upstream issue: https://github.com/cython/cython/issues/1548
postPatch = optionalString (stdenv.isi686 && !isPy3k) '' postPatch = optionalString ((stdenv.isi686 || stdenv.isArm) && !isPy3k) ''
sed -i -e 's/\(>>> *\)\(verify_resolution_GH1533()\)/\1int(\2)/' \ sed -i -e 's/\(>>> *\)\(verify_resolution_GH1533()\)/\1int(\2)/' \
tests/run/cpdef_enums.pyx tests/run/cpdef_enums.pyx
''; '';