lkn
/
pcloudcc-lneely
mirror of https://github.com/lneely/pcloudcc-lneely.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update build configuration and dev scripts to remove remaining Boost references 

- Remove Boost from dev scripts and container build configs
- Add -std=c++11 to Makefile CXXFLAGS
- Explicitly add -I. to Makefile CFLAGS for CLI11.hpp include
This commit is contained in:
Levi Neely 2026-05-01 11:30:38 +02:00
parent 0297efbd65
commit 133feb6f6e
6 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -31,11 +31,11 @@ else
endif
COMMONFLAGS = -fsanitize=address
CFLAGS = -fPIC $(COMMONFLAGS) -I./pclsync -I/usr/include $(FUSE_CFLAGS) $(shell pkg-config --cflags $$(pkg-config --list-all | grep -o 'mbedtls[0-9.]*\s' | head -1) 2>/dev/null || pkg-config --cflags mbedtls 2>/dev/null || echo "-I/usr/local/include")
CFLAGS = -fPIC $(COMMONFLAGS) -I. -I./pclsync -I/usr/include $(FUSE_CFLAGS) $(shell pkg-config --cflags $$(pkg-config --list-all | grep -o 'mbedtls[0-9.]*\s' | head -1) 2>/dev/null || pkg-config --cflags mbedtls 2>/dev/null || echo "-I/usr/local/include")
ifneq (,$(filter clang%,$(CC)))
CFLAGS += -Wthread-safety
endif
CXXFLAGS = $(CFLAGS)
CXXFLAGS = $(CFLAGS) -std=c++11
LIBLDFLAGS = $(COMMONFLAGS) -lreadline -lpthread -ludev -lsqlite3 -lz $(shell \
MBEDTLS_PKG=$$(pkg-config --list-all 2>/dev/null | grep -o 'mbedtls[0-9.]*\s' | head -1 | tr -d ' '); \
if [ -n "$$MBEDTLS_PKG" ]; then \

8
dev/container-build.sh
View File

@ -93,26 +93,26 @@ case $IMAGE in
echo "Setting up Debian/Ubuntu-based container..."
ctrid=$(buildah from "$FULL_IMAGE")
buildah run "$ctrid" -- apt update
buildah run "$ctrid" -- apt install -y build-essential git libfuse-dev libudev-dev libsqlite3-dev libmbedtls-dev zlib1g-dev libboost-system-dev libboost-program-options-dev fuse llvm gdb
buildah run "$ctrid" -- apt install -y build-essential git libfuse-dev libudev-dev libsqlite3-dev libmbedtls-dev zlib1g-dev fuse llvm gdb
;;
fedora)
echo "Setting up Fedora-based container..."
ctrid=$(buildah from "$FULL_IMAGE")
buildah run "$ctrid" -- dnf update -y
buildah run "$ctrid" -- dnf group install -y "C Development Tools and Libraries"
buildah run "$ctrid" -- dnf install -y git fuse-devel systemd-devel sqlite-devel mbedtls-devel zlib-devel boost-devel boost-program-options fuse llvm gdb fuse udev libasan
buildah run "$ctrid" -- dnf install -y git fuse-devel systemd-devel sqlite-devel mbedtls-devel zlib-devel fuse llvm gdb fuse udev libasan
;;
archlinux|arch)
echo "Setting up Arch Linux-based container..."
ctrid=$(buildah from "$FULL_IMAGE")
buildah run "$ctrid" -- pacman -Syu --noconfirm
buildah run "$ctrid" -- pacman -S --noconfirm base-devel git fuse2 systemd sqlite mbedtls2 zlib boost boost-libs llvm gdb udev gcc make
buildah run "$ctrid" -- pacman -S --noconfirm base-devel git fuse2 systemd sqlite mbedtls2 zlib llvm gdb udev gcc make
;;
opensuse/tumbleweed|opensuse/leap)
echo "Setting up openSUSE-based container..."
ctrid=$(buildah from "$FULL_IMAGE")
buildah run "$ctrid" -- zypper refresh
buildah run "$ctrid" -- zypper install -y gcc gcc-c++ make git fuse-devel systemd-devel sqlite3-devel zlib-devel libboost_system-devel libboost_program_options-devel fuse llvm gdb udev mbedtls-2-devel
buildah run "$ctrid" -- zypper install -y gcc gcc-c++ make git fuse-devel systemd-devel sqlite3-devel zlib-devel fuse llvm gdb udev mbedtls-2-devel
;;
*)
echo "Unsupported image: $IMAGE"

2
dev/devhost-arch-arm64.sh
View File

@ -103,7 +103,7 @@ build_container() {
sudo vim nano curl wget git htop tmux man-db \
bash-completion ca-certificates openssh \
base-devel gcc gcc-libs make fuse2 systemd sqlite3 \
mbedtls zlib boost llvm gdb iproute \
mbedtls zlib llvm gdb iproute \
rsync readline
# verify fuse

2
dev/devhost-arch.sh
View File

@ -103,7 +103,7 @@ build_container() {
sudo vim nano curl wget git htop tmux man-db \
bash-completion ca-certificates openssh \
base-devel gcc gcc-libs make fuse2 systemd sqlite3 \
mbedtls zlib boost llvm gdb iproute \
mbedtls zlib llvm gdb iproute \
rsync readline
# verify fuse

3
dev/devhost-debian.sh
View File

@ -106,8 +106,7 @@ build_container() {
sudo vim nano curl wget git htop tmux man-db locales \
bash-completion ca-certificates ssh systemd systemd-sysv \
build-essential libfuse-dev libudev-dev libsqlite3-dev \
libmbedtls-dev zlib1g-dev libboost-system-dev \
libboost-program-options-dev fuse llvm gdb iproute2 \
libmbedtls-dev zlib1g-dev fuse llvm gdb iproute2 \
openssh-server rsync libreadline-dev
# verify fuse

2
dev/devhost-fedora.sh
View File

@ -103,7 +103,7 @@ build_container() {
sudo vim nano curl wget git htop tmux man-db \
bash-completion ca-certificates openssh-server \
gcc gcc-c++ make fuse-devel systemd-devel sqlite-devel \
mbedtls-devel zlib-devel boost-devel fuse llvm gdb iproute \
mbedtls-devel zlib-devel fuse llvm gdb iproute \
rsync readline-devel
# verify fuse