diff -Nru julia-1.5.3+dfsg/debian/changelog julia-1.5.3+dfsg/debian/changelog --- julia-1.5.3+dfsg/debian/changelog 2020-11-12 09:50:14.000000000 +0000 +++ julia-1.5.3+dfsg/debian/changelog 2020-11-17 15:46:22.000000000 +0000 @@ -1,3 +1,19 @@ +julia (1.5.3+dfsg-2+rpi1) bullseye-staging; urgency=medium + + [changes brought forward from 1.0.3+dfsg-4+rpi1 by Peter Michael Green at Sat, 02 Mar 2019 23:41:50 +0000] + * Set julia target option for raspbian. + * Build with -latomic + + [changes introduced in 1.4.1+dfsg-1+rpi1 by Peter Michael green] + * Disable testsuite. + * Upload package despite armv7 contamination check fail in + libopenblas64_.so I think it's probablly a false positive. + + [changes introduced in 1.5.3+dfsg-1+rpi1 by Peter Michael Green] + * Apply upstream fix for build with llvm 10 on arm. + + -- Raspbian forward porter Tue, 17 Nov 2020 15:46:22 +0000 + julia (1.5.3+dfsg-2) unstable; urgency=medium * Include upstream patch to fix compilation on arm (Closes: #928131) diff -Nru julia-1.5.3+dfsg/debian/patches/add-libatomic.patch julia-1.5.3+dfsg/debian/patches/add-libatomic.patch --- julia-1.5.3+dfsg/debian/patches/add-libatomic.patch 1970-01-01 00:00:00.000000000 +0000 +++ julia-1.5.3+dfsg/debian/patches/add-libatomic.patch 2020-11-17 15:46:22.000000000 +0000 @@ -0,0 +1,15 @@ +Description: Build with -latomic +Author: Peter Michael Green +Last-Update: 2019-12-22 + +--- julia-1.3.0+dfsg.orig/Make.inc ++++ julia-1.3.0+dfsg/Make.inc +@@ -1082,7 +1082,7 @@ else ifneq ($(USEMSVC), 1) + endif + + ifeq ($(OS), Linux) +-OSLIBS += -Wl,--no-as-needed -ldl -lrt -lpthread -Wl,--export-dynamic,--as-needed,--no-whole-archive ++OSLIBS += -Wl,--no-as-needed -ldl -lrt -lpthread -Wl,--export-dynamic,--as-needed,--no-whole-archive -latomic + # Detect if ifunc is supported + IFUNC_DETECT_SRC := 'void (*f0(void))(void) { return (void(*)(void))0L; }; void f(void) __attribute__((ifunc("f0")));' + ifeq (supported, $(shell echo $(IFUNC_DETECT_SRC) | $(CC) -Werror -x c - -S -o /dev/null > /dev/null 2>&1 && echo supported)) diff -Nru julia-1.5.3+dfsg/debian/patches/auto-1.5.3+dfsg-1+rpi1-6560d9b48ba5251b6466ef605eb79be05ed1b094-1605051192 julia-1.5.3+dfsg/debian/patches/auto-1.5.3+dfsg-1+rpi1-6560d9b48ba5251b6466ef605eb79be05ed1b094-1605051192 --- julia-1.5.3+dfsg/debian/patches/auto-1.5.3+dfsg-1+rpi1-6560d9b48ba5251b6466ef605eb79be05ed1b094-1605051192 1970-01-01 00:00:00.000000000 +0000 +++ julia-1.5.3+dfsg/debian/patches/auto-1.5.3+dfsg-1+rpi1-6560d9b48ba5251b6466ef605eb79be05ed1b094-1605051192 2020-11-17 15:46:22.000000000 +0000 @@ -0,0 +1,50 @@ +From: Peter Michael Green +Subject: Automatically generated patch (1.5.3+dfsg-1+rpi1) + +Last (up to) 3 git changes, FYI: + +commit 6560d9b48ba5251b6466ef605eb79be05ed1b094 +Author: Peter Michael Green +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 +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 +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 -Nru julia-1.5.3+dfsg/debian/patches/fix-llvm10-arm.patch julia-1.5.3+dfsg/debian/patches/fix-llvm10-arm.patch --- julia-1.5.3+dfsg/debian/patches/fix-llvm10-arm.patch 1970-01-01 00:00:00.000000000 +0000 +++ julia-1.5.3+dfsg/debian/patches/fix-llvm10-arm.patch 2020-11-17 15:46:22.000000000 +0000 @@ -0,0 +1,29 @@ +commit 971e769479a2947a55cc253dc9750fd2a361367a +Author: Yichao Yu +Date: Fri Jul 17 00:26:39 2020 -0400 + + Fix C++ code compilation on ARM with LLVM10 (#36674) + +diff --git a/src/debuginfo.cpp b/src/debuginfo.cpp +index a03b7447fa..46edf285d3 100644 +--- a/src/debuginfo.cpp ++++ b/src/debuginfo.cpp +@@ -243,14 +243,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 -Nru julia-1.5.3+dfsg/debian/patches/series julia-1.5.3+dfsg/debian/patches/series --- julia-1.5.3+dfsg/debian/patches/series 2020-11-12 09:50:14.000000000 +0000 +++ julia-1.5.3+dfsg/debian/patches/series 2020-11-17 15:46:22.000000000 +0000 @@ -1,4 +1,3 @@ -# Build system and feature upstream-971e7694-fix-arm-llvm.patch mask-failing-tests.patch jldownload-verbose-fakedownload.patch @@ -14,17 +13,7 @@ checksum-suitesparse.patch doc-make.patch doc-unicode-data-path.patch - -# distro integration, wip, experimental, disabled by default -#default-load-path-distro.patch - -# Test -#test-skip-sigint.patch test-skip-dns-ubuntu.patch - -# This patch is for embedded sources. Already pre-applied. -# privacy-breach.patch -# doc-silent.patch - mask-tests-1.2.0.patch arm64-openblas.patch +add-libatomic.patch diff -Nru julia-1.5.3+dfsg/debian/rules julia-1.5.3+dfsg/debian/rules --- julia-1.5.3+dfsg/debian/rules 2020-11-12 09:50:14.000000000 +0000 +++ julia-1.5.3+dfsg/debian/rules 2020-11-17 15:46:22.000000000 +0000 @@ -70,7 +70,7 @@ COMMON_FLAGS += USE_BLAS64=0 else ifneq (,$(filter $(DEB_HOST_ARCH),armhf)) COMMON_FLAGS += USE_BLAS64=0 -COMMON_FLAGS += JULIA_CPU_TARGET="armv7-a;armv7-a,neon;armv7-a,neon,vfp4" +COMMON_FLAGS += JULIA_CPU_TARGET="arm1176jzf-s" else ifneq (,$(filter $(DEB_HOST_ARCH),ppc64el)) COMMON_FLAGS += JULIA_CPU_TARGET="pwr8" else @@ -129,7 +129,7 @@ #-$(MAKE) -C doc pdf override_dh_auto_test-arch: -ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS))) +ifeq (testsuitedisabled,$(filter nocheck,$(DEB_BUILD_OPTIONS))) ifeq (,$(filter $(DEB_HOST_ARCH),amd64 i386)) -env $(TESTS_ENV) make -C test $(COMMON_FLAGS) else