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

[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 80b7fdd2e791c547def266c9fcc110485aa2d1be
Merge: 84e468e f4e34b6
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Sat Jul 11 17:21:33 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.

 debian/changelog                 |  7 ++++---
 debian/patches/build_fixes.patch | 13 +++++++++++++
 debian/patches/series            |  1 +
 debian/rules                     |  6 ++++++
 4 files changed, 24 insertions(+), 3 deletions(-)

diff --cc debian/changelog
index 3e366ce,07c1fd6..f725ec9
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,8 -1,10 +1,9 @@@
- emoslib (2:4.0.3+dfsg.1-4) UNRELEASED; urgency=medium
+ emoslib (2:4.0.3+dfsg.1-4) unstable; urgency=medium
  
-   * Need both -mcmodel=large, -fPIC for ppc64el builds. 
+   * 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 09:45:36 +0100
 - -- Alastair McKinstry <mckinstry at debian.org>  Sat, 11 Jul 2015 16:58:16 +0100
++ -- Alastair McKinstry <mckinstry at debian.org>  Sun, 12 Jul 2015 16:58:16 +0100
  
  emoslib (2:4.0.3+dfsg.1-3) unstable; urgency=medium
  
diff --cc debian/rules
index 188440b,66feac1..f90819d
--- a/debian/rules
+++ b/debian/rules
@@@ -19,15 -20,18 +20,19 @@@ ifeq ($(ARCH), amd64
    FPIC:= -fPIC
  endif
  ifeq ($(ARCH), ppc64el)
 +  MCMODEL_FLAGS:= -mcmodel=large
    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

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