[emos] 04/06: Add to shared.patch so -mcmodel can be set per-arch

[Alastair McKinstry]

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

mckinstry pushed a commit to branch debian/master
in repository emos.

commit 739c7fa1062d06ac6f241ccde512a28f2c2da772
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Sat Jun 27 10:13:32 2015 +0100

    Add  to shared.patch so -mcmodel can be set per-arch
---
 debian/patches/shared.patch | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/debian/patches/shared.patch b/debian/patches/shared.patch
index 3aa52b7..f9a768f 100644
--- a/debian/patches/shared.patch
+++ b/debian/patches/shared.patch
@@ -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=medium  ${_PAR_CFLAGS}" )
++				set( _PAR_CFLAGS "-fpic ${MCMODEL_FLAGS}  ${_PAR_CFLAGS}" )
 +			endif()
 +			if( "${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU" )
-+				set( _PAR_CXXFLAGS "-fpic -mcmodel=medium  ${_PAR_CXXFLAGS}" )
++				set( _PAR_CXXFLAGS "-fpic ${MCMODEL_FLAGS} ${_PAR_CXXFLAGS}" )
 +			endif()
 +			if( "${CMAKE_Fortran_COMPILER_ID}" STREQUAL "GNU" )
-+				set( _PAR_FFLAGS "-fpic -mcmodel=medium  ${_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}" )

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