From: Stephane Glondu <steph@glondu.net>
Date: Thu, 30 Jul 2020 09:23:56 +0000 (+0200)
Subject: Revert "Disable PIE on Debian Linux i386"
X-Git-Tag: archive/raspbian/4.08.1-10+rpi1^2~12
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=775a8c8ac2d1012ce160104548782e4655fd0fde;p=ocaml.git

Revert "Disable PIE on Debian Linux i386"

This reverts commit 631ee1abf69f76cd8ce8c5205537dc1cb7043fd5.
---

diff --git a/debian/patches/0008-Disable-PIE-on-Debian-Linux-i386.patch b/debian/patches/0008-Disable-PIE-on-Debian-Linux-i386.patch
deleted file mode 100644
index 10ed66c7..00000000
--- a/debian/patches/0008-Disable-PIE-on-Debian-Linux-i386.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-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 3fa4667b..7bd239ed 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,4 +5,3 @@
 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