Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package btop for openSUSE:Factory checked in
at 2021-10-23 00:51:44
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/btop (Old)
and /work/SRC/openSUSE:Factory/.btop.new.1890 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "btop"
Sat Oct 23 00:51:44 2021 rev:4 rq:926997 version:1.0.19
Changes:
--------
--- /work/SRC/openSUSE:Factory/btop/btop.changes 2021-10-19
23:03:51.965274003 +0200
+++ /work/SRC/openSUSE:Factory/.btop.new.1890/btop.changes 2021-10-23
00:52:28.877161230 +0200
@@ -1,0 +2,6 @@
+Thu Oct 21 16:03:46 UTC 2021 - Scott Bradnick <scott.bradn...@suse.com> -
1.0.19
+
+- Update to upstream release 1.0.19:
+ * Fixed: Makefile now tests compiler flag compatibility
+
+-------------------------------------------------------------------
Old:
----
v1.0.18.tar.gz
New:
----
v1.0.19.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ btop.spec ++++++
--- /var/tmp/diff_new_pack.KD50JU/_old 2021-10-23 00:52:29.261161400 +0200
+++ /var/tmp/diff_new_pack.KD50JU/_new 2021-10-23 00:52:29.265161402 +0200
@@ -17,7 +17,7 @@
Name: btop
-Version: 1.0.18
+Version: 1.0.19
Release: 0
Summary: Usage and stats for processor, memory, disks, network and
processes
License: Apache-2.0
@@ -35,7 +35,7 @@
BuildRequires: sed
%description
-Resource monitor that shows usage and stats for processor, memory, disks,
network and processes.C++ version and continuation of bashtop and bpytop.
+Resource monitor that shows usage and stats for processor, memory, disks,
network and processes. C++ version and continuation of bashtop and bpytop.
%prep
%setup -q
++++++ v1.0.18.tar.gz -> v1.0.19.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/btop-1.0.18/CHANGELOG.md new/btop-1.0.19/CHANGELOG.md
--- old/btop-1.0.18/CHANGELOG.md 2021-10-19 17:29:57.000000000 +0200
+++ new/btop-1.0.19/CHANGELOG.md 2021-10-21 16:54:18.000000000 +0200
@@ -1,3 +1,7 @@
+## v1.0.19
+
+* Fixed: Makefile now tests compiler flag compatibility
+
## v1.0.18
* Fixed: Makefile g++ -dumpmachine failure to get platform on some distros
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/btop-1.0.18/Makefile new/btop-1.0.19/Makefile
--- old/btop-1.0.18/Makefile 2021-10-19 17:29:57.000000000 +0200
+++ new/btop-1.0.19/Makefile 2021-10-21 16:54:18.000000000 +0200
@@ -1,6 +1,6 @@
-#* Btop++ makefile v1.2
+#* Btop++ makefile v1.4
-BANNER = \n \033[38;5;196m??????????????????\033[38;5;240m???
\033[38;5;196m????????????????????????\033[38;5;240m???
\033[38;5;196m??????????????????\033[38;5;240m???
\033[38;5;196m??????????????????\033[38;5;240m???\n
\033[38;5;160m??????\033[38;5;239m?????????\033[38;5;160m??????\033[38;5;239m????????????\033[38;5;160m??????\033[38;5;239m????????????\033[38;5;160m??????\033[38;5;239m????????????\033[38;5;160m??????\033[38;5;239m???\033[38;5;160m??????\033[38;5;239m?????????\033[38;5;160m??????\033[38;5;239m???
\033[38;5;160m??????\033[38;5;239m???
\033[38;5;160m??????\033[38;5;239m???\n
\033[38;5;124m??????????????????\033[38;5;238m??????
\033[38;5;124m??????\033[38;5;238m??? \033[38;5;124m??????\033[38;5;238m???
\033[38;5;124m??????\033[38;5;238m???\033[38;5;124m??????????????????\033[38;5;238m??????
\033[38;5;124m??????????????????\033[38;5;238m???\033[38;5;124m??????????????????\033[38;5;238m???\n
\033[38;5;88m??????\033[38;5;237m?????????\033[38;5;88m??????\033[38
;5;237m??? \033[38;5;88m??????\033[38;5;237m???
\033[38;5;88m??????\033[38;5;237m???
\033[38;5;88m??????\033[38;5;237m???\033[38;5;88m??????\033[38;5;237m???????????????
??????\033[38;5;88m??????\033[38;5;237m???????????????\033[38;5;88m??????\033[38;5;237m?????????\n
\033[38;5;52m??????????????????\033[38;5;236m??????
\033[38;5;52m??????\033[38;5;236m???
???\033[38;5;52m??????????????????\033[38;5;236m??????\033[38;5;52m??????\033[38;5;236m???
????????? ?????????\n \033[38;5;235m?????????????????????
????????? ????????????????????? ????????? \033[1;3;38;5;240mMakefile
v1.3\033[0m
+BANNER = \n \033[38;5;196m??????????????????\033[38;5;240m???
\033[38;5;196m????????????????????????\033[38;5;240m???
\033[38;5;196m??????????????????\033[38;5;240m???
\033[38;5;196m??????????????????\033[38;5;240m???\n
\033[38;5;160m??????\033[38;5;239m?????????\033[38;5;160m??????\033[38;5;239m????????????\033[38;5;160m??????\033[38;5;239m????????????\033[38;5;160m??????\033[38;5;239m????????????\033[38;5;160m??????\033[38;5;239m???\033[38;5;160m??????\033[38;5;239m?????????\033[38;5;160m??????\033[38;5;239m???
\033[38;5;160m??????\033[38;5;239m???
\033[38;5;160m??????\033[38;5;239m???\n
\033[38;5;124m??????????????????\033[38;5;238m??????
\033[38;5;124m??????\033[38;5;238m??? \033[38;5;124m??????\033[38;5;238m???
\033[38;5;124m??????\033[38;5;238m???\033[38;5;124m??????????????????\033[38;5;238m??????
\033[38;5;124m??????????????????\033[38;5;238m???\033[38;5;124m??????????????????\033[38;5;238m???\n
\033[38;5;88m??????\033[38;5;237m?????????\033[38;5;88m??????\033[38
;5;237m??? \033[38;5;88m??????\033[38;5;237m???
\033[38;5;88m??????\033[38;5;237m???
\033[38;5;88m??????\033[38;5;237m???\033[38;5;88m??????\033[38;5;237m???????????????
??????\033[38;5;88m??????\033[38;5;237m???????????????\033[38;5;88m??????\033[38;5;237m?????????\n
\033[38;5;52m??????????????????\033[38;5;236m??????
\033[38;5;52m??????\033[38;5;236m???
???\033[38;5;52m??????????????????\033[38;5;236m??????\033[38;5;52m??????\033[38;5;236m???
????????? ?????????\n \033[38;5;235m?????????????????????
????????? ????????????????????? ????????? \033[1;3;38;5;240mMakefile
v1.4\033[0m
override BTOP_VERSION := $(shell head -n100 src/btop.cpp 2>/dev/null | grep
"Version =" | cut -f2 -d"\"" || echo " unknown")
override TIMESTAMP := $(shell date +%s 2>/dev/null || echo "0")
@@ -23,17 +23,15 @@
override PLATFORM_LC := $(shell echo $(PLATFORM) | tr '[:upper:]' '[:lower:]')
-#? Only enable fcf-protection if on x86_64
-ifneq ($(filter x86_64 i%86, $(ARCH)),)
- override ADDFLAGS += -fcf-protection
-endif
+#? Any flags added to TESTFLAGS must not contain whitespace for the testing to
work
+override TESTFLAGS := -fexceptions -fcf-protection -fstack-protector
-fstack-clash-protection -D_FORTIFY_SOURCE=2 -D_GLIBCXX_ASSERTIONS
ifeq ($(STATIC),true)
- override ADDFLAGS += -D STATIC_BUILD -static -static-libgcc
-static-libstdc++ -Wl,--fatal-warnings
+ override TESTFLAGS += -DSTATIC_BUILD -static -static-libgcc
-static-libstdc++ -Wl,--fatal-warnings
endif
ifeq ($(STRIP),true)
- override ADDFLAGS += -s
+ override TESTFLAGS += -s
endif
#? Compiler and Linker
@@ -66,7 +64,7 @@
endif
#? Use all CPU cores (will only be set if using Make 4.3+)
-MAKEFLAGS := --jobs=$(THREADS)
+MAKEFLAGS := --jobs=$(THREADS)
ifeq ($(THREADS),1)
override THREADS := auto
endif
@@ -80,11 +78,14 @@
DEPEXT := d
OBJEXT := o
+#? Filter out unsupported compiler flags
+override GOODFLAGS := $(foreach flag,$(TESTFLAGS),$(strip $(shell echo "int
main() {}" | $(CXX) -o /dev/null $(flag) -x c++ - >/dev/null 2>&1 && echo
$(flag) || true)))
+
#? Flags, Libraries and Includes
override REQFLAGS := -std=c++20
WARNFLAGS := -Wall -Wextra -pedantic
OPTFLAGS ?= -O2 -ftree-loop-vectorize -flto=$(THREADS)
-LDCXXFLAGS := -pthread -D_FORTIFY_SOURCE=2
-D_GLIBCXX_ASSERTIONS -fexceptions -fstack-protector -fstack-clash-protection
$(ADDFLAGS)
+LDCXXFLAGS := -pthread $(GOODFLAGS) $(ADDFLAGS)
override CXXFLAGS += $(REQFLAGS) $(LDCXXFLAGS) $(OPTFLAGS) $(WARNFLAGS)
override LDFLAGS += $(LDCXXFLAGS) $(OPTFLAGS) $(WARNFLAGS)
INC := -I$(INCDIR) -I$(SRCDIR)
@@ -114,7 +115,6 @@
@printf "\033[1;95mLDFLAGS \033[1;92m+|
\033[0;37m\$$(\033[93mLDCXXFLAGS\033[37m) \$$(\033[94mOPTFLAGS\033[37m)
\$$(\033[91mWARNFLAGS\033[37m)\n"
info-quiet:
-
@printf "\n\033[1;92mBuilding btop++
\033[91m(\033[97mv$(BTOP_VERSION)\033[91m) \033[93m$(PLATFORM)
\033[96m$(ARCH)\033[0m\n"
help:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/btop-1.0.18/src/btop.cpp new/btop-1.0.19/src/btop.cpp
--- old/btop-1.0.18/src/btop.cpp 2021-10-19 17:29:57.000000000 +0200
+++ new/btop-1.0.19/src/btop.cpp 2021-10-21 16:54:18.000000000 +0200
@@ -53,7 +53,7 @@
{"#801414", "???????????????????????? ?????????
???????????????????????????????????? ????????? ?????????"},
{"#000000", "????????????????????? ?????????
????????????????????? ?????????"},
};
- const string Version = "1.0.18";
+ const string Version = "1.0.19";
int coreCount;
string overlay;
