From: Peter Michael Green Date: Thu, 28 May 2020 16:28:13 +0000 (+0000) Subject: Manual merge of version 3.10.3-9+rpi1 and 3.10.3-10 to produce 3.10.3-10+rpi1 X-Git-Tag: archive/raspbian/3.10.3-10+rpi1 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=8d2946360d55e7d56651b0be1c6d14dd93c1cb63;p=atlas.git Manual merge of version 3.10.3-9+rpi1 and 3.10.3-10 to produce 3.10.3-10+rpi1 --- 08a539ecea6e834082c77848320b93ee1716a01a diff --cc debian/changelog index 979ad10,22deda5..ecf3056 --- a/debian/changelog +++ b/debian/changelog @@@ -1,12 -1,27 +1,37 @@@ - atlas (3.10.3-9+rpi1) bullseye-staging; urgency=medium ++atlas (3.10.3-10+rpi1) bullseye-staging; urgency=medium + + [changes brought forward from 3.10.2-6+rpi1 by Peter Michael Green at Wed, 07 Jan 2015 01:41:03 +0000] + * Use generic build for raspbian. + * Make testsuite failure non-fatal + * Build some stuff for libatlas-test manually as it doesn't seem to get built + if the testsuite fails. + - -- Raspbian forward porter Thu, 12 Dec 2019 07:08:28 +0000 ++ -- Peter Michael Green Thu, 28 May 2020 16:27:37 +0000 ++ + atlas (3.10.3-10) unstable; urgency=medium + + * Fix missing symbols in liblapack.so.3 when libblas.so.3 is not the one from + ATLAS. + The problem was that, in 3.10.3-9, liblapack.so.3 was no longer linked to + libatlas.so.3, despite an explicit -latlas in the link command. + This was due to the combination of two factors: + — ld now defaulting to --as-needed in bullseye + — libatlas.so.3 symbols being erroneously embedded in libblas.so.3 + The fix consists in no longer embedding libatlas.so.3 symbols inside + libblas.so.3 (this has always been the intent, for some reason this had not + been correctly done). (Closes: #947827) + * debian/rules: simplify using debhelper 12.8’s execute_{before,after}_* rules + * Bump to debhelper 13 + — this allows dropping the B-D on dh-exec + — mention libsatlas.so and libtatlas.so in debian/not-installed + * Separate the {build,binary}-arch rules from {build,binary}-indep + * Drop debian/NEWS.Debian: it has never been installed, since it had an + incorrect name + * Bump S-V to 4.5.0 + * gfortran-10.patch: new patch, fixes FTBFS against gfortran 10 + (Closes: #957015) + + -- Sébastien Villemot Wed, 20 May 2020 16:42:23 +0200 atlas (3.10.3-9) unstable; urgency=medium diff --cc debian/rules index c83ebd4,44dc552..3f37814 --- a/debian/rules +++ b/debian/rules @@@ -204,15 -205,11 +206,14 @@@ ifeq (,$(filter nodoc,$(DEB_BUILD_OPTIO make -C TexDoc atlas_contrib.pdf atlas_devel.pdf atlas_install.pdf cblasqref.pdf f77blasqref.pdf lapackqref.pdf endif - override_dh_auto_test: + override_dh_auto_test-arch: - make -C build check + make -C build check || true if test -f build/lib/libptcblas.a; then make -C build ptcheck; fi - override_dh_auto_install: + override_dh_auto_install-arch: + #build some stuff manually that doesn't seem to get built if the testsuite fails + cd build/interfaces/blas/C/testing && $(MAKE) + cd build/interfaces/blas/F77/testing && $(MAKE) - make -C build install # The build system does not support setting DESTDIR at install time mv debian/tmp/usr/include/$(DEB_HOST_MULTIARCH)/cblas.h debian/tmp/usr/include/$(DEB_HOST_MULTIARCH)/cblas-atlas.h