[med-svn] [Git][med-team/simde][debian/experimental] 2 commits: Don't set a default --builddirectory, as builds that skip tests will fail

[Michael R. Crusoe]

Michael R. Crusoe pushed to branch debian/experimental at Debian Med / simde


Commits:
9715129b by Michael R. Crusoe at 2020-11-23T11:14:11+01:00
Don't set a default --builddirectory, as builds that skip tests will fail

- - - - -
43c08b8f by Michael R. Crusoe at 2020-11-23T11:14:12+01:00
Adjust ppc64 workaround

- - - - -


2 changed files:

- debian/changelog
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,10 @@
+simde (0.7.0~rc-1-3) UNRELEASED; urgency=medium
+
+  * Don't set a default --builddirectory, as builds that skip tests will fail
+  * Adjust ppc64 workaround
+
+ -- Michael R. Crusoe <crusoe at debian.org>  Mon, 23 Nov 2020 11:04:16 +0100
+
 simde (0.7.0~rc-1-2) experimental; urgency=medium
 
   * debian/rules: Tweak -maltivec setting on ppc64


=====================================
debian/rules
=====================================
@@ -17,20 +17,22 @@ GCC_VERS = 8 9 10
 CLANG_VERS = 9 10 11
 
 %:
-	dh $@ --buildsystem=meson+ninja --builddirectory=gcc10_test
+	dh $@ --buildsystem=meson+ninja
 
 override_dh_auto_configure:
 ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
   ifeq (,$(filter $(DEB_HOST_ARCH),$(CLANG_SKIP)))
 	$(foreach VER,$(CLANG_VERS),CC=clang-$(VER) CXX=clang++-$(VER) dh_auto_configure --builddirectory=clang$(VER)_test --buildsystem=meson+ninja && ) true ;
   endif
+ifneq (,$(filter $(DEB_BUILD_ARCH),ppc64))
+	export DEB_CFLAGS_MAINT_APPEND += -maltivec
+	export DEB_CXXFLAGS_MAINT_APPEND += -maltivec
 # According to https://wiki.debian.org/ArchitectureSpecificsMemo#Architecture_baselines
 # It is odd that gcc doesn't include this automatically, but clang does
-ifneq (,$(filter $(DEB_BUILD_ARCH),ppc64))
-export DEB_CFLAGS_MAINT_APPEND += -maltivec
-export DEB_CXXFLAGS_MAINT_APPEND += -maltivec
 endif
 	$(foreach VER,$(GCC_VERS),CC=gcc-$(VER) CXX=g++-$(VER) dh_auto_configure --builddirectory=gcc$(VER)_test --buildsystem=meson+ninja && ) true ;
+else
+	echo DEB_BUILD_OPTIONS contains "nocheck" so there is no need to configure the tests.
 endif
 
 override_dh_auto_build:
@@ -54,3 +56,6 @@ override_dh_auto_clean:
 ifeq (,$(filter $(DEB_HOST_ARCH),$(CLANG_SKIP)))
 	$(foreach VER,$(CLANG_VERS),dh_auto_clean --builddirectory=clang$(VER)_test --buildsystem=meson+ninja ; )
 endif
+
+override_dh_auto_install:
+	echo This is a header-only library, no need to install any binaries



View it on GitLab: https://salsa.debian.org/med-team/simde/-/compare/ac666564b6e55d2e26dadbf51c8306aa71b80654...43c08b8fcfaa4d4c0e3937f3aaa4aa3b45150117

-- 
View it on GitLab: https://salsa.debian.org/med-team/simde/-/compare/ac666564b6e55d2e26dadbf51c8306aa71b80654...43c08b8fcfaa4d4c0e3937f3aaa4aa3b45150117
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20201123/fc9f5b60/attachment-0001.html>