[Likwid-commit] [likwid] 03/05: adapt patches and remove -m32 flag

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

    adapt patches and remove -m32 flag
---
 debian/changelog                        |  8 ++++++++
 debian/patches/10-debianize.patch       | 18 ++++++++++--------
 debian/patches/11-hwloc-no-sysctl.patch | 25 -------------------------
 debian/patches/series                   |  1 -
 4 files changed, 18 insertions(+), 34 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 8439dc2..b10c094 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+likwid (4.1.2+dfsg1-2) UNRELEASED; urgency=medium
+
+  * re-add stream test (changed license)
+  * format changelog
+  * Imported Upstream version 4.1.2+dfsg1
+
+ -- Christoph Martin <martin at uni-mainz.de>  Wed, 09 Nov 2016 10:32:19 +0100
+
 likwid (4.1.0+dfsg1-2) unstable; urgency=medium
 
   [ Thomas.Roehl ]
diff --git a/debian/patches/10-debianize.patch b/debian/patches/10-debianize.patch
index a392963..5064ef5 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,7 +31,7 @@ include  ../../make/include_$(COMPILER).
+@@ -31,22 +31,22 @@ include  ../../make/include_$(COMPILER).
  
  DAEMON_TARGET = likwid-accessD
  SETFREQ_TARGET = likwid-setFreq
@@ -234,11 +234,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)
  INCLUDES  = -I../includes
-@@ -39,14 +39,14 @@ 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)
@@ -288,7 +291,6 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  
  # 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 @@
@@ -303,14 +305,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 -m32 -Wno-format -fPIC
++CFLAGS   +=  -O2 -g -Wno-format -fPIC
 +FCFLAGS  = $(FFLAGS) -J ./  -fsyntax-only
  PASFLAGS  = x86
  ASFLAGS  = --32 -g
 -CPPFLAGS =
 -LFLAGS   = -m32 -g -pthread
 +CPPFLAGS +=
-+LFLAGS   = $(DLDFLAGS) -m32 -g -pthread
++LFLAGS   = $(DLDFLAGS) -g -pthread
  
 -SHARED_CFLAGS = -fpic -fvisibility=hidden
 -SHARED_LFLAGS = -shared -fvisibility=hidden
diff --git a/debian/patches/11-hwloc-no-sysctl.patch b/debian/patches/11-hwloc-no-sysctl.patch
deleted file mode 100644
index 205a353..0000000
--- a/debian/patches/11-hwloc-no-sysctl.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Description: Change use of sysctl syscall in hwloc
-Author: Thomas Röhl <Thomas.Roehl at fau.de>
-Last-Update: 2016-6-27
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/ext/hwloc/include/private/autogen/config.h
-+++ b/ext/hwloc/include/private/autogen/config.h
-@@ -330,7 +330,7 @@
- #define HAVE_SYNC_BUILTINS 1
- 
- /* Define to '1' if sysctl is present and usable */
--#define HAVE_SYSCTL 1
-+/* #undef HAVE_SYSCTL */
- 
- /* Define to '1' if sysctlbyname is present and usable */
- /* #undef HAVE_SYSCTLBYNAME */
-@@ -359,7 +359,7 @@
- #define HAVE_SYS_STAT_H 1
- 
- /* Define to 1 if you have the <sys/sysctl.h> header file. */
--#define HAVE_SYS_SYSCTL_H 1
-+/* #undef HAVE_SYS_SYSCTL_H */
- 
- /* Define to 1 if you have the <sys/time.h> header file. */
- #define HAVE_SYS_TIME_H 1
diff --git a/debian/patches/series b/debian/patches/series
index 281b6bc..50a346c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,4 +7,3 @@
 #07-bstrlib.patch
 #08-no-stream.patch
 10-debianize.patch
-11-hwloc-no-sysctl.patch

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