[Likwid-commit] [likwid] 02/04: fix verbose compile

Christoph Martin chrism at debian.org
Fri Jan 13 16:01:38 UTC 2017


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

chrism pushed a commit to branch master
in repository likwid.

commit 9c902adb3ff825011ccaa859e5bb4ae2fe39930f
Author: Christoph Martin <martin at uni-mainz.de>
Date:   Thu Jan 12 17:14:32 2017 +0100

    fix verbose compile
---
 debian/patches/10-debianize.patch | 28 ++++++++++++++++++----------
 1 file changed, 18 insertions(+), 10 deletions(-)

diff --git a/debian/patches/10-debianize.patch b/debian/patches/10-debianize.patch
index 09cf9d5..788c645 100644
--- a/debian/patches/10-debianize.patch
+++ b/debian/patches/10-debianize.patch
@@ -38,16 +38,24 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  DEFINES  += -DLIKWID_MONITOR_LOCK
 --- a/Makefile
 +++ b/Makefile
-@@ -55,7 +55,7 @@ endif
+@@ -32,7 +32,7 @@ GROUP_DIR   = ./groups
+ FILTER_DIR  = ./filters
+ MAKE_DIR    = ./make
+ 
+-Q         ?= @
++#Q         ?= @
+ 
+ #DO NOT EDIT BELOW
+ 
+@@ -55,7 +55,6 @@ endif
  
  #CONFIGURE BUILD SYSTEM
  BUILD_DIR  = ./$(COMPILER)
 -Q         ?= @
-+#Q         ?= @
  GENGROUPLOCK = .gengroup
  
  VPATH     = $(SRC_DIR)
-@@ -92,7 +92,7 @@ ifeq ($(BUILDFREQ),true)
+@@ -92,7 +91,7 @@ ifeq ($(BUILDFREQ),true)
  	L_APPS += likwid-setFrequencies
  endif
  
@@ -56,7 +64,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  
  all: $(BUILD_DIR) $(PERFMONHEADERS) $(OBJ) $(TARGET_LIB) $(FORTRAN_IF)  $(PINLIB) $(L_APPS) $(L_HELPER) $(DAEMON_TARGET) $(FREQ_TARGET) $(BENCH_TARGET)
  
-@@ -113,7 +113,8 @@ docs:
+@@ -113,7 +112,8 @@ docs:
  $(L_APPS):  $(addprefix $(SRC_DIR)/applications/,$(addsuffix  .lua,$(L_APPS)))
  	@echo "===>  ADJUSTING  $@"
  	@if [ "$(ACCESSMODE)" = "direct" ]; then sed -i -e s/"access_mode = 1"/"access_mode = 0"/g $(SRC_DIR)/applications/$@.lua;fi
@@ -66,7 +74,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  		-e s/'<INSTALLED_PREFIX>'/$(subst /,\\/,$(INSTALLED_PREFIX))/g \
  		-e s/'<VERSION>'/$(VERSION).$(RELEASE)/g \
  		-e s/'<DATE>'/$(DATE)/g \
-@@ -125,7 +126,7 @@ $(L_APPS):  $(addprefix $(SRC_DIR)/appli
+@@ -125,7 +125,7 @@ $(L_APPS):  $(addprefix $(SRC_DIR)/appli
  
  $(L_HELPER):
  	@echo "===>  ADJUSTING  $@"
@@ -75,7 +83,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  		-e s/'<INSTALLED_LIBPREFIX>'/$(subst /,\\/,$(INSTALLED_LIBPREFIX))/g \
  		-e s/'<INSTALLED_PREFIX>'/$(subst /,\\/,$(INSTALLED_PREFIX))/g \
  		-e s/'<LIKWIDGROUPPATH>'/$(subst /,\\/,$(LIKWIDGROUPPATH))/g \
-@@ -134,13 +135,13 @@ $(L_HELPER):
+@@ -134,13 +134,13 @@ $(L_HELPER):
  		-e s/'<RELEASE>'/$(RELEASE)/g \
  		$(SRC_DIR)/applications/$@ > $@
  
@@ -92,7 +100,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  
  $(DAEMON_TARGET): $(SRC_DIR)/access-daemon/accessDaemon.c
  	@echo "===>  BUILD access daemon likwid-accessD"
-@@ -215,7 +216,7 @@ endif
+@@ -215,7 +215,7 @@ endif
  
  .NOTPARALLEL:
  
@@ -101,7 +109,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  	@echo "===>  CLEAN"
  	@for APP in $(L_APPS); do \
  		rm -f $$APP; \
-@@ -227,7 +228,7 @@ clean: $(TARGET_LUA_LIB) $(TARGET_HWLOC_
+@@ -227,7 +227,7 @@ clean: $(TARGET_LUA_LIB) $(TARGET_HWLOC_
  	@rm -f $(FORTRAN_IF_NAME)
  	@rm -f $(FREQ_TARGET) $(DAEMON_TARGET)
  
@@ -110,7 +118,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  	@echo "===>  DIST CLEAN"
  	@for APP in $(L_APPS); do \
  		rm -f $$APP; \
-@@ -358,8 +359,8 @@ install: install_daemon install_freq
+@@ -358,8 +358,8 @@ install: install_daemon install_freq
  	@echo "===> INSTALL man pages to $(MANPREFIX)/man1"
  	@mkdir -p $(MANPREFIX)/man1
  	@chmod 775 $(MANPREFIX)/man1
@@ -121,7 +129,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  	@sed -e "s/<VERSION>/$(VERSION)/g" -e "s/<DATE>/$(DATE)/g" < $(DOC_DIR)/likwid-powermeter.1 > $(MANPREFIX)/man1/likwid-powermeter.1
  	@sed -e "s/<VERSION>/$(VERSION)/g" -e "s/<DATE>/$(DATE)/g" < $(DOC_DIR)/likwid-pin.1 > $(MANPREFIX)/man1/likwid-pin.1
  	@sed -e "s/<VERSION>/$(VERSION)/g" -e "s/<DATE>/$(DATE)/g" < $(DOC_DIR)/feedGnuplot.1 > $(MANPREFIX)/man1/feedGnuplot.1
-@@ -401,7 +402,7 @@ install: install_daemon install_freq
+@@ -401,7 +401,7 @@ install: install_daemon install_freq
  	@chmod 775 $(PREFIX)/share/likwid/examples
  	@install -m 644 examples/* $(PREFIX)/share/likwid/examples
  	@echo "===> INSTALL default likwid-agent.conf to $(PREFIX)/share/likwid/mongroups"

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



More information about the Likwid-commit mailing list