[emos] 03/04: * Don't set -mcmodel=large on arm64, as large+fpic doesn't work. * Homepage fixed. Closes: #769179. * Build ppc64el, sparc -fPIC not fpic.

[Alastair McKinstry]

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

mckinstry pushed a commit to tag debian/2%4.0.3+dfsg.1-3
in repository emos.

commit f608e0344737fd48c18ee9cbc93b3498b93a20b9
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Thu Jul 9 11:09:03 2015 +0100

    * Don't set -mcmodel=large on arm64, as large+fpic doesn't work.
    * Homepage fixed. Closes: #769179.
    * Build ppc64el, sparc -fPIC not fpic.
---
 debian/changelog            | 4 ++++
 debian/patches/shared.patch | 8 ++++----
 debian/rules                | 9 ++++++---
 3 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 697cee8..eb6b034 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,10 @@
 emoslib (2:4.0.3+dfsg.1-3) UNRELEASED; urgency=medium
 
   * drop_tune.patch: Drop -mtune=native which breaks s390x port. 
+  * Don't set -mcmodel=large on arm64, as large+fpic doesn't work.
+  * Homepage fixed. Closes: #769179.
+  * Build ppc64el, sparc -fPIC not fpic.
+  * Build fix for Hurd-i386: Add ifdef __GNU__ case
 
  -- Alastair McKinstry <mckinstry at debian.org>  Thu, 09 Jul 2015 07:44:50 +0100
 
diff --git a/debian/patches/shared.patch b/debian/patches/shared.patch
index f9a768f..6d96ab1 100644
--- a/debian/patches/shared.patch
+++ b/debian/patches/shared.patch
@@ -4,7 +4,7 @@ Description: Enable building shared libs in emoslib (cmake)
  but a cleaner patch than before.
  Needs to build -fpic, -mcmodel=medium for shared, but preferably don't
  for static, so build in separate dirs.
-Last-Update: 2015-06-14
+Last-Update: 2015-07-09
 Forwarded: no
 
 Index: emoslib-4.0.3+dfsg.1/libemos-sp-shared/CMakeLists.txt
@@ -93,13 +93,13 @@ Index: emoslib-4.0.3+dfsg.1/cmake/ecbuild_add_library.cmake
  		get_property( _target_pic TARGET ${_PAR_TARGET} PROPERTY POSITION_INDEPENDENT_CODE )
  		if( _target_pic )
 +			if( "${CMAKE_C_COMPILER_ID}" STREQUAL "GNU" )
-+				set( _PAR_CFLAGS "-fpic ${MCMODEL_FLAGS}  ${_PAR_CFLAGS}" )
++				set( _PAR_CFLAGS "${FPIC} ${MCMODEL_FLAGS}  ${_PAR_CFLAGS}" )
 +			endif()
 +			if( "${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU" )
-+				set( _PAR_CXXFLAGS "-fpic ${MCMODEL_FLAGS} ${_PAR_CXXFLAGS}" )
++				set( _PAR_CXXFLAGS "${FPIC} ${MCMODEL_FLAGS} ${_PAR_CXXFLAGS}" )
 +			endif()
 +			if( "${CMAKE_Fortran_COMPILER_ID}" STREQUAL "GNU" )
-+				set( _PAR_FFLAGS "-fpic ${MCMODEL_FLAGS} ${_PAR_FFLAGS}" )
++				set( _PAR_FFLAGS "${FPIC} ${MCMODEL_FLAGS} ${_PAR_FFLAGS}" )
 +			endif()
  			if( "${CMAKE_C_COMPILER_ID}" STREQUAL "Cray" )
  				set( _PAR_CFLAGS "-fPIC -h PIC ${_PAR_CFLAGS}" )
diff --git a/debian/rules b/debian/rules
index 8693321..99694fa 100755
--- a/debian/rules
+++ b/debian/rules
@@ -13,14 +13,16 @@ SHLIB_DIR:= debian/libemos0d/usr/lib/${DEB_HOST_MULTIARCH}
 AUTOGENERATED:= libemos-dev.install libemos-dev.links
 
 MCMODEL_FLAGS:=''
+FPIC:= -fpic
 ifeq ($(ARCH), amd64)
   MCMODEL_FLAGS:= -mcmodel=medium
+  FPIC:= -fPIC
 endif
 ifeq ($(ARCH), ppc64el)
-  MCMODEL_FLAGS:= -mcmodel=medium
+  FPIC:= -fPIC
 endif
-ifeq ($(ARCH), arm64)
-  MCMODEL_FLAGS:= -mcmodel=large
+ifeq ($(ARCH), sparc)
+  FPIC:= -fPIC
 endif
 
 override_dh_auto_test:
@@ -37,6 +39,7 @@ override_dh_auto_configure:
 		-DBUILD_SHARED_LIBS=ON \
 		-DDISABLE_OS_CHECK=ON \
 		-DMCMODEL_FLAGS=${MCMODEL_FLAGS} \
+		-DPIC=${FPIC} \
 		-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