[Likwid-commit] [likwid] 08/09: fix debianize.patch

[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 479db9d67ec0f67b879172e3d6fecb3bf36681a7
Author: Christoph Martin <martin at uni-mainz.de>
Date:   Wed Feb 25 21:10:45 2015 +0100

    fix debianize.patch
---
 debian/patches/10-debianize.patch | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/debian/patches/10-debianize.patch b/debian/patches/10-debianize.patch
index 3730a47..27eeedf 100644
--- a/debian/patches/10-debianize.patch
+++ b/debian/patches/10-debianize.patch
@@ -17,10 +17,10 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  #ANSI_CFLAGS += -Wextra
  #ANSI_CFLAGS += -Wall
  
--CFLAGS   =  -O2  -Wno-format -std=c99
+-CFLAGS   =  -O2  -Wno-format -Wno-nonnull -std=c99
 -FCFLAGS  = -module ./  # ifort
 -#FCFLAGS  = -J ./  -fsyntax-only  #gfortran
-+CFLAGS   +=  -O2  -Wno-format -std=c99
++CFLAGS   +=  -O2  -Wno-format -Wno-nonnull -std=c99
 +#FCFLAGS  = -module ./  # ifort
 +FCFLAGS  = $(FFLAGS) -J ./  -fsyntax-only  #gfortran
  PASFLAGS  = x86-64
@@ -28,7 +28,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 -CPPFLAGS =
 -LFLAGS   =  -pthread
 +CPPFLAGS +=
-+LFLAGS   = $(LDFLAGS) -pthread
++LFLAGS   =  $(LDFLAGS) -pthread
  
  SHARED_CFLAGS = -fpic
 -SHARED_LFLAGS = -shared
@@ -47,7 +47,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  GENGROUPLOCK = .gengroup
  
  ifeq ($(COMPILER),MIC)
-@@ -205,18 +205,18 @@ $(DYNAMIC_TARGET_LIB): $(OBJ)
+@@ -209,18 +209,18 @@ $(DYNAMIC_TARGET_LIB): $(OBJ)
  
  $(DAEMON_TARGET): $(SRC_DIR)/access-daemon/accessDaemon.c
  	@echo "===>  Build access daemon $(DAEMON_TARGET)"
@@ -64,15 +64,15 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  
  $(PINLIB):
  	@echo "===>  CREATE LIB  $(PINLIB)"
--	$(Q)$(MAKE) -s -C src/pthread-overload/ $(PINLIB) 
+-	$(Q)$(MAKE) -s -C src/pthread-overload/ $(PINLIB)
 +	$(Q)$(MAKE) -C src/pthread-overload/ $(PINLIB)
  
  $(GENGROUPLOCK): $(foreach directory,$(shell ls $(GROUP_DIR)), $(wildcard $(GROUP_DIR)/$(directory)/*.txt))
  	@echo "===>  GENERATE GROUP HEADERS"
-@@ -319,11 +319,15 @@ install:
- 	@echo "===> INSTALL headers to $(PREFIX)/include"
- 	@mkdir -p $(PREFIX)/include
+@@ -329,11 +329,15 @@ install:
  	@cp -f src/includes/likwid*.h  $(PREFIX)/include/
+ 	@cp -f src/includes/*  $(PREFIX)/include/likwid
+ 	@cp -f GCC/perfmon_group_types.h  $(PREFIX)/include/likwid
 +	echo $(FORTRAN_INSTALL)
  	$(FORTRAN_INSTALL)
 -	@echo "===> INSTALL libraries to $(PREFIX)/lib"
@@ -89,12 +89,12 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  	@echo "===> INSTALL filters to $(LIKWIDFILTERPATH)"
  	@mkdir -p $(LIKWIDFILTERPATH)
  	@cp -f filters/*  $(LIKWIDFILTERPATH)
-@@ -344,8 +348,8 @@ uninstall:
- 	@rm -f $(MANPREFIX)/man1/feedGnuplot.1
+@@ -352,8 +356,8 @@ uninstall:
  	@echo "===> REMOVING headers from $(PREFIX)/include"
  	@rm -f $(PREFIX)/include/likwid*.h
+ 	@rm -rf $(PREFIX)/include/likwid
 -	@echo "===> REMOVING libs from $(PREFIX)/lib"
--	@rm -f $(PREFIX)/lib/$(LIKWID_LIB)* 
+-	@rm -f $(PREFIX)/lib/$(LIKWID_LIB)*
 +	@echo "===> REMOVING libs from $(LIBPREFIX)"
 +	@rm -f $(LIBPREFIX)/$(LIKWID_LIB)*
  	@echo "===> REMOVING filter from $(PREFIX)/share"

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