From 133feb6f6e7978e8b88013ba493ce26a01141f70 Mon Sep 17 00:00:00 2001 From: Levi Neely Date: Fri, 1 May 2026 11:30:38 +0200 Subject: [PATCH] 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 --- Makefile | 4 ++-- dev/container-build.sh | 8 ++++---- dev/devhost-arch-arm64.sh | 2 +- dev/devhost-arch.sh | 2 +- dev/devhost-debian.sh | 3 +-- dev/devhost-fedora.sh | 2 +- 6 files changed, 10 insertions(+), 11 deletions(-) diff --git a/Makefile b/Makefile index 7ebfe8c..c1c0992 100644 --- a/Makefile +++ b/Makefile @@ -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 \ diff --git a/dev/container-build.sh b/dev/container-build.sh index 9932571..7897d44 100755 --- a/dev/container-build.sh +++ b/dev/container-build.sh @@ -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" diff --git a/dev/devhost-arch-arm64.sh b/dev/devhost-arch-arm64.sh index bfba035..fce9862 100755 --- a/dev/devhost-arch-arm64.sh +++ b/dev/devhost-arch-arm64.sh @@ -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 diff --git a/dev/devhost-arch.sh b/dev/devhost-arch.sh index 61db488..13bc3d6 100755 --- a/dev/devhost-arch.sh +++ b/dev/devhost-arch.sh @@ -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 diff --git a/dev/devhost-debian.sh b/dev/devhost-debian.sh index c85bfe2..d355bc7 100755 --- a/dev/devhost-debian.sh +++ b/dev/devhost-debian.sh @@ -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 diff --git a/dev/devhost-fedora.sh b/dev/devhost-fedora.sh index 602b49d..84f929f 100755 --- a/dev/devhost-fedora.sh +++ b/dev/devhost-fedora.sh @@ -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