diff -Nru blis-0.5.1/debian/changelog blis-0.5.1/debian/changelog --- blis-0.5.1/debian/changelog 2019-01-17 05:02:27.000000000 +0000 +++ blis-0.5.1/debian/changelog 2019-01-19 02:39:44.000000000 +0000 @@ -1,3 +1,9 @@ +blis (0.5.1-5) unstable; urgency=medium + + * Use generic kernel for armel,armhf architectures. (Closes: #919710) + + -- Mo Zhou Sat, 19 Jan 2019 02:39:44 +0000 + blis (0.5.1-4) unstable; urgency=medium * Fix the problematic patch for Hurd. diff -Nru blis-0.5.1/debian/rules blis-0.5.1/debian/rules --- blis-0.5.1/debian/rules 2019-01-17 04:09:51.000000000 +0000 +++ blis-0.5.1/debian/rules 2019-01-19 02:38:34.000000000 +0000 @@ -1,13 +1,10 @@ #!/usr/bin/make -f export DEB_BUILD_MAINT_OPTIONS = hardening=+all - -# Specify ENV vars for the upstream build system -export PYTHON=/usr/bin/python3 +export PYTHON=/usr/bin/python3 # for the upstream build system # Select target architecture CONFIG_amd64 = x86_64 -CONFIG_armel = cortexa15 -CONFIG_armhf = cortexa15 +CONFIG_armhf = generic CONFIG_arm64 = cortexa57 CONFIG_ppc64el = generic CONFIG = $(word 1, $(CONFIG_$(DEB_HOST_ARCH)) generic) @@ -36,8 +33,7 @@ dh $@ -Smakefile create_symlinks: - # architectures that use generic settings: - # m68k powerpc powerpcspe ppc64 ppc64el s390x sh4 + # BLIS: generic kernels set -e; cd debian; \ for j in openmp pthread serial; do \ ln -sr libblis$(SOVER)-symbols.generic libblis$(SOVER)-$$j.symbols ;\ @@ -50,15 +46,15 @@ set -e; cd debian; for i in arm64; do for j in openmp pthread serial; do \ ln -sr libblis$(SOVER)-symbols.arm64 libblis$(SOVER)-$$j.symbols.$$i ;\ done; done - # armhf - set -e; cd debian; for i in armhf; do for j in openmp pthread serial; do \ - ln -sr libblis$(SOVER)-symbols.armhf libblis$(SOVER)-$$j.symbols.$$i ;\ - done; done + # armhf: upstream's armv7a kernel assumes NEON + #set -e; cd debian; for i in armhf; do for j in openmp pthread serial; do \ + # ln -sr libblis$(SOVER)-symbols.armhf libblis$(SOVER)-$$j.symbols.$$i ;\ + # done; done # amd64 set -e; cd debian; for i in amd64; do for j in openmp pthread serial; do \ ln -sr libblis$(SOVER)-symbols.amd64 libblis$(SOVER)-$$j.symbols.$$i ;\ done; done - # BLAS64: generic settings: ppc64 ppc64el s390x sparc64 + # BLAS64: generic kernels set -e; cd debian; \ for j in openmp pthread serial; do \ ln -sr libblis64-$(SOVER)-symbols.generic libblis64-$(SOVER)-$$j.symbols ;\