From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id C1D5E1385B4 for ; Sun, 16 Aug 2015 13:25:24 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 132D4E05C1; Sun, 16 Aug 2015 13:25:24 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 5D6FDE076D for ; Sun, 16 Aug 2015 13:25:23 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 00D11340967 for ; Sun, 16 Aug 2015 13:25:21 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 3172314D for ; Sun, 16 Aug 2015 13:25:20 +0000 (UTC) From: "Naohiro Aota" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Naohiro Aota" Message-ID: <1439731489.2a84d30e55502c01c27fa176e3e09c09c59361d7.naota@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/perf/, dev-util/perf/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-util/perf/files/perf-4.1.5-prefix.patch dev-util/perf/perf-4.1.5-r1.ebuild dev-util/perf/perf-4.1.5.ebuild X-VCS-Directories: dev-util/perf/ dev-util/perf/files/ X-VCS-Committer: naota X-VCS-Committer-Name: Naohiro Aota X-VCS-Revision: 2a84d30e55502c01c27fa176e3e09c09c59361d7 X-VCS-Branch: master Date: Sun, 16 Aug 2015 13:25:20 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 8a1d75de-c74a-49ee-b2f3-8ba38c433cbf X-Archives-Hash: 095d291c3d0797dfabb46c7596ae3bda commit: 2a84d30e55502c01c27fa176e3e09c09c59361d7 Author: Naohiro Aota gentoo org> AuthorDate: Sun Aug 16 13:22:46 2015 +0000 Commit: Naohiro Aota gentoo org> CommitDate: Sun Aug 16 13:24:49 2015 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2a84d30e dev-util/perf: fix install dir perf binary and libs are accidentaly installed under / not /usr. Add a patch to fix "prefix=" behavior and reuse prefix argument. dev-util/perf/files/perf-4.1.5-prefix.patch | 43 ++++++++++++++++++++++ .../{perf-4.1.5.ebuild => perf-4.1.5-r1.ebuild} | 4 +- 2 files changed, 46 insertions(+), 1 deletion(-) diff --git a/dev-util/perf/files/perf-4.1.5-prefix.patch b/dev-util/perf/files/perf-4.1.5-prefix.patch new file mode 100644 index 0000000..0c4dff0 --- /dev/null +++ b/dev-util/perf/files/perf-4.1.5-prefix.patch @@ -0,0 +1,43 @@ +commit 75e84ab906ef8935cff3df3d8929f1bafea81599 +Author: Lukas Wunner +Date: Thu Jun 18 13:00:32 2015 +0200 + + perf tools: Fix build breakage if prefix= is specified + + Invoking Makefile.perf with prefix= breaks the build since Makefile.perf + hands that variable down to Makefile.build where it overrides + + prefix := $(subst ./,,$(OUTPUT)$(dir)/) + + leading to errors like this: + + No rule to make target '/usrabspath.o', needed by '/usrlibperf-in.o' + + Signed-off-by: Lukas Wunner + Acked-by: Jiri Olsa + Cc: David Ahern + Fixes: c819e2cf2eb6f65d3208d195d7a0edef6108d5 + Link: http://lkml.kernel.org/r/5582c48a.84a22b0a.a918.5285SMTPIN_ADDED_MISSING@mx.google.com + Signed-off-by: Arnaldo Carvalho de Melo + +diff --git a/tools/build/Makefile.build b/tools/build/Makefile.build +index 10df572..98cfc38 100644 +--- a/tools/build/Makefile.build ++++ b/tools/build/Makefile.build +@@ -94,12 +94,12 @@ obj-y := $(patsubst %/, %/$(obj)-in.o, $(obj-y)) + subdir-obj-y := $(filter %/$(obj)-in.o, $(obj-y)) + + # '$(OUTPUT)/dir' prefix to all objects +-prefix := $(subst ./,,$(OUTPUT)$(dir)/) +-obj-y := $(addprefix $(prefix),$(obj-y)) +-subdir-obj-y := $(addprefix $(prefix),$(subdir-obj-y)) ++objprefix := $(subst ./,,$(OUTPUT)$(dir)/) ++obj-y := $(addprefix $(objprefix),$(obj-y)) ++subdir-obj-y := $(addprefix $(objprefix),$(subdir-obj-y)) + + # Final '$(obj)-in.o' object +-in-target := $(prefix)$(obj)-in.o ++in-target := $(objprefix)$(obj)-in.o + + PHONY += $(subdir-y) + diff --git a/dev-util/perf/perf-4.1.5.ebuild b/dev-util/perf/perf-4.1.5-r1.ebuild similarity index 98% rename from dev-util/perf/perf-4.1.5.ebuild rename to dev-util/perf/perf-4.1.5-r1.ebuild index b49b73f..1323e67 100644 --- a/dev-util/perf/perf-4.1.5.ebuild +++ b/dev-util/perf/perf-4.1.5-r1.ebuild @@ -107,6 +107,8 @@ src_prepare() { epatch "${WORKDIR}"/${P}.patch fi + epatch "${FILESDIR}"/${P}-prefix.patch + # Drop some upstream too-developer-oriented flags and fix the # Makefile in general sed -i \ @@ -140,10 +142,10 @@ perf_make() { # but it also wants to know about the split value -- i386/x86_64 vs just # x86. We can get that by telling the func to use an older linux version. # It's kind of a hack, but not that bad ... - # prefix="/usr" bindir_relative="bin" \ local arch=$(tc-arch-kernel) emake V=1 \ CC="$(tc-getCC)" AR="$(tc-getAR)" \ + prefix="/usr" bindir_relative="bin" \ CFLAGS_OPTIMIZE="${CFLAGS}" \ LDFLAGS_OPTIMIZE="${LDFLAGS}" \ ARCH="${arch}" \