diff -Nru julia-1.4.1+dfsg/debian/changelog julia-1.4.1+dfsg/debian/changelog --- julia-1.4.1+dfsg/debian/changelog 2020-04-21 11:21:34.000000000 +0000 +++ julia-1.4.1+dfsg/debian/changelog 2020-04-26 15:42:38.000000000 +0000 @@ -1,3 +1,16 @@ +julia (1.4.1+dfsg-1+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. + + -- Peter Michael Green Sun, 26 Apr 2020 15:42:38 +0000 + julia (1.4.1+dfsg-1) unstable; urgency=medium * New upstream release diff -Nru julia-1.4.1+dfsg/debian/patches/add-libatomic.patch julia-1.4.1+dfsg/debian/patches/add-libatomic.patch --- julia-1.4.1+dfsg/debian/patches/add-libatomic.patch 1970-01-01 00:00:00.000000000 +0000 +++ julia-1.4.1+dfsg/debian/patches/add-libatomic.patch 2020-04-26 15:42:38.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.4.1+dfsg/debian/patches/series julia-1.4.1+dfsg/debian/patches/series --- julia-1.4.1+dfsg/debian/patches/series 2020-04-19 13:22:29.000000000 +0000 +++ julia-1.4.1+dfsg/debian/patches/series 2020-04-26 15:42:38.000000000 +0000 @@ -18,15 +18,13 @@ # 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 openblas-skip-patch.patch diff -Nru julia-1.4.1+dfsg/debian/rules julia-1.4.1+dfsg/debian/rules --- julia-1.4.1+dfsg/debian/rules 2020-04-19 13:22:29.000000000 +0000 +++ julia-1.4.1+dfsg/debian/rules 2020-04-26 15:42:38.000000000 +0000 @@ -68,7 +68,7 @@ else ifneq (,$(filter $(DEB_HOST_ARCH),arm64)) COMMON_FLAGS += USE_BLAS64=0 else ifneq (,$(filter $(DEB_HOST_ARCH),armhf)) -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 @@ -127,7 +127,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