From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 67CA5158095 for ; Mon, 10 Oct 2022 11:49:26 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7194DE082B; Mon, 10 Oct 2022 11:49:25 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 33EBAE07E6 for ; Mon, 10 Oct 2022 11:49:25 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 25DE0340F91 for ; Mon, 10 Oct 2022 11:49:24 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 715BE602 for ; Mon, 10 Oct 2022 11:49:22 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1665402270.b07006fc3f1e69ec7f4605b6b2caffb985658431.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-process/btop/files/, sys-process/btop/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-process/btop/btop-1.2.12.ebuild sys-process/btop/btop-1.2.9.ebuild sys-process/btop/files/876319-verbose-makefile.patch X-VCS-Directories: sys-process/btop/files/ sys-process/btop/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: b07006fc3f1e69ec7f4605b6b2caffb985658431 X-VCS-Branch: master Date: Mon, 10 Oct 2022 11:49:22 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 80d17a0c-5f19-41e8-9ae6-f97f39481d7d X-Archives-Hash: 8aa6ca0af0dd21af3d4d7b72c5975288 commit: b07006fc3f1e69ec7f4605b6b2caffb985658431 Author: Adrian Schollmeyer nexadn de> AuthorDate: Mon Oct 10 10:59:09 2022 +0000 Commit: Sam James gentoo org> CommitDate: Mon Oct 10 11:44:30 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b07006fc sys-process/btop: Make build output verbose The build system didn't support verbose output before (i.e. it didn't show the exact commands used to build a unit). Upstream recently added such a verbose mode, which is backported to the current versions in ::gentoo by this commit. Closes: https://bugs.gentoo.org/876319 Signed-off-by: Adrian Schollmeyer nexadn.de> Closes: https://github.com/gentoo/gentoo/pull/27725 Signed-off-by: Sam James gentoo.org> sys-process/btop/btop-1.2.12.ebuild | 6 ++- sys-process/btop/btop-1.2.9.ebuild | 6 ++- .../btop/files/876319-verbose-makefile.patch | 54 ++++++++++++++++++++++ 3 files changed, 64 insertions(+), 2 deletions(-) diff --git a/sys-process/btop/btop-1.2.12.ebuild b/sys-process/btop/btop-1.2.12.ebuild index 6bf13cbd7d95..5dbb46974fd7 100644 --- a/sys-process/btop/btop-1.2.12.ebuild +++ b/sys-process/btop/btop-1.2.12.ebuild @@ -17,6 +17,10 @@ BDEPEND=" >=sys-devel/gcc-8 " +PATCHES=( + "${FILESDIR}/876319-verbose-makefile.patch" +) + pkg_setup() { if [[ "${MERGE_TYPE}" != "binary" ]]; then if ! tc-is-gcc ; then @@ -34,7 +38,7 @@ src_prepare() { src_compile() { # Disable btop optimization flags, since we have our flags in CXXFLAGS - emake OPTFLAGS="" CXX="$(tc-getCXX)" + emake VERBOSE=true OPTFLAGS="" CXX="$(tc-getCXX)" } src_install() { diff --git a/sys-process/btop/btop-1.2.9.ebuild b/sys-process/btop/btop-1.2.9.ebuild index ee0bbdefbd6d..39aa6592146f 100644 --- a/sys-process/btop/btop-1.2.9.ebuild +++ b/sys-process/btop/btop-1.2.9.ebuild @@ -17,6 +17,10 @@ BDEPEND=" >=sys-devel/gcc-8 " +PATCHES=( + "${FILESDIR}/876319-verbose-makefile.patch" +) + pkg_setup() { if [[ "${MERGE_TYPE}" != "binary" ]]; then if ! tc-is-gcc ; then @@ -34,7 +38,7 @@ src_prepare() { src_compile() { # Disable btop optimization flags, since we have our flags in CXXFLAGS - emake OPTFLAGS="" CXX="$(tc-getCXX)" + emake VERBOSE=true OPTFLAGS="" CXX="$(tc-getCXX)" } src_install() { diff --git a/sys-process/btop/files/876319-verbose-makefile.patch b/sys-process/btop/files/876319-verbose-makefile.patch new file mode 100644 index 000000000000..ef2199d728d1 --- /dev/null +++ b/sys-process/btop/files/876319-verbose-makefile.patch @@ -0,0 +1,54 @@ +# Backport of upstream commit 080a47e6496f12f616b811e0d2f8f36c62d397e2 +# See https://bugs.gentoo.org/876319 +diff --git a/Makefile b/Makefile +index d1bc95d..6a36c76 100644 +--- a/Makefile ++++ b/Makefile +@@ -18,6 +18,9 @@ else + override PRE := info-quiet + endif + ++OLDCXX := $(CXXFLAGS) ++OLDLD := $(LDFLAGS) ++ + PREFIX ?= /usr/local + + #? Detect PLATFORM and ARCH from uname/gcc if not set +@@ -53,6 +56,10 @@ ifeq ($(STRIP),true) + override ADDFLAGS += -s + endif + ++ifneq ($(VERBOSE),true) ++ override VERBOSE := false ++endif ++ + #? Compiler and Linker + ifeq ($(shell command -v g++-11 >/dev/null; echo $$?),0) + CXX := g++-11 +@@ -167,8 +174,8 @@ info: + @printf "\033[1;91mWARNFLAGS \033[1;94m:| \033[0m$(WARNFLAGS)\n" + @printf "\033[1;94mOPTFLAGS \033[1;94m:| \033[0m$(OPTFLAGS)\n" + @printf "\033[1;93mLDCXXFLAGS \033[1;94m:| \033[0m$(LDCXXFLAGS)\n" +- @printf "\033[1;95mCXXFLAGS \033[1;92m+| \033[0;37m\$$(\033[92mREQFLAGS\033[37m) \$$(\033[93mLDCXXFLAGS\033[37m) \$$(\033[94mOPTFLAGS\033[37m) \$$(\033[91mWARNFLAGS\033[37m)\n" +- @printf "\033[1;95mLDFLAGS \033[1;92m+| \033[0;37m\$$(\033[93mLDCXXFLAGS\033[37m) \$$(\033[94mOPTFLAGS\033[37m) \$$(\033[91mWARNFLAGS\033[37m)\n" ++ @printf "\033[1;95mCXXFLAGS \033[1;92m+| \033[0;37m\$$(\033[92mREQFLAGS\033[37m) \$$(\033[93mLDCXXFLAGS\033[37m) \$$(\033[94mOPTFLAGS\033[37m) \$$(\033[91mWARNFLAGS\033[37m) $(OLDCXX)\n" ++ @printf "\033[1;95mLDFLAGS \033[1;92m+| \033[0;37m\$$(\033[93mLDCXXFLAGS\033[37m) \$$(\033[94mOPTFLAGS\033[37m) \$$(\033[91mWARNFLAGS\033[37m) $(OLDLD)\n" + + info-quiet: + @sleep 0.1 2>/dev/null || true +@@ -252,6 +259,7 @@ btop: $(OBJECTS) + @sleep 0.2 2>/dev/null || true + @TSTAMP=$$(date +%s 2>/dev/null || echo "0") + @$(QUIET) || printf "\n\033[1;92mLinking and optimizing binary\033[37m...\033[0m\n" ++ @$(VERBOSE) && printf "$(CXX) -o $(TARGETDIR)/btop $^ $(LDFLAGS)\n" + @$(CXX) -o $(TARGETDIR)/btop $^ $(LDFLAGS) || exit 1 + @printf "\033[1;92m100$(P) -> \033[1;37m$(TARGETDIR)/btop \033[100D\033[38C\033[1;93m(\033[1;97m$$(du -ah $(TARGETDIR)/btop | cut -f1)iB\033[1;93m) \033[92m(\033[97m$$($(DATE_CMD) -d @$$(expr $$(date +%s 2>/dev/null || echo "0") - $${TSTAMP} 2>/dev/null) -u +%Mm:%Ss 2>/dev/null | sed 's/^00m://' || echo '')\033[92m)\033[0m\n" + @printf "\n\033[1;92mBuild complete in \033[92m(\033[97m$$($(DATE_CMD) -d @$$(expr $$(date +%s 2>/dev/null || echo "0") - $(TIMESTAMP) 2>/dev/null) -u +%Mm:%Ss 2>/dev/null | sed 's/^00m://' || echo "unknown")\033[92m)\033[0m\n" +@@ -262,6 +270,7 @@ $(BUILDDIR)/%.$(OBJEXT): $(SRCDIR)/%.$(SRCEXT) + @sleep 0.3 2>/dev/null || true + @TSTAMP=$$(date +%s 2>/dev/null || echo "0") + @$(QUIET) || printf "\033[1;97mCompiling $<\033[0m\n" ++ @$(VERBOSE) && printf "$(CXX) $(CXXFLAGS) $(INC) -MMD -c -o $@ $<\n" + @$(CXX) $(CXXFLAGS) $(INC) -MMD -c -o $@ $< || exit 1 + @printf "\033[1;92m$$($(PROGRESS))$(P)\033[10D\033[5C-> \033[1;37m$@ \033[100D\033[38C\033[1;93m(\033[1;97m$$(du -ah $@ | cut -f1)iB\033[1;93m) \033[92m(\033[97m$$($(DATE_CMD) -d @$$(expr $$($(DATE_CMD) +%s 2>/dev/null || echo "0") - $${TSTAMP} 2>/dev/null) -u +%Mm:%Ss 2>/dev/null | sed 's/^00m://' || echo '')\033[92m)\033[0m\n" +