[Likwid-commit] [likwid] 05/05: revert -m32 patch and remove x32 arch

[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 5ec2f55f9d40d46f4ebdd52ec605be782fd5d7e2
Author: Christoph Martin <martin at uni-mainz.de>
Date:   Wed Nov 9 13:44:58 2016 +0100

    revert -m32 patch and remove x32 arch
---
 debian/changelog                  |  7 +++++++
 debian/control                    |  2 +-
 debian/patches/10-debianize.patch | 17 +++++++----------
 3 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 441a09f..04af8bd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+likwid (4.1.2+dfsg1-3) unstable; urgency=medium
+
+  * revert -m32 patch because otherwise not building on i386
+  * remove arch x32 because it is not building
+
+ -- Christoph Martin <martin at uni-mainz.de>  Wed, 09 Nov 2016 13:35:18 +0100
+
 likwid (4.1.2+dfsg1-2) unstable; urgency=medium
 
   * re-add stream test (changed license)
diff --git a/debian/control b/debian/control
index d5a3fb1..b400ace 100644
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,7 @@ Vcs-Git: https://anonscm.debian.org/git/likwid/likwid.git
 Vcs-Browser: https://anonscm.debian.org/cgit/likwid/likwid.git
 
 Package: likwid
-Architecture: amd64 i386 x32
+Architecture: amd64 i386
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}, lua5.2
 Description: toolsuite for performance oriented programmers
diff --git a/debian/patches/10-debianize.patch b/debian/patches/10-debianize.patch
index 5064ef5..eb4119c 100644
--- a/debian/patches/10-debianize.patch
+++ b/debian/patches/10-debianize.patch
@@ -225,7 +225,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,22 +31,22 @@ include  ../../make/include_$(COMPILER).
+@@ -31,7 +31,7 @@ include  ../../make/include_$(COMPILER).
  
  DAEMON_TARGET = likwid-accessD
  SETFREQ_TARGET = likwid-setFreq
@@ -234,14 +234,11 @@ 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)
  INCLUDES  = -I../includes
- CFLAGS    += -std=c99 -fPIC -pie -fPIE -fstack-protector
--ifeq ($(COMPILER),GCCX86)
--CFLAGS    +=  -m32
--endif
+@@ -39,14 +39,14 @@ CFLAGS    += -std=c99 -fPIC -pie -fPIE -
+ ifeq ($(COMPILER),GCCX86)
+ CFLAGS    +=  -m32
+ endif
 -CPPFLAGS :=  $(DEFINES) $(INCLUDES)
-+#ifeq ($(COMPILER),GCCX86)
-+#CFLAGS    +=  -m32
-+#endif
 +CPPFLAGS :=  $(DCPPFLAGS) $(DEFINES) $(INCLUDES)
  
  all: $(DAEMON_TARGET) $(SETFREQ_TARGET)
@@ -305,14 +302,14 @@ 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 -Wno-format -fPIC
++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) -g -pthread
++LFLAGS   = $(DLDFLAGS) -m32 -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