[emos] 02/03: * ppc64el build needs both -fpic and -mcmodel=large. Closes: #790078. * Need to add build_fixes.patch to ensure __GNU__ set properly for Hurd. * Enable tests.

[Alastair McKinstry]

This is an automated email from the git hooks/post-receive script.

mckinstry pushed a commit to tag debian2%4.0.3+dfsg.1-4
in repository emos.

commit f4e34b6032b43b7db2f5957cbe3d3a161f9e596b
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Sat Jul 11 17:00:52 2015 +0100

    * ppc64el build needs both -fpic and -mcmodel=large. Closes: #790078.
    * Need to add build_fixes.patch to ensure __GNU__ set properly for Hurd.
    * Enable tests.
---
 debian/changelog                 |  8 ++++++++
 debian/patches/build_fixes.patch | 13 +++++++++++++
 debian/patches/series            |  1 +
 debian/rules                     | 10 ++++++++--
 4 files changed, 30 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 2e2b772..07c1fd6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+emoslib (2:4.0.3+dfsg.1-4) unstable; urgency=medium
+
+  * ppc64el build needs both -fpic and -mcmodel=large. Closes: #790078.
+  * Need to add build_fixes.patch to ensure __GNU__ set properly for Hurd.
+  * Enable tests.
+
+ -- Alastair McKinstry <mckinstry at debian.org>  Sat, 11 Jul 2015 16:58:16 +0100
+
 emoslib (2:4.0.3+dfsg.1-3) unstable; urgency=medium
 
   * drop_tune.patch: Drop -mtune=native which breaks s390x port. 
diff --git a/debian/patches/build_fixes.patch b/debian/patches/build_fixes.patch
index 951169c..910ebaf 100644
--- a/debian/patches/build_fixes.patch
+++ b/debian/patches/build_fixes.patch
@@ -16,3 +16,16 @@ Index: emoslib-4.0.3+dfsg.1/gribex/csect4.F
        ISCALE = MIN (INT(ZS),INT(ZS+SIGN(1.D0,ZS)))
  #else
        ISCALE = MIN (INT(ZS),INT(ZS+SIGN(1.,ZS)))
+Index: emoslib-4.0.3+dfsg.1/CMakeLists.txt
+===================================================================
+--- emoslib-4.0.3+dfsg.1.orig/CMakeLists.txt
++++ emoslib-4.0.3+dfsg.1/CMakeLists.txt
+@@ -63,7 +63,7 @@ endif()
+ 
+ # build type flags
+ if(CMAKE_Fortran_COMPILER_ID MATCHES "GNU")
+-  set(CMAKE_Fortran_FLAGS         "-ffixed-line-length-none -fcray-pointer -fno-second-underscore -Wuninitialized -DSHAREDMEMORY")
++  set(CMAKE_Fortran_FLAGS         "-ffixed-line-length-none -fcray-pointer -fno-second-underscore -Wuninitialized -DSHAREDMEMORY ${BUILD_FLAGS}")
+   set(CMAKE_Fortran_FLAGS_RELEASE "-O2")
+   set(CMAKE_Fortran_FLAGS_DEBUG   "-g")
+   set(emos_special_compiler_def   "gfortran")
diff --git a/debian/patches/series b/debian/patches/series
index a2b529d..d5db404 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,4 @@ pkgconfig.patch
 little_endian.patch
 wvqlid2.patch
 shared.patch
+build_fixes.patch
diff --git a/debian/rules b/debian/rules
index 99694fa..66feac1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -13,6 +13,7 @@ SHLIB_DIR:= debian/libemos0d/usr/lib/${DEB_HOST_MULTIARCH}
 AUTOGENERATED:= libemos-dev.install libemos-dev.links
 
 MCMODEL_FLAGS:=''
+BUILD_FLAGS:=''
 FPIC:= -fpic
 ifeq ($(ARCH), amd64)
   MCMODEL_FLAGS:= -mcmodel=medium
@@ -20,13 +21,17 @@ ifeq ($(ARCH), amd64)
 endif
 ifeq ($(ARCH), ppc64el)
   FPIC:= -fPIC
+  MCMODEL_FLAGS:= -mcmodel=large
 endif
 ifeq ($(ARCH), sparc)
   FPIC:= -fPIC
 endif
+ifeq ($(ARCH), hurd-i386)
+  BUILD_FLAGS:= ' -D__GNU__'
+endif
 
-override_dh_auto_test:
-	@echo TESTS TEMPORARILY DISABLED.
+#override_dh_auto_test:
+#	@echo TESTS TEMPORARILY DISABLED.
 
 override_dh_auto_clean:
 	find bufrtables -type l -delete
@@ -39,6 +44,7 @@ override_dh_auto_configure:
 		-DBUILD_SHARED_LIBS=ON \
 		-DDISABLE_OS_CHECK=ON \
 		-DMCMODEL_FLAGS=${MCMODEL_FLAGS} \
+		-DBUILD_FLAGS=${BUILD_FLAGS} \
 		-DPIC=${FPIC} \
 		-DBUFR_TABLES_PATH=/usr/share/emos/bufrtables
 	for f in ${AUTOGENERATED} ; do \

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/emos.git