From: Peter Michael Green <plugwash@raspbian.org>
Date: Tue, 10 Nov 2020 23:33:45 +0000 (+0000)
Subject: Commit Debian 3.0 (quilt) metadata
X-Git-Tag: archive/raspbian/1.5.3+dfsg-1+rpi1^0
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=7942eabd2c9126ab337aaa83b4d0747ecc8ec5df;p=julia.git

Commit Debian 3.0 (quilt) metadata

[dgit (9.12) quilt-fixup]
---

diff --git a/debian/patches/auto-1.5.3+dfsg-1+rpi1-6560d9b48ba5251b6466ef605eb79be05ed1b094-1605051192 b/debian/patches/auto-1.5.3+dfsg-1+rpi1-6560d9b48ba5251b6466ef605eb79be05ed1b094-1605051192
new file mode 100644
index 0000000..5d39072
--- /dev/null
+++ b/debian/patches/auto-1.5.3+dfsg-1+rpi1-6560d9b48ba5251b6466ef605eb79be05ed1b094-1605051192
@@ -0,0 +1,50 @@
+From: Peter Michael Green <plugwash@raspbian.org>
+Subject: Automatically generated patch (1.5.3+dfsg-1+rpi1)
+
+Last (up to) 3 git changes, FYI:
+
+commit 6560d9b48ba5251b6466ef605eb79be05ed1b094
+Author: Peter Michael Green <plugwash@raspbian.org>
+Date:   Tue Nov 10 22:53:39 2020 +0000
+
+    Apply upstream fix for build with llvm10 on arm.
+
+commit ccf4a2a18621bf37c0af188fe9ed0ea3f04539ef
+Merge: 1e9710e53f dd50c43f46
+Author: Peter Michael Green <plugwash@raspbian.org>
+Date:   Tue Nov 10 16:02:30 2020 +0000
+
+    Merge tag '1.5.3+dfsg-1' into bullseye-working
+    
+    Conflicts:
+            debian/changelog
+
+commit 1e9710e53f8bdd009672c7e5837cb9ff2cbddc3e
+Merge: 6c97d7060c 8531fef41a
+Author: Peter Michael Green <plugwash@raspbian.org>
+Date:   Tue Nov 10 08:01:24 2020 +0000
+
+    Manual merge of version 1.4.1+dfsg-1+rpi1 and 1.5.2+dfsg-2 to produce 1.5.2+dfsg-2+rpi1
+---
+
+--- julia-1.5.3+dfsg.orig/src/debuginfo.cpp
++++ julia-1.5.3+dfsg/src/debuginfo.cpp
+@@ -275,14 +275,17 @@ public:
+                 auto sName = section.getName();
+                 if (!sName)
+                     continue;
++                if (sName.get() != ".ARM.exidx") {
++                    continue;
++                }
+ #else
+                 StringRef sName;
+                 if (section.getName(sName))
+                     continue;
+-#endif
+                 if (sName != ".ARM.exidx") {
+                     continue;
+                 }
++#endif
+             }
+             uint64_t loadaddr = L.getSectionLoadAddress(section);
+             size_t seclen = section.getSize();
diff --git a/debian/patches/series b/debian/patches/series
index b38e555..07467e6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -25,3 +25,4 @@ test-skip-dns-ubuntu.patch
 mask-tests-1.2.0.patch
 arm64-openblas.patch
 add-libatomic.patch
+auto-1.5.3+dfsg-1+rpi1-6560d9b48ba5251b6466ef605eb79be05ed1b094-1605051192