Package: src:python2.7
Version: 2.7.14-2
Please add mips r6 support to python2.7
--
YunQiang Su
diff --git a/debian/multiarch.h.in b/debian/multiarch.h.in
index 63c5f7f..33398b2 100644
--- a/debian/multiarch.h.in
+++ b/debian/multiarch.h.in
@@ -37,6 +37,26 @@
# include <ia64-linux-gnu/@subdir@/@header@>
# elif defined(__m68k__) && !defined(__mcoldfire__)
# include <m68k-linux-gnu/@subdir@/@header@>
+# elif defined(__mips_hard_float) && defined(__mips_isa_rev) &&
(__mips_isa_rev >=6) && defined(_MIPSEL)
+# if _MIPS_SIM == _ABIO32
+# include <mipsisa32r6el-linux-gnu/@subdir@/@header@>
+# elif _MIPS_SIM == _ABIN32
+# include <mipsisa64r6el-linux-gnuabin32/@subdir@/@header@>
+# elif _MIPS_SIM == _ABI64
+# include <mipsisa64r6el-linux-gnuabi64/@subdir@/@header@>
+# else
+# error unknown multiarch location for @header@
+# endif
+# elif defined(__mips_hard_float) && defined(__mips_isa_rev) &&
(__mips_isa_rev >=6)
+# if _MIPS_SIM == _ABIO32
+# include <mipsisa32r6-linux-gnu/@subdir@/@header@>
+# elif _MIPS_SIM == _ABIN32
+# include <mipsisa64r6-linux-gnuabin32/@subdir@/@header@>
+# elif _MIPS_SIM == _ABI64
+# include <mipsisa64r6-linux-gnuabi64/@subdir@/@header@>
+# else
+# error unknown multiarch location for @header@
+# endif
# elif defined(__mips_hard_float) && defined(_MIPSEL)
# if _MIPS_SIM == _ABIO32
# include <mipsel-linux-gnu/@subdir@/@header@>
diff --git a/debian/patches/mips-r6.diff b/debian/patches/mips-r6.diff
new file mode 100644
index 0000000..d4c3f11
--- /dev/null
+++ b/debian/patches/mips-r6.diff
@@ -0,0 +1,24 @@
+--- a/Modules/_ctypes/libffi/config.sub
++++ b/Modules/_ctypes/libffi/config.sub
+@@ -282,8 +282,10 @@ case $basic_machine in
+ | mips64vr5900 | mips64vr5900el \
+ | mipsisa32 | mipsisa32el \
+ | mipsisa32r2 | mipsisa32r2el \
++ | mipsisa32r6 | mipsisa32r6el \
+ | mipsisa64 | mipsisa64el \
+ | mipsisa64r2 | mipsisa64r2el \
++ | mipsisa64r6 | mipsisa64r6el \
+ | mipsisa64sb1 | mipsisa64sb1el \
+ | mipsisa64sr71k | mipsisa64sr71kel \
+ | mipsr5900 | mipsr5900el \
+@@ -400,8 +402,10 @@ case $basic_machine in
+ | mips64vr5900-* | mips64vr5900el-* \
+ | mipsisa32-* | mipsisa32el-* \
+ | mipsisa32r2-* | mipsisa32r2el-* \
++ | mipsisa32r6-* | mipsisa32r6el-* \
+ | mipsisa64-* | mipsisa64el-* \
+ | mipsisa64r2-* | mipsisa64r2el-* \
++ | mipsisa64r6-* | mipsisa64r6el-* \
+ | mipsisa64sb1-* | mipsisa64sb1el-* \
+ | mipsisa64sr71k-* | mipsisa64sr71kel-* \
+ | mipsr5900-* | mipsr5900el-* \
diff --git a/debian/patches/series.in b/debian/patches/series.in
index 3022086..063c7d6 100644
--- a/debian/patches/series.in
+++ b/debian/patches/series.in
@@ -28,7 +28,8 @@ statvfs-f_flag-constants.diff
plat-linux2_alpha.diff
#elif defined (arch_hppa)
plat-linux2_hppa.diff
-#elif defined (arch_mips) || defined(arch_mipsel) || defined (arch_mips64) ||
defined(arch_mips64el)
+#elif defined (arch_mips) || defined(arch_mipsel) || defined(arch_mipsn32) ||
defined(arch_mipsn32el) || defined (arch_mips64) || defined(arch_mips64el) \
+ || defined(arch_mipsr6) || defined(arch_mipsr6el) ||
defined(arch_mipsn32r6) || defined(arch_mipsn32r6el) || defined(arch_mips64r6)
|| defined(arch_mips64r6el)
plat-linux2_mips.diff
#elif defined (arch_sparc) || defined (arch_sparc64)
plat-linux2_sparc.diff
@@ -69,3 +70,4 @@ reproducible-buildinfo.diff
pydoc-use-pager.diff
issue27239.diff
rename-md5-init.diff
+mips-r6.diff
diff --git a/debian/rules b/debian/rules
index e81b1ff..db64de8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -48,7 +48,7 @@ ifneq (,$(filter $(DEB_HOST_ARCH), hurd-i386))
WITHOUT_BENCH := disabled on $(DEB_HOST_ARCH)
endif
ifeq ($(on_buildd),yes)
- ifneq (,$(findstring $(DEB_HOST_ARCH), hppa mips mipsel mipsn32 mipsn32el
mips64 mips64el s390))
+ ifneq (,$(findstring $(DEB_HOST_ARCH), hppa mips mipsel mipsn32 mipsn32el
mips64 mips64el mipsr6 mipsr6el mipsn32r6 mipsn32r6el mips64r6 mips64r6el s390))
WITHOUT_CHECK := yes
endif
endif
