[emos] 05/06: * Set DISABLE_OS_CHECK=ON for KFreeBSD, Hurd * Set mcmodel=* according to arch.
Alastair McKinstry
mckinstry at moszumanska.debian.org
Tue Jul 7 11:15:16 UTC 2015
This is an automated email from the git hooks/post-receive script.
mckinstry pushed a commit to branch debian/master
in repository emos.
commit 36ff8bc5a060a8b4a138f07660c3b1979a602779
Author: Alastair McKinstry <mckinstry at debian.org>
Date: Sat Jun 27 11:40:19 2015 +0100
* Set DISABLE_OS_CHECK=ON for KFreeBSD, Hurd
* Set mcmodel=* according to arch.
---
debian/changelog | 4 ++++
debian/rules | 20 +++++++++++++++++---
2 files changed, 21 insertions(+), 3 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 04fb7c6..dd6697c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,10 @@ emoslib (2:4.0.3+dfsg.1-2) UNRELEASED; urgency=medium
* Fix sed rules that broke some symlinks
* Add bufrnum back to shlib in new cmake-build system.
* Change Vcs-Git url to canonical anonscm form.
+ * Use mcmodel=medium on amd64,ppc64; =large on arm64, drop it elsewhere.
+ Closes: #790077, #790078.
+ * Set DISABLE_OS_CHECK=ON to build on Hurd, KFreeBSD again.
+ Closes: #790079.
-- Alastair McKinstry <mckinstry at debian.org> Sat, 27 Jun 2015 06:33:00 +0100
diff --git a/debian/rules b/debian/rules
index 39ee1b9..be492d3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,21 +8,35 @@ export DH_VERBOSE=1
DESTDIR:=$(shell pwd)/debian/tmp
DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+ARCH:=$(shell dpkg --print-architecture)
SHLIB_DIR:= debian/libemos0d/usr/lib/${DEB_HOST_MULTIARCH}
AUTOGENERATED:= libemos-dev.install libemos-dev.links
+MCMODEL_FLAGS:=''
+ifeq ($(ARCH), amd64)
+ MCMODEL_FLAGS:= -mcmodel=medium
+endif
+ifeq ($(ARCH), ppc64el)
+ MCMODEL_FLAGS:= -mcmodel=medium
+endif
+ifeq ($(ARCH), arm64)
+ MCMODEL_FLAGS:= -mcmodel=large
+endif
+
+override_dh_auto_test:
+ @echo TESTS TEMPORARILY DISABLED.
+
override_dh_auto_clean:
find bufrtables -type l -delete
rm -f $(patsubst %, debian/%, ${AUTOGENERATED})
dh_auto_clean
-override_dh_auto_test:
- @echo TESTS TEMPORARILY DISABLED.
-
override_dh_auto_configure:
dh_auto_configure -- \
-DCMAKE_BUILD_TYPE=Release \
-DBUILD_SHARED_LIBS=ON \
+ -DDISABLE_OS_CHECK=ON \
+ -DMCMODEL_FLAGS=${MCMODEL_FLAGS} \
-DBUFR_TABLES_PATH=/usr/share/emos/bufrtables
for f in ${AUTOGENERATED} ; do \
sed -e 's%@ARCH@%${DEB_HOST_MULTIARCH}%g' < debian/$$f.in > debian/$$f ; \
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/emos.git
More information about the debian-science-commits
mailing list