[Likwid-commit] [likwid] 03/04: remove -m32 flag for i386 and x32 builds

[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 a12acca5e3420c8d0bdd7899d6bc536df0684a9b
Author: Christoph Martin <martin at uni-mainz.de>
Date:   Fri Jan 13 11:33:13 2017 +0100

    remove -m32 flag for i386 and x32 builds
---
 debian/patches/10-debianize.patch | 29 +++++++++++++++++++----------
 1 file changed, 19 insertions(+), 10 deletions(-)

diff --git a/debian/patches/10-debianize.patch b/debian/patches/10-debianize.patch
index 788c645..5e1f3fd 100644
--- a/debian/patches/10-debianize.patch
+++ b/debian/patches/10-debianize.patch
@@ -140,7 +140,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  	@mkdir -p $(abspath $(PREFIX)/share/likwid/filter)
 --- a/bench/Makefile
 +++ b/bench/Makefile
-@@ -44,7 +44,7 @@ include $(MAKE_DIR)/config_defines.mk
+@@ -44,11 +44,11 @@ include $(MAKE_DIR)/config_defines.mk
  #INCLUDES  += -I./includes -I../src/includes -I../ext/hwloc/include -I../$(COMPILER) -I$(BUILD_DIR)
  INCLUDES  += -I./includes -I$(BUILD_DIR) -I../src/includes
  LIBS      +=
@@ -149,6 +149,11 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  
  #CONFIGURE BUILD SYSTEM
  BUILD_DIR  = ./$(COMPILER)
+-Q         ?= @
++#Q         ?= @
+ 
+ ifeq ($(COMPILER),MIC)
+ BENCH_DIR   = ./phi
 @@ -60,7 +60,7 @@ BENCH_DIR   = ./x86-64
  endif
  endif
@@ -178,7 +183,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  $(BUILD_DIR):
 --- a/src/access-daemon/Makefile
 +++ b/src/access-daemon/Makefile
-@@ -31,7 +31,7 @@ include  ../../make/include_$(COMPILER).
+@@ -31,21 +31,21 @@ include  ../../make/include_$(COMPILER).
  
  DAEMON_TARGET = likwid-accessD
  SETFREQ_TARGET = likwid-setFreq
@@ -187,11 +192,14 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  
  DEFINES   += -D_GNU_SOURCE -DMAX_NUM_THREADS=$(MAX_NUM_THREADS) -DMAX_NUM_NODES=$(MAX_NUM_NODES) -DLIKWIDLOCK=$(LIKWIDLOCKPATH) -DLIKWIDSOCKETBASE=$(LIKWIDSOCKETBASE)
  INCLUDES  = -I../includes
-@@ -39,13 +39,13 @@ CFLAGS    += -std=c99 -fPIC -pie -fPIE -
- ifeq ($(COMPILER),GCCX86)
- CFLAGS    +=  -m32
- endif
+ CFLAGS    += -std=c99 -fPIC -pie -fPIE -fstack-protector
+-ifeq ($(COMPILER),GCCX86)
+-CFLAGS    +=  -m32
+-endif
 -CPPFLAGS :=  $(DEFINES) $(INCLUDES)
++#ifeq ($(COMPILER),GCCX86)
++#CFLAGS    +=  -m32
++#endif
 +CPPFLAGS :=  $(DCPPFLAGS) $(DEFINES) $(INCLUDES)
  
  all: $(DAEMON_TARGET) $(SETFREQ_TARGET)
@@ -232,7 +240,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  # 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_ARCH_BITS)" "32"
++ifeq "$(DEB_BUILD_ARCH)" "i386"
 +COMPILER = GCCX86#NO SPACE
 +else
  COMPILER = GCC#NO SPACE
@@ -268,14 +276,15 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  
 -CFLAGS   =  -O2 -g -m32 -Wno-format -fPIC
 -FCFLAGS  = -J ./  -fsyntax-only
-+CFLAGS   +=  -O2 -g -m32 -Wno-format -fPIC
++CFLAGS   +=  -O2 -g -Wno-format -fPIC
 +FCFLAGS  = $(FFLAGS) -J ./  -fsyntax-only
  PASFLAGS  = x86
- ASFLAGS  = --32 -g
+-ASFLAGS  = --32 -g
 -CPPFLAGS =
 -LFLAGS   = -m32 -g -pthread
++ASFLAGS  = -g
 +CPPFLAGS +=
-+LFLAGS   = $(DLDFLAGS) -m32 -g -pthread
++LFLAGS   = $(DLDFLAGS) -g -pthread
  
 -SHARED_CFLAGS = -fpic -fvisibility=hidden
 -SHARED_LFLAGS = -shared -fvisibility=hidden

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