Import pypy (7.2.0+dfsg-1)debian/7.2.0+dfsg-1debian

1 files changed, 24 insertions, 0 deletions

diff --git a/debian/patches/fpic-archs b/debian/patches/fpic-archs
new file mode 100644
index 0000000..0acf102
--- /dev/null
+++ b/debian/patches/fpic-archs
@@ -0,0 +1,24 @@
+From: Stefano Rivera <stefanor@debian.org>
+Date: Sat, 7 Oct 2017 09:38:57 +0200
+Subject: x32 requires -fPIC
+
+x32 detection is currently Debian-specific.
+---
+ rpython/translator/platform/__init__.py | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/rpython/translator/platform/__init__.py b/rpython/translator/platform/__init__.py
+index 1833a95..4f6879e 100644
+--- a/rpython/translator/platform/__init__.py
++++ b/rpython/translator/platform/__init__.py
+@@ -265,7 +265,9 @@ if sys.platform.startswith('linux'):
+     # detect armhf without shelling out
+     if (platform.architecture()[0] == '64bit'
+             or platform.machine().startswith(
+-                ('arm', 'm68k', 'mips', 'parisc', 'ppc', 'sh4'))):
++                ('arm', 'm68k', 'mips', 'parisc', 'ppc', 'sh4'))
++            or getattr(getattr(sys, 'implementation', sys), '_multiarch',
++                       None) == 'x86_64-linux-gnux32'):
+         host_factory = LinuxPIC
+     else:
+         host_factory = Linux