From: Peter Michael Green <plugwash@raspbian.org>
Date: Thu, 3 Feb 2022 19:12:16 +0000 (+0000)
Subject: Update raspbian patches for new upstream.
X-Git-Tag: archive/raspbian/4.13.1-3+rpi1~1
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=4cef70ad3f8b1b7009c8bfc419f6dbadbe14d8ea;p=ocaml.git

Update raspbian patches for new upstream.
---

diff --git a/debian/patches/remove-gitattributes-that-cause-problems.patch b/debian/patches/remove-gitattributes-that-cause-problems.patch
index c44c47af..bb544d2c 100644
--- a/debian/patches/remove-gitattributes-that-cause-problems.patch
+++ b/debian/patches/remove-gitattributes-that-cause-problems.patch
@@ -1,20 +1,15 @@
 From: Peter Michael Green <plugwash@raspbian.org>
-Date: Sat, 7 Dec 2019 05:28:18 +0000
-X-Dgit-Generated: 4.08.1-5+rpi1 4372289b19cfc4744b8e5c224da3b2f94ff5285d
 Subject: Remove gitattributes that cause problems for dgit.
 
-
----
-
-Index: tempdefuzz/.gitattributes
-===================================================================
---- tempdefuzz.orig/.gitattributes
-+++ tempdefuzz/.gitattributes
-@@ -140,7 +140,6 @@ menhir-bench.bash typo.missing-header ty
+diff --git a/.gitattributes b/.gitattributes
+index 956d2136..a278ffe0 100644
+--- a/.gitattributes
++++ b/.gitattributes
+@@ -151,7 +151,6 @@ menhir-bench.bash typo.missing-header typo.utf8
  *.check-program-output text eol=lf
  *.run text eol=lf
  
 -/tools/ci/appveyor/appveyor_build.cmd text eol=crlf
  
+ aclocal.m4 typo.tab
  configure.ac text eol=lf
- build-aux/compile text eol=lf
diff --git a/debian/patches/use-armv6-for-raspbian.patch b/debian/patches/use-armv6-for-raspbian.patch
index bc606390..8e3cc61f 100644
--- a/debian/patches/use-armv6-for-raspbian.patch
+++ b/debian/patches/use-armv6-for-raspbian.patch
@@ -1,14 +1,16 @@
 Description:  Edit configure.ac to select armv6 when using "arm-linux-gnueabihf"
 Author: Peter Michael Green <plugwash@raspbian.org>
 
---- ocaml-4.08.1.orig/configure.ac
-+++ ocaml-4.08.1/configure.ac
-@@ -871,7 +871,7 @@ AS_CASE([$host],
-   [armv5*-*-linux-gnueabi],
+diff --git a/configure.ac b/configure.ac
+index 9ac019f7..03f0fd95 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1092,7 +1092,7 @@ AS_CASE([$host],
+   [armv5*-*-linux-*eabi],
      [arch=arm; model=armv5; system=linux_eabi],
-   [arm*-*-linux-gnueabihf],
+   [arm*-*-linux-*eabihf],
 -    [arch=arm; system=linux_eabihf],
 +    [arch=arm; model=armv6; system=linux_eabihf],
-   [arm*-*-linux-gnueabi],
+   [arm*-*-linux-*eabi],
      [arch=arm; system=linux_eabi],
    [arm*-*-openbsd*],