CodeMirror/btop
1
0
Fork 0
mirror of https://github.com/aristocratos/btop.git synced 2024-06-26 10:00:32 +12:00
Code Issues Projects Releases Wiki Activity

Merge pull request #238 from joske/main

Browse source 
merge FreeBSD branch
This commit is contained in:
Jos Dehaes 2022-01-12 09:02:40 +01:00 committed by GitHub
parent 56deec4988 3d7bb52e48
commit 7c7bd10bc8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 1357 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
Makefile
View file

@ -86,7 +86,7 @@ else ifeq ($(PLATFORM_LC),freebsd)
PLATFORM_DIR := freebsd
THREADS := $(shell getconf NPROCESSORS_ONLN 2>/dev/null || echo 1)
SU_GROUP := root
override ADDFLAGS += -lstdc++ -lm -lkvm -Wl,-rpath=/usr/local/lib/gcc11
override ADDFLAGS += -lstdc++ -lm -lkvm -ldevstat -Wl,-rpath=/usr/local/lib/gcc11
export MAKE = gmake
else ifeq ($(PLATFORM_LC),macos)
PLATFORM_DIR := osx
@ -125,6 +125,10 @@ override LDFLAGS += $(LDCXXFLAGS) $(OPTFLAGS) $(WARNFLAGS)
INC := -I$(INCDIR) -I$(SRCDIR)
SU_USER := root
ifdef DEBUG
override OPTFLAGS := -O0 -g
endif
SOURCES := $(shell find $(SRCDIR) -maxdepth 1 -type f -name *.$(SRCEXT))
SOURCES += $(shell find $(SRCDIR)/$(PLATFORM_DIR) -type f -name *.$(SRCEXT))
@ -190,6 +194,7 @@ install:
@printf "\033[1;92mInstalling themes to: \033[1;97m$(DESTDIR)$(PREFIX)/share/btop/themes\033[0m\n"
@cp -pr themes $(DESTDIR)$(PREFIX)/share/btop
#? Set SUID bit for btop as $SU_USER in $SU_GROUP
setuid:
@printf "\033[1;97mFile: $(DESTDIR)$(PREFIX)/bin/btop\n"

3
src/btop.cpp
View file

@ -19,6 +19,9 @@ tab-size = 4
#include <csignal>
#include <clocale>
#include <pthread.h>
#ifdef __FreeBSD__
#include <pthread_np.h>
#endif
#include <thread>
#include <numeric>
#include <ranges>

1348
src/freebsd/btop_collect.cpp Normal file
View file

File diff suppressed because it is too large Load diff