[med-svn] [Git][med-team/opensurgsim][master] 3 commits: rules: use /usr/share/dpkg/architecture.mk

[Andreas Tille (@tille)]

Andreas Tille pushed to branch master at Debian Med / opensurgsim


Commits:
ecae50e5 by Pino Toscano at 2021-09-10T07:31:52+02:00
rules: use /usr/share/dpkg/architecture.mk

- - - - -
c7728bb1 by Pino Toscano at 2021-09-10T07:35:11+02:00
rules: align build bits for non-Linux i386 to Linux

the issues are the same, so do the same job on every OS

- - - - -
cc16700c by Andreas Tille at 2021-09-10T05:56:33+00:00
Merge branch 'non-linux-i386' into 'master'

rules: align build bits for non-Linux i386 to Linux

See merge request med-team/opensurgsim!1
- - - - -


2 changed files:

- debian/changelog
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,15 @@
+opensurgsim (0.7.0-12) UNRELEASED; urgency=medium
+
+  [ Pino Toscano ]
+  * Use /usr/share/dpkg/architecture.mk in debian/rules to make sure to have
+    the $DEB_HOST_* variables.
+  * Align non-Linux i386 architectures with Linux/i386, as the problems are the
+    same:
+    - append -ffloat-store to the CXXFLAGS
+    - pass -DEIGEN_ALIGNMENT=ON to cmake
+
+ -- Debian Med Packaging Team <debian-med-packaging at lists.alioth.debian.org>  Fri, 10 Sep 2021 07:29:36 +0200
+
 opensurgsim (0.7.0-11) unstable; urgency=medium
 
   [ Adrian Bunk ]


=====================================
debian/rules
=====================================
@@ -1,9 +1,11 @@
 #!/usr/bin/make -f
 
+include /usr/share/dpkg/architecture.mk
+
 export DEB_BUILD_MAINT_OPTIONS = hardening=-format,+bindnow
 export GOOGLEMOCK_DIR = /usr/src/googletest/googlemock
 
-ifneq (,$(filter $(DEB_HOST_ARCH), i386))
+ifneq (,$(filter $(DEB_HOST_ARCH_CPU), i386))
     export DEB_CXXFLAGS_MAINT_APPEND += -ffloat-store
 endif
 
@@ -14,7 +16,9 @@ endif
 %:
 	dh $@
 
-ifeq (,$(filter $(DEB_HOST_ARCH),i386 arm64 armel armhf mipsel powerpc ppc64el ppc64))
+ifeq (,$(filter $(DEB_HOST_ARCH_CPU), i386))
+    EIGEN_ALIGNMENT=ON
+else ifeq (,$(filter $(DEB_HOST_ARCH),arm64 armel armhf mipsel powerpc ppc64el ppc64))
     EIGEN_ALIGNMENT=ON
 else
     EIGEN_ALIGNMENT=OFF



View it on GitLab: https://salsa.debian.org/med-team/opensurgsim/-/compare/3eaacb5cb53d2a239354d8f25deaa80cd2523177...cc16700ca1f5d77dd1600e94fc036729bb11c1b1

-- 
View it on GitLab: https://salsa.debian.org/med-team/opensurgsim/-/compare/3eaacb5cb53d2a239354d8f25deaa80cd2523177...cc16700ca1f5d77dd1600e94fc036729bb11c1b1
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/20210910/4b7d92c2/attachment-0001.htm>