rpms
/
python3.5
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Compare commits

merge into: rpms:master
Branches Tags
rpms:master
rpms:master-riscv64
...
pull from: rpms:master-riscv64
Branches Tags
rpms:master-riscv64
rpms:master

3 Commits
master ... master-ris

Author SHA1 Message Date
David Abdurachmanov 6523bbe976
Bump release 
Signed-off-by: David Abdurachmanov <david.abdurachmanov@sifive.com>
 2020-06-02 07:00:51 +03:00
David Abdurachmanov 5927a89d1c
Add riscv triplet detection 
Signed-off-by: David Abdurachmanov <david.abdurachmanov@sifive.com>
 2020-06-02 06:48:19 +03:00
David Abdurachmanov 4eba03b102
Disable test_ctypes test on riscv64 
Ran 60 tests in 8.936s
OK (skipped=1)
373 tests OK.
1 test failed:
    test_ctypes
24 tests skipped:
    test_curses test_devpoll test_gdb test_ioctl test_kqueue
    test_msilib test_nis test_ossaudiodev test_pep277 test_smtpnet
    test_socketserver test_startfile test_systemtap test_timeout
    test_tix test_tk test_ttk_guionly test_unicode_file
    test_urllib2net test_urllibnet test_winreg test_winsound
    test_xmlrpc_net test_zipfile64
Tests result: FAILURE
error: Bad exit status from /var/tmp/rpm-tmp.9N1ERM (%check)

Signed-off-by: David Abdurachmanov <david.abdurachmanov@sifive.com>
 2020-06-01 18:40:48 +03:00
2 changed files with 28 additions and 2 deletions
Show Stats Expand all files Collapse all files

19
Python-3.5.9-riscv-triplets.patch Normal file
View File

@ -0,0 +1,19 @@
diff --git a/configure.ac b/configure.ac
index 6c7813b..d1611da 100644
--- a/configure.ac
+++ b/configure.ac
@@ -840,6 +840,14 @@ cat >> conftest.c <<EOF
sparc64-linux-gnu
# elif defined(__sparc__)
sparc-linux-gnu
+# elif defined(__riscv)
+# if __riscv_xlen == 32
+ riscv32-linux-gnu
+# elif __riscv_xlen == 64
+ riscv64-linux-gnu
+# else
+# error unknown platform triplet
+# endif
# else
# error unknown platform triplet
# endif

11
python3.5.spec
View File

@ -87,7 +87,7 @@ URL: https://www.python.org/
#global prerel ...
%global upstream_version %{general_version}%{?prerel}
Version: %{general_version}%{?prerel:~%{prerel}}
Release: 5%{?dist}
Release: 5.1.riscv64%{?dist}
License: Python
# Whether to use RPM build wheels from the python-{pip,setuptools}-wheel package
@ -440,6 +440,8 @@ Patch348: 00348-always-disable-lchmod.patch
# it should be ppc64le-linux-gnu/ppc64-linux-gnu instead powerpc64le-linux-gnu/powerpc64-linux-gnu
Patch5001: python3-powerppc-arch.patch
# Add riscv64-linux-gnu to the triplet detection
Patch6000: Python-3.5.9-riscv-triplets.patch
# ======================================================
# Additional metadata, and subpackages
@ -566,6 +568,8 @@ sed --in-place \
%patch5001 -p1
%patch6000 -p1
# ======================================================
# Configuring and building the code:
# ======================================================
@ -980,7 +984,7 @@ CheckPython() {
%ifarch ppc64le aarch64
-x test_faulthandler \
%endif
%ifarch %{mips64}
%ifarch %{mips64} riscv64
-x test_ctypes \
%endif
%ifarch %{power64} s390 s390x armv7hl aarch64 %{mips}
@ -1069,6 +1073,9 @@ CheckPython optimized
# ======================================================
%changelog
* Mon Jun 01 2020 David Abdurachmanov <david.abdurachmanov@sifive.com> - 3.5.9-5.1.riscv64
- Disable test_ctypes test on riscv64
* Wed May 06 2020 Miro Hrončok <mhroncok@redhat.com> - 3.5.9-5
- Rename from python35 to python3.5