diff options
| author |   Adrian Schollmeyer <nex+b-g-o@nexadn.de> | 2022-12-15 17:57:32 +0100 |
|---|---|---|
| committer |   Florian Schmaus <flow@gentoo.org> | 2022-12-23 10:32:55 +0100 |
| commit | 01f5372f6ca090082fcd051e8e3a1d2ce1704c17 (patch) | |
| tree | 63c223dbd66bc44ac7a938cbc141c5db089522e0 /sys-process | |
| parent | sys-process/btop: Backport parallel build fix and verbose mkdir (diff) | |
| download | gentoo-01f5372f6ca090082fcd051e8e3a1d2ce1704c17.tar.gz gentoo-01f5372f6ca090082fcd051e8e3a1d2ce1704c17.tar.bz2 gentoo-01f5372f6ca090082fcd051e8e3a1d2ce1704c17.zip | |
sys-process/btop: Removed unused patch
Signed-off-by: Adrian Schollmeyer <nex+b-g-o@nexadn.de>
Closes: https://github.com/gentoo/gentoo/pull/28674
Signed-off-by: Florian Schmaus <flow@gentoo.org>
Diffstat (limited to 'sys-process')
| -rw-r--r-- | sys-process/btop/files/876319-verbose-makefile.patch | 54 |
1 files changed, 0 insertions, 54 deletions
diff --git a/sys-process/btop/files/876319-verbose-makefile.patch b/sys-process/btop/files/876319-verbose-makefile.patch deleted file mode 100644 index ef2199d728d1..000000000000 --- a/sys-process/btop/files/876319-verbose-makefile.patch +++ /dev/null @@ -1,54 +0,0 @@ -# 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" - |