From: Stephane Glondu <steph@glondu.net>
Date: Wed, 29 Jul 2020 14:23:47 +0000 (+0200)
Subject: Disable PIE on Debian Linux i386
X-Git-Tag: archive/raspbian/4.08.1-10+rpi1^2~13
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=3d61ab23d070c26b9be400a89371ace70022cc52;p=ocaml.git

Disable PIE on Debian Linux i386
---

diff --git a/debian/patches/0008-Disable-PIE-on-Debian-Linux-i386.patch b/debian/patches/0008-Disable-PIE-on-Debian-Linux-i386.patch
new file mode 100644
index 00000000..10ed66c7
--- /dev/null
+++ b/debian/patches/0008-Disable-PIE-on-Debian-Linux-i386.patch
@@ -0,0 +1,28 @@
+From: Stephane Glondu <steph@glondu.net>
+Date: Wed, 29 Jul 2020 16:22:39 +0200
+Subject: Disable PIE on Debian Linux i386
+
+Bug: https://github.com/ocaml/ocaml/issues/9800
+---
+ configure.ac | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/configure.ac b/configure.ac
+index 82172d7..1664ff4 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -952,6 +952,14 @@ AS_CASE(["$arch,$system"],
+   [power,netbsd], [profiling=true],
+   [profiling=false])
+ 
++# Disable PIE on Debian Linux i386
++# See https://github.com/ocaml/ocaml/issues/9800
++
++AS_CASE([$host],
++  [i686-pc-linux-gnu],
++    [common_cflags="-no-pie $common_cflags"],
++  [])
++
+ # Assembler
+ 
+ AS_CASE([$host],
diff --git a/debian/patches/series b/debian/patches/series
index 7bd239ed..3fa4667b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,4 @@
 0008-Reimplement-custom-without-hacks.patch
 0006-read_main_debug_info-do-not-die-in-custom-executable.patch
 0007-Avoid-duplicate-definitions-of-common-global-variabl.patch
+0008-Disable-PIE-on-Debian-Linux-i386.patch