public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: sys-apps/likwid/files/, sys-apps/likwid/
@ 2016-07-19  9:44 Amy Winston
  0 siblings, 0 replies; 2+ messages in thread
From: Amy Winston @ 2016-07-19  9:44 UTC (permalink / raw
  To: gentoo-commits

commit:     773af2b3d89eab8d088f8f597588abf3342b369b
Author:     Amy Winston <amynka <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 19 09:41:48 2016 +0000
Commit:     Amy Winston <amynka <AT> gentoo <DOT> org>
CommitDate: Tue Jul 19 09:41:48 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=773af2b3

sys-apps/likwid: remove old. Brendan Horan.

Package-Manager: portage-2.2.28

 sys-apps/likwid/Manifest                           |  2 -
 sys-apps/likwid/files/likwid-3.1.3-Makefile.patch  | 42 ---------
 .../likwid/files/likwid-3.1.3-fix-gnustack.patch   | 32 -------
 sys-apps/likwid/files/likwid-4.0.1-Makefile.patch  | 39 ---------
 .../likwid/files/likwid-4.0.1-access-daemon.patch  | 11 ---
 sys-apps/likwid/files/likwid-4.0.1-config.mk.patch | 46 ----------
 .../likwid/files/likwid-4.0.1-fix-gnustack.patch   | 31 -------
 .../likwid/files/likwid-4.0.1-lua-makefile.patch   | 19 -----
 sys-apps/likwid/likwid-3.1.3.ebuild                | 67 ---------------
 sys-apps/likwid/likwid-4.0.1-r2.ebuild             | 99 ----------------------
 10 files changed, 388 deletions(-)

diff --git a/sys-apps/likwid/Manifest b/sys-apps/likwid/Manifest
index 87d5a9b..0c3bd6c 100644
--- a/sys-apps/likwid/Manifest
+++ b/sys-apps/likwid/Manifest
@@ -1,3 +1 @@
-DIST likwid-3.1.3.tar.gz 605675 SHA256 05078ec55dce3d4cf1c94832bd289ccbcaee7bdee9a1ea9f6681ccd3f59ece5b SHA512 e31b4498e702d4ddf61e3c123d43f0804ef4cef149bb3732b61e3894aa9d76feb7a2654bbb0467dd30323031122ea01cf17e4f01a33f193e750cdbdfc09741d7 WHIRLPOOL bccfcc68e792f09a66eab99affa81250fbe34d4759a81a4e0bd0af2535e5bb09229bee4bc165986559d14101183e5be9a933273ec9f1a7c5c8da3f97f07f9e8e
-DIST likwid-4.0.1.tar.gz 1409079 SHA256 ab384e585d99a7404075c48f78a08e892a75db12c348da6622ed0536a0a05c7f SHA512 f164a244e56afdc4409790b75f3cb4ea49cc91f7a210590de426f429db5717eed9691263580008cf69997be56a63009224012ee48c55f05b112f96cfca81c52e WHIRLPOOL 59392e6a2057fb9f9aa70b7cc0594ca7a665171b8a2302ddd9350930571596f14e5c9753d132eddb750ef8503330b4f456158fae7a99705c36e7aac80afa6bb2
 DIST likwid-4.1.1.tar.gz 1395475 SHA256 805b321c0c88e02ebddf89cd7e0097e40a438846cb033650c05a57d992393d3d SHA512 2561cc8203bf795ebe661a0b2f2e15fb68a164438b2c839482bab67a82babadbcfd78aaf519c4ceab6cfc799a363216023f77fe744e3b302facf5c578d7ab407 WHIRLPOOL 5be6036e726296719effcd3fbd272168cdf5f2581ede0bca0c554098a780018063b6527cd99202a8620dcc705246f2da1ad281c573eacfee8b4310a8dccbd4d7

diff --git a/sys-apps/likwid/files/likwid-3.1.3-Makefile.patch b/sys-apps/likwid/files/likwid-3.1.3-Makefile.patch
deleted file mode 100644
index a40d0c3..0000000
--- a/sys-apps/likwid/files/likwid-3.1.3-Makefile.patch
+++ /dev/null
@@ -1,42 +0,0 @@
---- Makefile.org	2015-03-04 16:25:59.942213571 +0800
-+++ Makefile	2015-03-04 16:46:05.640278082 +0800
-@@ -87,7 +87,7 @@
- 
- LIKWID_LIB = liblikwid
- ifeq ($(SHARED_LIBRARY),true)
--CFLAGS += $(SHARED_CFLAGS) -ggdb
-+CFLAGS += $(SHARED_CFLAGS) -g -Wa,--noexecstack
- DYNAMIC_TARGET_LIB := $(LIKWID_LIB).so
- TARGET_LIB := $(DYNAMIC_TARGET_LIB)
- LIBS += -L. -llikwid
-@@ -307,28 +307,8 @@
- 			echo "Only root can adjust the privileges of the daemon applications in $(PREFIX)/sbin"; \
- 		fi; \
- 	done
--	@echo "===> INSTALL man pages to $(MANPREFIX)/man1"
--	@mkdir -p $(MANPREFIX)/man1
--	@sed -e "s/<VERSION>/$(VERSION)/g" -e "s/<DATE>/$(DATE)/g" < $(DOC_DIR)/likwid-topology.1 > $(MANPREFIX)/man1/likwid-topology.1
--	@sed -e "s/<VERSION>/$(VERSION)/g" -e "s/<DATE>/$(DATE)/g" < $(DOC_DIR)/likwid-features.1 > $(MANPREFIX)/man1/likwid-features.1
--	@sed -e "s/<VERSION>/$(VERSION)/g" -e "s/<DATE>/$(DATE)/g" < $(DOC_DIR)/likwid-perfctr.1 > $(MANPREFIX)/man1/likwid-perfctr.1
--	@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)/likwid-setFrequencies.1 > $(MANPREFIX)/man1/likwid-setFrequencies.1
--	@sed -e "s/<VERSION>/$(VERSION)/g" -e "s/<DATE>/$(DATE)/g" < $(DOC_DIR)/likwid-bench.1 > $(MANPREFIX)/man1/likwid-bench.1
--	@sed -e "s/<VERSION>/$(VERSION)/g" -e "s/<DATE>/$(DATE)/g" < $(DOC_DIR)/feedGnuplot.1 > $(MANPREFIX)/man1/feedGnuplot.1
--	@sed -e "s/<VERSION>/$(VERSION)/g" -e "s/<DATE>/$(DATE)/g" < $(DOC_DIR)/likwid-accessD.1 > $(MANPREFIX)/man1/likwid-accessD.1
--	@sed -e "s/<VERSION>/$(VERSION)/g" -e "s/<DATE>/$(DATE)/g" < $(DOC_DIR)/likwid-genCfg.1 > $(MANPREFIX)/man1/likwid-genCfg.1
--	@sed -e "s/<VERSION>/$(VERSION)/g" -e "s/<DATE>/$(DATE)/g" < $(DOC_DIR)/likwid-memsweeper.1 > $(MANPREFIX)/man1/likwid-memsweeper.1
--	@sed -e "s/<VERSION>/$(VERSION)/g" -e "s/<DATE>/$(DATE)/g" < $(DOC_DIR)/likwid-mpirun.1 > $(MANPREFIX)/man1/likwid-mpirun.1
--	@sed -e "s/<VERSION>/$(VERSION)/g" -e "s/<DATE>/$(DATE)/g" < $(DOC_DIR)/likwid-perfscope.1 > $(MANPREFIX)/man1/likwid-perfscope.1
--	@sed -e "s/<VERSION>/$(VERSION)/g" -e "s/<DATE>/$(DATE)/g" < $(DOC_DIR)/likwid-setFreq.1 > $(MANPREFIX)/man1/likwid-setFreq.1
--	@chmod 644 $(MANPREFIX)/man1/likwid-*
--	@echo "===> INSTALL headers to $(PREFIX)/include"
--	@mkdir -p $(PREFIX)/include/likwid
--	@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 "===> INSTALL man pages"
-+	@mkdir -p $(PREFIX)/include/
- 	$(FORTRAN_INSTALL)
- 	@echo "===> INSTALL libraries to $(PREFIX)/lib"
- 	@mkdir -p $(PREFIX)/lib

diff --git a/sys-apps/likwid/files/likwid-3.1.3-fix-gnustack.patch b/sys-apps/likwid/files/likwid-3.1.3-fix-gnustack.patch
deleted file mode 100644
index 6ee4149..0000000
--- a/sys-apps/likwid/files/likwid-3.1.3-fix-gnustack.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-diff --git a/Makefile b/Makefile
-index eecd4e9..34eee7c 100644
---- a/Makefile
-+++ b/Makefile
-@@ -259,6 +259,7 @@ $(BUILD_DIR)/%.h:  $(SRC_DIR)/includes/%.txt
- $(BUILD_DIR)/%.o:  $(BUILD_DIR)/%.pas
- 	@echo "===>  ASSEMBLE  $@"
- 	$(Q)$(PAS) -i $(PASFLAGS) -o $(BUILD_DIR)/$*.s $<  '$(DEFINES)'
-+	@cat fix_gnustack.txt >> $(BUILD_DIR)/$*.s
- 	$(Q)$(AS) $(ASFLAGS)  $(BUILD_DIR)/$*.s -o $@
- 
- ifeq ($(findstring $(MAKECMDGOALS),clean),)
-diff --git a/fix_gnustack.txt b/fix_gnustack.txt
-new file mode 100644
-index 0000000..965af94
---- /dev/null
-+++ b/fix_gnustack.txt
-@@ -0,0 +1,3 @@
-+#if defined(__linux__) && defined(__ELF__)
-+.section .note.GNU-stack,"",%progbits
-+#endif
-diff --git a/src/loadData.s b/src/loadData.s
-index e176c53..9934f7d 100644
---- a/src/loadData.s
-+++ b/src/loadData.s
-@@ -20,3 +20,6 @@ ret
- .size _loadData, .-_loadData
- 
- 
-+#if defined(__linux__) && defined(__ELF__)
-+.section .note.GNU-stack,"",%progbits
-+#endif

diff --git a/sys-apps/likwid/files/likwid-4.0.1-Makefile.patch b/sys-apps/likwid/files/likwid-4.0.1-Makefile.patch
deleted file mode 100644
index 4601922..0000000
--- a/sys-apps/likwid/files/likwid-4.0.1-Makefile.patch
+++ /dev/null
@@ -1,39 +0,0 @@
---- Makefile.org	2015-08-24 10:58:52.694430235 +0800
-+++ Makefile	2015-08-24 10:54:27.114444154 +0800
-@@ -51,7 +51,6 @@
- 
- #CONFIGURE BUILD SYSTEM
- BUILD_DIR  = ./$(COMPILER)
--Q         ?= @
- GENGROUPLOCK = .gengroup
- 
- VPATH     = $(SRC_DIR)
-@@ -285,21 +284,6 @@
- 	@cd $(LIBPREFIX) && ln -fs liblikwidpin.so.$(VERSION) liblikwidpin.so
- 	@cd $(LIBPREFIX) && ln -fs $(shell basename $(TARGET_HWLOC_LIB)).$(VERSION) $(shell basename $(TARGET_HWLOC_LIB))
- 	@cd $(LIBPREFIX) && ln -fs $(shell basename $(TARGET_LUA_LIB)).$(VERSION) $(shell basename $(TARGET_LUA_LIB))
--	@echo "===> INSTALL man pages to $(MANPREFIX)/man1"
--	@mkdir -p $(MANPREFIX)/man1
--	@sed -e "s/<VERSION>/$(VERSION)/g" -e "s/<DATE>/$(DATE)/g" < $(DOC_DIR)/likwid-topology.1 > $(MANPREFIX)/man1/likwid-topology.1
--	@sed -e "s/<VERSION>/$(VERSION)/g" -e "s/<DATE>/$(DATE)/g" < $(DOC_DIR)/likwid-features.1 > $(MANPREFIX)/man1/likwid-features.1
--	@sed -e "s/<VERSION>/$(VERSION)/g" -e "s/<DATE>/$(DATE)/g" -e "s+<PREFIX>+$(PREFIX)+g" < $(DOC_DIR)/likwid-perfctr.1 > $(MANPREFIX)/man1/likwid-perfctr.1
--	@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
--	@sed -e "s/<VERSION>/$(VERSION)/g" -e "s/<DATE>/$(DATE)/g" < $(DOC_DIR)/likwid-accessD.1 > $(MANPREFIX)/man1/likwid-accessD.1
--	@sed -e "s/<VERSION>/$(VERSION)/g" -e "s/<DATE>/$(DATE)/g" < $(DOC_DIR)/likwid-genTopoCfg.1 > $(MANPREFIX)/man1/likwid-genTopoCfg.1
--	@sed -e "s/<VERSION>/$(VERSION)/g" -e "s/<DATE>/$(DATE)/g" < $(DOC_DIR)/likwid-memsweeper.1 > $(MANPREFIX)/man1/likwid-memsweeper.1
--	@sed -e "s/<VERSION>/$(VERSION)/g" -e "s/<DATE>/$(DATE)/g" < $(DOC_DIR)/likwid-mpirun.1 > $(MANPREFIX)/man1/likwid-mpirun.1
--	@sed -e "s/<VERSION>/$(VERSION)/g" -e "s/<DATE>/$(DATE)/g" < $(DOC_DIR)/likwid-perfscope.1 > $(MANPREFIX)/man1/likwid-perfscope.1
--	@sed -e "s/<VERSION>/$(VERSION)/g" -e "s/<DATE>/$(DATE)/g" < $(DOC_DIR)/likwid-setFreq.1 > $(MANPREFIX)/man1/likwid-setFreq.1
--	@chmod 644 $(MANPREFIX)/man1/likwid-*
- 	@echo "===> INSTALL headers to $(PREFIX)/include"
- 	@mkdir -p $(PREFIX)/include
- 	@install -m 644 src/includes/likwid.h  $(PREFIX)/include/
-@@ -363,6 +347,6 @@
- 		sed -i -e "s/<VERSION>/$(VERSION)/g" -e "s/<DATE>/$(DATE)/g" -e "s/<RELEASE>/$(RELEASE)/g" -e "s+$(PREFIX)/bin/likwid-lua+$(PWD)/ext/lua/lua+" -e "s+$(PREFIX)/share/lua/?.lua+$(PWD)/?.lua+" $$APP; \
- 		chmod +x $$APP; \
- 	done
--	@sed -i -e "s/<VERSION>/$(VERSION)/g" -e "s/<DATE>/$(DATE)/g" -e "s/<RELEASE>/$(RELEASE)/g" -e "s+$(PREFIX)/lib+$(PWD)+g" -e "s+$(PREFIX)/share/likwid/perfgroups+$(PWD)/groups+g" likwid.lua;
-+	@sed -i -e "s/<VERSION>/$(VERSION)/g" -e "s/<DATE>/$(DATE)/g" -e "s/<RELEASE>/$(RELEASE)/g" -e "s+$(PREFIX)/+$(PWD)+g" -e "s+$(PREFIX)/share/likwid/perfgroups+$(PWD)/groups+g" likwid.lua;
- 	@sed -i -e "s+$(PREFIX)/share/likwid/mongroups+$(PWD)/monitoring/groups+g" likwid-agent

diff --git a/sys-apps/likwid/files/likwid-4.0.1-access-daemon.patch b/sys-apps/likwid/files/likwid-4.0.1-access-daemon.patch
deleted file mode 100644
index 2652f24..0000000
--- a/sys-apps/likwid/files/likwid-4.0.1-access-daemon.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/configuration.c.orig	2015-11-14 09:10:58.283075033 +0100
-+++ src/configuration.c	2015-11-14 09:11:14.898074670 +0100
-@@ -68,7 +68,7 @@
- use_hardcoded:
-     ret = sprintf(filename,"%s", TOSTRING(ACCESSDAEMON));
-     filename[ret] = '\0';
--    if (!access(filename, R_OK))
-+    if (!access(filename, X_OK))
-     {
-         config.daemonPath = (char*)malloc((strlen(filename)+1) * sizeof(char));
-         strcpy(config.daemonPath, filename);

diff --git a/sys-apps/likwid/files/likwid-4.0.1-config.mk.patch b/sys-apps/likwid/files/likwid-4.0.1-config.mk.patch
deleted file mode 100644
index 2ca02bc..0000000
--- a/sys-apps/likwid/files/likwid-4.0.1-config.mk.patch
+++ /dev/null
@@ -1,46 +0,0 @@
---- config.mk.org	2015-08-24 19:46:39.354151547 +0800
-+++ config.mk	2015-08-24 19:49:31.040699137 +0800
-@@ -12,15 +12,15 @@
- PREFIX = /usr/local#NO SPACE
- MANPREFIX = $(PREFIX)/man#NO SPACE
- BINPREFIX = $(PREFIX)/bin#NO SPACE
--LIBPREFIX = $(PREFIX)/lib#NO SPACE
-+LIBPREFIX = $(PREFIX)/$(get_libdir)#NO SPACE
- 
- # These paths are hardcoded into executables and libraries. Usually
- # they'll be the same as above, but package maintainers may want to
- # distinguish between the image directories and the final install
- # target.
--INSTALLED_PREFIX=$(PREFIX)
-+INSTALLED_PREFIX=/usr
- INSTALLED_BINPREFIX = $(INSTALLED_PREFIX)/bin#NO SPACE
--INSTALLED_LIBPREFIX = $(INSTALLED_PREFIX)/lib#NO SPACE
-+INSTALLED_LIBPREFIX = $(INSTALLED_PREFIX)/$(get_libdir)#NO SPACE
- 
- # chown installed tools to this user/group
- INSTALL_CHOWN = -g root -o root
-@@ -42,14 +42,14 @@
- ACCESSMODE = accessdaemon$#NO SPACE
- 
- # Change to true to a build shared library instead of a static one
--SHARED_LIBRARY = true#NO SPACE
-+SHARED_LIBRARY = true
- 
- # Build Fortran90 module interface for marker API. Adopt Fortran compiler
- # in ./make/include_<COMPILER>.mk if necessary. Default: ifort .
- FORTRAN_INTERFACE = false#NO SPACE
- 
- # Instrument likwid-bench for use with likwid-perfctr
--INSTRUMENT_BENCH = false#NO SPACE
-+INSTRUMENT_BENCH = true#NO SPACE
- 
- # Use Portable Hardware Locality (hwloc) instead of CPUID
- USE_HWLOC = true#NO SPACE
-@@ -67,6 +67,6 @@
- RELEASE = 0
- DATE    = 28.04.2015
- 
--LIBLIKWIDPIN = $(abspath $(PREFIX)/lib/liblikwidpin.so)
-+LIBLIKWIDPIN = $(abspath $(PREFIX)/$(get_libdir)/liblikwidpin.so)
- LIKWIDFILTERPATH = $(abspath $(PREFIX)/share/likwid/filter)
- 

diff --git a/sys-apps/likwid/files/likwid-4.0.1-fix-gnustack.patch b/sys-apps/likwid/files/likwid-4.0.1-fix-gnustack.patch
deleted file mode 100644
index a0eaadf..0000000
--- a/sys-apps/likwid/files/likwid-4.0.1-fix-gnustack.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- bench/Makefile.org	2015-08-22 13:56:17.242177531 +0800
-+++ bench/Makefile	2015-08-22 13:56:46.985086094 +0800
-@@ -118,6 +118,7 @@
- $(BUILD_DIR)/%.o:  $(BUILD_DIR)/%.pas
- 	@echo "===>  ASSEMBLE  $@"
- 	$(Q)$(PAS) -i $(PASFLAGS) -o $(BUILD_DIR)/$*.s $<  '$(DEFINES)'
-+	@cat ../b/fix_gnustack.txt >> $(BUILD_DIR)/$*.s
- 	$(Q)$(AS) $(ASFLAGS)  $(BUILD_DIR)/$*.s -o $@
- 
- ifeq ($(findstring $(MAKECMDGOALS),clean),)
-
-diff --git a/fix_gnustack.txt b/fix_gnustack.txt
-new file mode 100644
-index 0000000..965af94
---- /dev/null
-+++ b/fix_gnustack.txt
-@@ -0,0 +1,3 @@
-+#if defined(__linux__) && defined(__ELF__)
-+.section .note.GNU-stack,"",%progbits
-+#endif
-
---- src/loadData.S.org	2015-08-22 14:26:28.634629884 +0800
-+++ src/loadData.S	2015-08-22 14:28:42.247210117 +0800
-@@ -41,4 +41,6 @@
- #endif
- .size _loadData, .-_loadData
- 
--
-+#if defined(__linux__) && defined(__ELF__)
-+.section .note.GNU-stack,"",%progbits
-+#endif

diff --git a/sys-apps/likwid/files/likwid-4.0.1-lua-makefile.patch b/sys-apps/likwid/files/likwid-4.0.1-lua-makefile.patch
deleted file mode 100644
index 9606510..0000000
--- a/sys-apps/likwid/files/likwid-4.0.1-lua-makefile.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Patch provided from upstream
-Add dependencies for Lua libraries to Makefile so that it can be build with multiple make jobs
-https://github.com/rrze-likwid/likwid/commit/bf12653e199d6d60055982bd92b284f44197bccf
-
---- ext/lua/Makefile.org	2015-08-21 09:53:48.430859982 +0800
-+++ ext/lua/Makefile	2015-08-21 09:51:50.905236819 +0800
-@@ -42,10 +42,10 @@
- $(BUILD_DIR):
- 	@mkdir $(BUILD_DIR)
- 
--$(STATIC_LIBLUA):
-+$(STATIC_LIBLUA): $(OBJ)
- 	$(Q)${AR} -cq $(LIBLUA) $(OBJ)
- 
--$(SHARED_LIBLUA):
-+$(SHARED_LIBLUA): $(OBJ)
- 	$(Q)$(CC) $(LFLAGS) -Wl,-soname,$(LIBLUA).$(VERSION) -shared -fPIC -o $(LIBLUA) $(OBJ) $(LIBS)
- 
- $(INTERPRETER): $(SHARED_LIBLUA) $(BUILD_DIR)/lua.o

diff --git a/sys-apps/likwid/likwid-3.1.3.ebuild b/sys-apps/likwid/likwid-3.1.3.ebuild
deleted file mode 100644
index 5ecba88..0000000
--- a/sys-apps/likwid/likwid-3.1.3.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-FORTRAN_NEEDED=fortran
-
-inherit eutils fcaps fortran-2 linux-info multilib
-
-DESCRIPTION="A lightweight performance-oriented tool suite for x86 multicore environments"
-HOMEPAGE="https://github.com/rrze-likwid/likwid"
-SRC_URI="http://ftp.fau.de/pub/likwid/likwid-${PV}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="-fortran"
-
-RDEPEND="dev-lang/perl"
-DEPEND="${RDEPEND}
-	sys-apps/sed"
-
-CONFIG_CHECK="~X86_MSR"
-
-FILECAPS=(
-	cap_sys_rawio usr/sbin/likwid-accessD --
-	cap_sys_rawio usr/bin/likwid-{perfctr,bench,powermeter}
-)
-
-src_prepare() {
-	sed -e 's:^PREFIX = .*:PREFIX = '${D}'/usr:' \
-		-e "/^LIBLIKWIDPIN/s|lib/|$(get_libdir)/|" \
-		-i config.mk || die
-	sed -e "s:\$(PREFIX)/lib:\$(PREFIX)/$(get_libdir):" \
-		-i Makefile || die
-
-	sed -e '/LIBS/aSHARED_LFLAGS += -Wl,-soname,$@' \
-		-i make/include_GCC.mk || die
-	sed -e '/^Q/d' -i Makefile || die
-	sed -e 's/<DATE>/12.02.2014/g' \
-		-e "s/VERSION/${PV}/g" \
-		-i doc/* || die
-	sed -e "/exeprog/s|TOSTRING(ACCESSDAEMON)|\"/usr/sbin/likwid-accessD\"|" \
-		-i src/accessClient.c || die
-
-	epatch "${FILESDIR}/${P}-Makefile.patch"
-	epatch "${FILESDIR}/${P}-fix-gnustack.patch"
-}
-
-src_configure() {
-	if use fortran; then
-		sed -i 's:^FORTRAN_INTERFACE = false:FORTRAN_INTERFACE = likwid.mod:' config.mk || die
-		sed -i 's:^FC  = ifort:FC  = gfortran:' make/include_GCC.mk || die
-		sed -i '/^FCFLAGS/c\FCFLAGS  = -J ./ -fsyntax-only' make/include_GCC.mk || die
-	fi
-}
-
-src_install () {
-	default
-	if use fortran; then
-		insinto /usr/include
-		doins likwid.mod
-	fi
-
-	doman doc/*
-}

diff --git a/sys-apps/likwid/likwid-4.0.1-r2.ebuild b/sys-apps/likwid/likwid-4.0.1-r2.ebuild
deleted file mode 100644
index 7d68628..0000000
--- a/sys-apps/likwid/likwid-4.0.1-r2.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-FORTRAN_NEEDED=fortran
-
-inherit eutils fcaps linux-info multilib fortran-2
-
-DESCRIPTION="A performance-oriented tool suite for x86 multicore environments"
-HOMEPAGE="https://github.com/rrze-likwid/likwid"
-# Upstream have made a habit of making changes to the tagged realesed tarball
-SRC_URI="https://dev.gentoo.org/~idella4/tarballs/likwid-${PV}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="fortran"
-
-RDEPEND="dev-lang/perl"
-
-DEPEND="${RDEPEND}
-	fortran? ( sys-devel/gcc:*[fortran] )
-	dev-lang/lua:0"
-
-RESTRICT="mirror"
-
-CONFIG_CHECK="~X86_MSR"
-
-FILECAPS=(
-	-M 755 cap_sys_rawio usr/sbin/likwid-accessD --
-	-M 755 cap_sys_rawio usr/bin/likwid-{perfctr,bench,powermeter}
-)
-
-S=${WORKDIR}/likwid-likwid-${PV}
-
-src_prepare() {
-	# See Bug 558402
-	epatch "${FILESDIR}"/${P}-Makefile.patch \
-			"${FILESDIR}"/${P}-fix-gnustack.patch \
-			"${FILESDIR}"/${P}-lua-makefile.patch \
-			"${FILESDIR}"/${P}-config.mk.patch \
-			"${FILESDIR}"/${P}-access-daemon.patch
-
-	# Set PREFIX path to include sandbox path
-	sed -e 's:^PREFIX = .*:PREFIX = '${D}'/usr:' -i config.mk || die
-
-	# Set the path to library directory.
-	sed -e 's:$(get_libdir):'$(get_libdir)':' -i config.mk || die "Cannot set library path!"
-
-	# Set correct LDFLAGS
-	sed -e '/LIBS/aSHARED_LFLAGS += -Wl,-soname,$@' \
-		-i make/include_GCC.mk || die
-
-	# Insert date and version info man pages
-	sed -e 's/<DATE>/21.08.2015/g' \
-		-e "s/VERSION/${PV}/g" \
-		-i doc/*.1 || die
-
-	# Set path to the access daemon, once installed into the system
-	sed -e "/exeprog/s|TOSTRING(ACCESSDAEMON)|\"/usr/sbin/likwid-accessD\"|" \
-		-i src/accessClient.c || die
-
-	# Ensure we build with a non executable stack
-	sed -e "s:CFLAGS += \$(SHARED_CFLAGS):CFLAGS += \$(SHARED_CFLAGS) -g -Wa,--noexecstack:" \
-	        -i make/config_defines.mk || die
-
-	if use fortran; then
-
-		# If fortran USE is enabled, enable the fortran interfaces
-		sed -i 's:^FORTRAN_INTERFACE = false:FORTRAN_INTERFACE = likwid.mod:' config.mk || die
-
-		# Set the correct fortrant compiler for GCC
-		sed -i "s:^FC  = ifort:FC = ${FC}:" make/include_GCC.mk || die
-
-		# Set the correct FCFLAGS for gcc fortran
-		sed -i '/^FCFLAGS/c\FCFLAGS  = -J ./ -fsyntax-only' make/include_GCC.mk || die
-	fi
-
-}
-
-src_install () {
-	default
-	if use fortran; then
-		insinto /usr/include
-		doins likwid.mod
-	fi
-
-	doman doc/*.1
-}
-
-pkg_postinst() {
-	fcaps_pkg_postinst
-	ewarn "To enable users to access performance counters it is necessary to"
-	ewarn "change the access permissions to /dev/cpu/msr[0]* devices."
-	ewarn "It can be accomplished by adding the following line to file"
-	ewarn "/etc/udev/rules.d/99-myrules.rules: KERNEL==\"msr[0-9]*\" MODE=\"0666\""
-}


^ permalink raw reply related	[flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-apps/likwid/files/, sys-apps/likwid/
@ 2016-07-19  9:44 Amy Winston
  0 siblings, 0 replies; 2+ messages in thread
From: Amy Winston @ 2016-07-19  9:44 UTC (permalink / raw
  To: gentoo-commits

commit:     025b9960bc77949539e5b6f6baf2918ef09b12a2
Author:     Amy Winston <amynka <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 19 09:38:36 2016 +0000
Commit:     Amy Winston <amynka <AT> gentoo <DOT> org>
CommitDate: Tue Jul 19 09:38:36 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=025b9960

sys-apps/likwid: version bump 4.1.1 bug #588830. Brendan Horan

Package-Manager: portage-2.2.28

 sys-apps/likwid/Manifest                           |  1 +
 sys-apps/likwid/files/likwid-4.1.1-Makefile.patch  | 19 +++++
 sys-apps/likwid/files/likwid-4.1.1-config.mk.patch | 43 ++++++++++
 .../likwid/files/likwid-4.1.1-fix-gnustack.patch   | 31 +++++++
 sys-apps/likwid/likwid-4.1.1.ebuild                | 98 ++++++++++++++++++++++
 5 files changed, 192 insertions(+)

diff --git a/sys-apps/likwid/Manifest b/sys-apps/likwid/Manifest
index 2b503e5..87d5a9b 100644
--- a/sys-apps/likwid/Manifest
+++ b/sys-apps/likwid/Manifest
@@ -1,2 +1,3 @@
 DIST likwid-3.1.3.tar.gz 605675 SHA256 05078ec55dce3d4cf1c94832bd289ccbcaee7bdee9a1ea9f6681ccd3f59ece5b SHA512 e31b4498e702d4ddf61e3c123d43f0804ef4cef149bb3732b61e3894aa9d76feb7a2654bbb0467dd30323031122ea01cf17e4f01a33f193e750cdbdfc09741d7 WHIRLPOOL bccfcc68e792f09a66eab99affa81250fbe34d4759a81a4e0bd0af2535e5bb09229bee4bc165986559d14101183e5be9a933273ec9f1a7c5c8da3f97f07f9e8e
 DIST likwid-4.0.1.tar.gz 1409079 SHA256 ab384e585d99a7404075c48f78a08e892a75db12c348da6622ed0536a0a05c7f SHA512 f164a244e56afdc4409790b75f3cb4ea49cc91f7a210590de426f429db5717eed9691263580008cf69997be56a63009224012ee48c55f05b112f96cfca81c52e WHIRLPOOL 59392e6a2057fb9f9aa70b7cc0594ca7a665171b8a2302ddd9350930571596f14e5c9753d132eddb750ef8503330b4f456158fae7a99705c36e7aac80afa6bb2
+DIST likwid-4.1.1.tar.gz 1395475 SHA256 805b321c0c88e02ebddf89cd7e0097e40a438846cb033650c05a57d992393d3d SHA512 2561cc8203bf795ebe661a0b2f2e15fb68a164438b2c839482bab67a82babadbcfd78aaf519c4ceab6cfc799a363216023f77fe744e3b302facf5c578d7ab407 WHIRLPOOL 5be6036e726296719effcd3fbd272168cdf5f2581ede0bca0c554098a780018063b6527cd99202a8620dcc705246f2da1ad281c573eacfee8b4310a8dccbd4d7

diff --git a/sys-apps/likwid/files/likwid-4.1.1-Makefile.patch b/sys-apps/likwid/files/likwid-4.1.1-Makefile.patch
new file mode 100644
index 0000000..cec5d59
--- /dev/null
+++ b/sys-apps/likwid/files/likwid-4.1.1-Makefile.patch
@@ -0,0 +1,19 @@
+--- likwid-likwid-4.1.1/Makefile.org	2016-07-14 12:09:56.612963529 +0800
++++ likwid-likwid-4.1.1/Makefile	2016-07-14 12:11:24.148645584 +0800
+@@ -51,7 +51,6 @@
+ 
+ #CONFIGURE BUILD SYSTEM
+ BUILD_DIR  = ./$(COMPILER)
+-Q         ?= @
+ GENGROUPLOCK = .gengroup
+ 
+ VPATH     = $(SRC_DIR)
+@@ -544,7 +543,7 @@
+ 		sed -i -e "s/<VERSION>/$(VERSION)/g" -e "s/<DATE>/$(DATE)/g" -e "s/<RELEASE>/$(RELEASE)/g" -e "s+$(PREFIX)/bin/likwid-lua+$(PWD)/ext/lua/lua+" -e "s+$(PREFIX)/share/lua/?.lua+$(PWD)/?.lua+" -e "s+$(PREFIX)/bin/likwid-pin+$(PWD)/likwid-pin+" -e "s+$(PREFIX)/bin/likwid-perfctr+$(PWD)/likwid-perfctr+" $$APP; \
+ 		chmod +x $$APP; \
+ 	done
+-	@sed -i -e "s/<VERSION>/$(VERSION)/g" -e "s/<DATE>/$(DATE)/g" -e "s/<RELEASE>/$(RELEASE)/g" -e "s+$(PREFIX)/lib+$(PWD)+g" -e "s+$(PREFIX)/share/likwid/perfgroups+$(PWD)/groups+g" likwid.lua;
++	@sed -i -e "s/<VERSION>/$(VERSION)/g" -e "s/<DATE>/$(DATE)/g" -e "s/<RELEASE>/$(RELEASE)/g" -e "s+$(PREFIX)/+$(PWD)+g" -e "s+$(PREFIX)/share/likwid/perfgroups+$(PWD)/groups+g" likwid.lua;
+ 	@sed -i -e "s+$(PREFIX)/share/likwid/mongroups+$(PWD)/monitoring/groups+g" likwid-agent
+ 	@ln -sf liblikwid.so liblikwid.so.$(VERSION)
+ 	@ln -sf ext/hwloc/liblikwid-hwloc.so liblikwid-hwloc.so.$(VERSION)

diff --git a/sys-apps/likwid/files/likwid-4.1.1-config.mk.patch b/sys-apps/likwid/files/likwid-4.1.1-config.mk.patch
new file mode 100644
index 0000000..36897e5
--- /dev/null
+++ b/sys-apps/likwid/files/likwid-4.1.1-config.mk.patch
@@ -0,0 +1,43 @@
+--- likwid-likwid-4.1.1/config.mk.org	2016-07-14 12:49:27.791771509 +0800
++++ likwid-likwid-4.1.1/config.mk	2016-07-14 12:51:27.470358158 +0800
+@@ -15,9 +15,9 @@
+ # Common users do not need to change values below this comment! #
+ #################################################################
+ 
+-MANPREFIX = $(PREFIX)/man#NO SPACE
++MANPREFIX = ${D}/usr/share/man#NO SPACE
+ BINPREFIX = $(PREFIX)/bin#NO SPACE
+-LIBPREFIX = $(PREFIX)/lib#NO SPACE
++LIBPREFIX = $(PREFIX)/$(get_libdir)#NO SPACE
+ 
+ # These paths are hardcoded into executables and libraries. Usually
+ # they'll be the same as above, but package maintainers may want to
+@@ -26,9 +26,9 @@
+ # Keep in mind that the access and setFreq daemon need enough
+ # privileges that may be deleted when copying the files to
+ # the INTSTALLED_PREFIX
+-INSTALLED_PREFIX = $(PREFIX)#NO SPACE
++INSTALLED_PREFIX=/usr#NO SPACE
+ INSTALLED_BINPREFIX = $(INSTALLED_PREFIX)/bin#NO SPACE
+-INSTALLED_LIBPREFIX = $(INSTALLED_PREFIX)/lib#NO SPACE
++INSTALLED_LIBPREFIX = $(INSTALLED_PREFIX)/$(get_libdir)#NO SPACE
+ 
+ # chown installed tools to this user/group
+ # if you change anything here, make sure that the user/group can access
+@@ -59,7 +59,7 @@
+ FORTRAN_INTERFACE = false#NO SPACE
+ 
+ # Instrument likwid-bench for use with likwid-perfctr
+-INSTRUMENT_BENCH = false#NO SPACE
++INSTRUMENT_BENCH = true#NO SPACE
+ 
+ # Use recommended Portable Hardware Locality (hwloc) instead of CPUID
+ USE_HWLOC = true#NO SPACE
+@@ -80,6 +80,6 @@
+ DATE    = 19.05.2016
+ 
+ RPATHS = -Wl,-rpath=$(INSTALLED_LIBPREFIX)
+-LIBLIKWIDPIN = $(abspath $(INSTALLED_PREFIX)/lib/liblikwidpin.so.$(VERSION).$(RELEASE))
++LIBLIKWIDPIN = $(abspath $(PREFIX)/$(get_libdir)/liblikwidpin.so)
+ LIKWIDFILTERPATH = $(abspath $(INSTALLED_PREFIX)/share/likwid/filter)
+ LIKWIDGROUPPATH = $(abspath $(INSTALLED_PREFIX)/share/likwid/perfgroups)

diff --git a/sys-apps/likwid/files/likwid-4.1.1-fix-gnustack.patch b/sys-apps/likwid/files/likwid-4.1.1-fix-gnustack.patch
new file mode 100644
index 0000000..a5a046d
--- /dev/null
+++ b/sys-apps/likwid/files/likwid-4.1.1-fix-gnustack.patch
@@ -0,0 +1,31 @@
+--- likwid-likwid-4.1.1/bench/Makefile.org	2015-08-22 13:56:17.242177531 +0800
++++ likwid-likwid-4.1.1/bench/Makefile	2015-08-22 13:56:46.985086094 +0800
+@@ -118,6 +118,7 @@
+ $(BUILD_DIR)/%.o:  $(BUILD_DIR)/%.pas
+ 	@echo "===>  ASSEMBLE  $@"
+ 	$(Q)$(PAS) -i $(PASFLAGS) -o $(BUILD_DIR)/$*.s $<  '$(DEFINES)'
++	@cat ../fix_gnustack.txt >> $(BUILD_DIR)/$*.s
+ 	$(Q)$(AS) $(ASFLAGS)  $(BUILD_DIR)/$*.s -o $@
+ 
+ ifeq ($(findstring $(MAKECMDGOALS),clean),)
+
+diff --git a/fix_gnustack.txt b/fix_gnustack.txt
+new file mode 100644
+index 0000000..965af94
+--- /dev/null
++++ likwid-likwid-4.1.1/fix_gnustack.txt
+@@ -0,0 +1,3 @@
++#if defined(__linux__) && defined(__ELF__)
++.section .note.GNU-stack,"",%progbits
++#endif
+
+--- likwid-likwid-4.1.1/src/loadData.S.org	2015-08-22 14:26:28.634629884 +0800
++++ likwid-likwid-4.1.1/src/loadData.S	2015-08-22 14:28:42.247210117 +0800
+@@ -41,4 +41,6 @@
+ #endif
+ .size _loadData, .-_loadData
+ 
+-
++#if defined(__linux__) && defined(__ELF__)
++.section .note.GNU-stack,"",%progbits
++#endif

diff --git a/sys-apps/likwid/likwid-4.1.1.ebuild b/sys-apps/likwid/likwid-4.1.1.ebuild
new file mode 100644
index 0000000..c7f11c8
--- /dev/null
+++ b/sys-apps/likwid/likwid-4.1.1.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+FORTRAN_NEEDED=fortran
+
+inherit eutils fcaps linux-info multilib fortran-2
+
+DESCRIPTION="A performance-oriented tool suite for x86 multicore environments"
+HOMEPAGE="https://github.com/rrze-likwid/likwid"
+SRC_URI="https://github.com/RRZE-HPC/likwid/archive/likwid-4.1.1.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="fortran"
+
+RDEPEND="dev-lang/perl"
+
+DEPEND="${RDEPEND}
+	fortran? ( sys-devel/gcc:*[fortran] )
+	dev-lang/lua:0"
+
+CONFIG_CHECK="~X86_MSR"
+
+FILECAPS=(
+	-M 755 cap_sys_rawio usr/sbin/likwid-accessD --
+	-M 755 cap_sys_rawio usr/bin/likwid-{perfctr,bench,powermeter}
+)
+
+# See Bug 558402
+PATCHES=(
+	"${FILESDIR}/${P}-Makefile.patch"
+	"${FILESDIR}/${P}-fix-gnustack.patch"
+	"${FILESDIR}/${P}-config.mk.patch"
+)
+
+S=${WORKDIR}/likwid-likwid-${PV}
+
+src_prepare() {
+	# Set PREFIX path to include sandbox path
+	sed -e 's:^PREFIX = .*:PREFIX = '${D}'/usr:' -i config.mk || die
+
+	# Set the path to library directory.
+	sed -e 's:$(get_libdir):'$(get_libdir)':' -i config.mk || die "Cannot set library path!"
+
+	# Set correct LDFLAGS
+	sed -e '/LIBS/aSHARED_LFLAGS += -Wl,-soname,$@' \
+		-i make/include_GCC.mk || die
+
+	# Insert date and version info man pages
+	sed -e 's/<DATE>/21.08.2015/g' \
+		-e "s/VERSION/${PV}/g" \
+		-i doc/*.1 || die
+
+	# Set path to the access daemon, once installed into the system
+	sed -e "/exeprog/s|TOSTRING(ACCESSDAEMON)|\"/usr/sbin/likwid-accessD\"|" \
+		-i src/access_client.c || die
+
+	# Ensure we build with a non executable stack
+	sed -e "s:CFLAGS += \$(SHARED_CFLAGS):CFLAGS += \$(SHARED_CFLAGS) -g -Wa,--noexecstack:" \
+	        -i make/config_defines.mk || die
+
+	if use fortran; then
+
+		# If fortran USE is enabled, enable the fortran interfaces
+		sed -i 's:^FORTRAN_INTERFACE = false:FORTRAN_INTERFACE = likwid.mod:' config.mk || die
+
+		# Set the correct fortrant compiler for GCC
+		sed -i "s:^FC  = ifort:FC = ${FC}:" make/include_GCC.mk || die
+
+		# Set the correct FCFLAGS for gcc fortran
+		sed -i '/^FCFLAGS/c\FCFLAGS  = -J ./ -fsyntax-only' make/include_GCC.mk || die
+	fi
+
+	default
+
+}
+
+src_install () {
+	default
+	if use fortran; then
+		insinto /usr/include
+		doins likwid.mod
+	fi
+
+	doman doc/*.1
+}
+
+pkg_postinst() {
+	fcaps_pkg_postinst
+	ewarn "To enable users to access performance counters it is necessary to"
+	ewarn "change the access permissions to /dev/cpu/msr[0]* devices."
+	ewarn "It can be accomplished by adding the following line to file"
+	ewarn "/etc/udev/rules.d/99-myrules.rules: KERNEL==\"msr[0-9]*\" MODE=\"0666\""
+}


^ permalink raw reply related	[flat|nested] 2+ messages in thread
end of thread, other threads:[~2016-07-19  9:50 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-07-19  9:44 [gentoo-commits] repo/gentoo:master commit in: sys-apps/likwid/files/, sys-apps/likwid/ Amy Winston
  -- strict thread matches above, loose matches on Subject: below --
2016-07-19  9:44 Amy Winston

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox