[Likwid-commit] [likwid] 01/01: fix build for i386

[Christoph Martin]

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

chrism pushed a commit to branch master
in repository likwid.

commit 345b0eceb7fb201ab0eea2bed9f0de1485258f65
Author: Christoph Martin <martin at uni-mainz.de>
Date:   Wed Jun 22 16:08:35 2016 +0200

    fix build for i386
---
 debian/changelog                  |  6 ++++++
 debian/patches/10-debianize.patch | 44 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 50 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 4fab89c..f08bd85 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+likwid (4.1.0+dfsg1-2) unstable; urgency=medium
+
+  * fix build for i386 (closes: #797959)
+
+ -- Christoph Martin <martin at uni-mainz.de>  Wed, 22 Jun 2016 16:07:59 +0200
+
 likwid (4.1.0+dfsg1-1) unstable; urgency=medium
 
   * update watch file for uscan
diff --git a/debian/patches/10-debianize.patch b/debian/patches/10-debianize.patch
index bf943ad..3fd8923 100644
--- a/debian/patches/10-debianize.patch
+++ b/debian/patches/10-debianize.patch
@@ -274,3 +274,47 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  #GROUPPATH <path_to_mon_groups>
  # List of monitoring groups that should be measured
  #EVENTSET <group1> <group2> ...
+--- a/config.mk
++++ b/config.mk
+@@ -1,7 +1,11 @@
+ # Please have a look in INSTALL and the WIKI for details on
+ # configuration options setup steps.
+ # supported: GCC, CLANG, ICC, MIC (ICC), GCCX86 (for 32bit systems)
++ifeq "$(DEB_BUILD_GNU_TYPE)" "i686-linux-gnu"
++COMPILER = GCCX86#NO SPACE
++else
+ COMPILER = GCC#NO SPACE
++endif
+ 
+ # Define the color of the likwid-pin output
+ # Can be NONE, BLACK, RED, GREEN, YELLOW, BLUE,
+--- a/make/include_GCCX86.mk
++++ b/make/include_GCCX86.mk
+@@ -1,4 +1,5 @@
+ CC  = gcc
++FC  = gfortran
+ AS  = as
+ AR  = ar
+ PAS = ./perl/AsmGen.pl 
+@@ -11,15 +12,15 @@ ANSI_CFLAGS   = -std=c99
+ #ANSI_CFLAGS += -Wextra
+ #ANSI_CFLAGS += -Wall
+ 
+-CFLAGS   =  -O2 -g -m32 -Wno-format -fPIC
+-FCFLAGS  = -J ./  -fsyntax-only
++CFLAGS   +=  -O2 -g -m32 -Wno-format -fPIC
++FCFLAGS  = $(FFLAGS) -J ./  -fsyntax-only
+ PASFLAGS  = x86
+ ASFLAGS  = --32 -g
+-CPPFLAGS =
+-LFLAGS   = -m32 -g -pthread
++CPPFLAGS +=
++LFLAGS   = $(DLDFLAGS) -m32 -g -pthread
+ 
+-SHARED_CFLAGS = -fpic -fvisibility=hidden
+-SHARED_LFLAGS = -shared -fvisibility=hidden
++SHARED_CFLAGS = -fPIC -fvisibility=hidden
++SHARED_LFLAGS = $(DLDFLAGS) -shared -fvisibility=hidden
+ 
+ DEFINES  = -D_GNU_SOURCE
+ DEFINES  += -DPAGE_ALIGNMENT=4096

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