TheCloud/dwarfs
1
0
Fork 0
mirror of https://github.com/mhx/dwarfs.git synced 2025-09-18 17:00:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

wip: cleanup

Browse Source
This commit is contained in:
Marcus Holland-Moritz 2025-07-28 16:32:04 +02:00
parent 3e5948e3bb
commit d320dfbcae
3 changed files with 135 additions and 146 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.docker/build-linux.sh
View File

@ -329,16 +329,16 @@ if [[ "-$BUILD_TYPE-" == *-static-* ]]; then
_sslprefix="/opt/static-libs/$COMPILER-openssl/$_TARGET" _sslprefix="/opt/static-libs/$COMPILER-openssl/$_TARGET"
fi fi
# export LDFLAGS="${LDFLAGS} -static-libgcc -L$_staticprefix/lib -L$_sslprefix/lib -L$_SYSROOT/usr/$_TARGET/lib -lucontext"
export LDFLAGS="${LDFLAGS} -static-libgcc" export LDFLAGS="${LDFLAGS} -static-libgcc"
export CFLAGS="${CFLAGS} -isystem $_staticprefix/include" export CFLAGS="${CFLAGS} -isystem $_staticprefix/include"
export CXXFLAGS="${CXXFLAGS} -isystem $_staticprefix/include" export CXXFLAGS="${CXXFLAGS} -isystem $_staticprefix/include"
CMAKE_ARGS="${CMAKE_ARGS} -DCMAKE_SYSROOT=$_SYSROOT -DCMAKE_FIND_ROOT_PATH=$_staticprefix;$_sslprefix;$_jemallocprefix -DCMAKE_PREFIX_PATH=$_staticprefix;$_sslprefix;$_jemallocprefix -DCMAKE_FIND_ROOT_PATH_MODE_LIBRARY=ONLY -DCMAKE_FIND_ROOT_PATH_MODE_INCLUDE=ONLY -DSTATIC_BUILD_DO_NOT_USE=1 -DWITH_UNIVERSAL_BINARY=1 -DWITH_FUSE_EXTRACT_BINARY=1"
if [[ "$_MARCH" == "i386" ]]; then if [[ "$_MARCH" == "i386" ]]; then
export LDFLAGS="${LDFLAGS} -L$_staticprefix/lib -lucontext" export LDFLAGS="${LDFLAGS} -L$_staticprefix/lib -lucontext"
fi fi
CMAKE_ARGS="${CMAKE_ARGS} -DCMAKE_SYSROOT=$_SYSROOT -DCMAKE_FIND_ROOT_PATH=$_staticprefix;$_sslprefix;$_jemallocprefix -DCMAKE_PREFIX_PATH=$_staticprefix;$_sslprefix;$_jemallocprefix -DCMAKE_FIND_ROOT_PATH_MODE_LIBRARY=ONLY -DCMAKE_FIND_ROOT_PATH_MODE_INCLUDE=ONLY -DSTATIC_BUILD_DO_NOT_USE=1 -DWITH_UNIVERSAL_BINARY=1 -DWITH_FUSE_EXTRACT_BINARY=1"
if [[ -n "$CROSS_ARCH" ]]; then if [[ -n "$CROSS_ARCH" ]]; then
CMAKE_ARGS="${CMAKE_ARGS} -DCMAKE_SYSTEM_NAME=Linux -DCMAKE_SYSTEM_PROCESSOR=$_MARCH -DCMAKE_CROSSCOMPILING_EMULATOR=/usr/bin/qemu-$_MARCH -DFOLLY_HAVE_UNALIGNED_ACCESS=OFF -DFOLLY_HAVE_WEAK_SYMBOLS=ON -DFOLLY_HAVE_LINUX_VDSO=OFF -DFOLLY_HAVE_WCHAR_SUPPORT=OFF -DHAVE_VSNPRINTF_ERRORS=OFF" CMAKE_ARGS="${CMAKE_ARGS} -DCMAKE_SYSTEM_NAME=Linux -DCMAKE_SYSTEM_PROCESSOR=$_MARCH -DCMAKE_CROSSCOMPILING_EMULATOR=/usr/bin/qemu-$_MARCH -DFOLLY_HAVE_UNALIGNED_ACCESS=OFF -DFOLLY_HAVE_WEAK_SYMBOLS=ON -DFOLLY_HAVE_LINUX_VDSO=OFF -DFOLLY_HAVE_WCHAR_SUPPORT=OFF -DHAVE_VSNPRINTF_ERRORS=OFF"
fi fi

264
.github/workflows/build.yml vendored
View File

@ -109,189 +109,189 @@ jobs:
strategy: strategy:
matrix: matrix:
include: include:
# - build_arch: amd64 - build_arch: amd64
# build_dist: ubuntu build_dist: ubuntu
# build_type: gcc-release-ninja-split build_type: gcc-release-ninja-split
# - build_arch: amd64 - build_arch: amd64
# build_dist: ubuntu build_dist: ubuntu
# build_type: gcc-release-shared-ninja-split build_type: gcc-release-shared-ninja-split
# - build_arch: amd64 - build_arch: amd64
# build_dist: ubuntu build_dist: ubuntu
# build_type: gcc-debug-shared-ninja-full build_type: gcc-debug-shared-ninja-full
# - build_arch: amd64 - build_arch: amd64
# build_dist: ubuntu build_dist: ubuntu
# build_type: gcc-debug-shared-noperfmon-ninja-split build_type: gcc-debug-shared-noperfmon-ninja-split
# - build_arch: amd64 - build_arch: amd64
# build_dist: ubuntu build_dist: ubuntu
# build_type: clang-release-shared-ninja-full build_type: clang-release-shared-ninja-full
# - build_arch: amd64 - build_arch: amd64
# build_dist: ubuntu build_dist: ubuntu
# build_type: clang-reldbg-shared-asan-ninja build_type: clang-reldbg-shared-asan-ninja
# - build_arch: amd64 - build_arch: amd64
# build_dist: ubuntu build_dist: ubuntu
# build_type: clang-reldbg-shared-ubsan-ninja build_type: clang-reldbg-shared-ubsan-ninja
# - build_arch: amd64 - build_arch: amd64
# build_dist: ubuntu build_dist: ubuntu
# build_type: clang-debug-shared-tsan-ninja build_type: clang-debug-shared-tsan-ninja
# - build_arch: amd64 - build_arch: amd64
# build_dist: ubuntu build_dist: ubuntu
# build_type: clang-debug-coverage-ninja build_type: clang-debug-coverage-ninja
# - build_arch: amd64 - build_arch: amd64
# build_dist: ubuntu build_dist: ubuntu
# build_type: oldgcc-debug-shared-make-split build_type: oldgcc-debug-shared-make-split
# - build_arch: amd64 - build_arch: amd64
# build_dist: ubuntu build_dist: ubuntu
# build_type: oldclang-debug-shared-make-split build_type: oldclang-debug-shared-make-split
# - build_arch: amd64 - build_arch: amd64
# build_dist: ubuntu-2204 build_dist: ubuntu-2204
# build_type: gcc-release-shared-ninja-split build_type: gcc-release-shared-ninja-split
# - build_arch: amd64 - build_arch: amd64
# build_dist: ubuntu-2204 build_dist: ubuntu-2204
# build_type: gcc-debug-shared-ninja-full build_type: gcc-debug-shared-ninja-full
# - build_arch: amd64 - build_arch: amd64
# build_dist: ubuntu-2204 build_dist: ubuntu-2204
# build_type: clang-release-ninja-split build_type: clang-release-ninja-split
# - build_arch: amd64 - build_arch: amd64
# build_dist: fedora build_dist: fedora
# build_type: gcc-release-ninja-split build_type: gcc-release-ninja-split
# - build_arch: amd64 - build_arch: amd64
# build_dist: fedora build_dist: fedora
# build_type: gcc-release-shared-ninja-split build_type: gcc-release-shared-ninja-split
# - build_arch: amd64 - build_arch: amd64
# build_dist: fedora build_dist: fedora
# build_type: gcc-debug-shared-ninja-full build_type: gcc-debug-shared-ninja-full
# - build_arch: amd64 - build_arch: amd64
# build_dist: fedora build_dist: fedora
# build_type: clang-release-shared-ninja-full build_type: clang-release-shared-ninja-full
# - build_arch: amd64 - build_arch: amd64
# build_dist: arch build_dist: arch
# build_type: gcc-release-ninja-split build_type: gcc-release-ninja-split
# - build_arch: amd64 - build_arch: amd64
# build_dist: arch build_dist: arch
# build_type: gcc-release-shared-ninja-split build_type: gcc-release-shared-ninja-split
# - build_arch: amd64 - build_arch: amd64
# build_dist: arch build_dist: arch
# build_type: gcc-debug-shared-ninja-full build_type: gcc-debug-shared-ninja-full
# - build_arch: amd64 - build_arch: amd64
# build_dist: arch build_dist: arch
# build_type: clang-release-shared-ninja-full build_type: clang-release-shared-ninja-full
# - build_arch: amd64 - build_arch: amd64
# build_dist: debian build_dist: debian
# build_type: gcc-release-make-full build_type: gcc-release-make-full
# - build_arch: amd64 - build_arch: amd64
# build_dist: debian build_dist: debian
# build_type: clang-debug-shared-ninja-split build_type: clang-debug-shared-ninja-split
# - build_arch: amd64 - build_arch: amd64
# build_dist: alpine build_dist: alpine
# build_type: gcc-release-ninja-static build_type: gcc-release-ninja-static
# - build_arch: amd64 - build_arch: amd64
# build_dist: alpine build_dist: alpine
# build_type: clang-release-ninja-static build_type: clang-release-ninja-static
# - build_arch: amd64 - build_arch: amd64
# build_dist: alpine build_dist: alpine
# build_type: clang-relsize-lto-ninja-static build_type: clang-relsize-lto-ninja-static
- build_arch: amd64 - build_arch: amd64
build_dist: alpine build_dist: alpine
build_type: clang-relsize-libressl-lto-ninja-static build_type: clang-relsize-libressl-lto-ninja-static
# - build_arch: amd64 - build_arch: amd64
# build_dist: alpine build_dist: alpine
# build_type: clang-relsize-minimal-lto-ninja-static build_type: clang-relsize-minimal-lto-ninja-static
# - build_arch: amd64 - build_arch: amd64
# build_dist: alpine build_dist: alpine
# build_type: clang-relsize-minimal-libressl-lto-ninja-static build_type: clang-relsize-minimal-libressl-lto-ninja-static
# - build_arch: amd64 - build_arch: amd64
# build_dist: alpine build_dist: alpine
# build_type: clang-relsize-minimal-mimalloc-lto-ninja-static build_type: clang-relsize-minimal-mimalloc-lto-ninja-static
# - build_arch: amd64 - build_arch: amd64
# build_dist: alpine build_dist: alpine
# build_type: clang-relsize-minimal-mimalloc-libressl-lto-ninja-static build_type: clang-relsize-minimal-mimalloc-libressl-lto-ninja-static
# - build_arch: amd64 - build_arch: amd64
# build_dist: alpine build_dist: alpine
# build_type: clang-reldbg-stacktrace-ninja-static build_type: clang-reldbg-stacktrace-ninja-static
# - build_arch: arm64v8 - build_arch: arm64v8
# build_dist: ubuntu build_dist: ubuntu
# build_type: gcc-debug-shared-ninja-full build_type: gcc-debug-shared-ninja-full
# - build_arch: arm64v8 - build_arch: arm64v8
# build_dist: ubuntu build_dist: ubuntu
# build_type: clang-release-shared-ninja-full build_type: clang-release-shared-ninja-full
# - build_arch: arm64v8 - build_arch: arm64v8
# build_dist: fedora build_dist: fedora
# build_type: gcc-debug-shared-ninja-full build_type: gcc-debug-shared-ninja-full
# - build_arch: arm64v8 - build_arch: arm64v8
# build_dist: fedora build_dist: fedora
# build_type: clang-release-shared-ninja-full build_type: clang-release-shared-ninja-full
# - build_arch: arm64v8 - build_arch: arm64v8
# build_dist: alpine build_dist: alpine
# build_type: gcc-release-ninja-static build_type: gcc-release-ninja-static
# - build_arch: arm64v8 - build_arch: arm64v8
# build_dist: alpine build_dist: alpine
# build_type: clang-release-ninja-static build_type: clang-release-ninja-static
# - build_arch: arm64v8 - build_arch: arm64v8
# build_dist: alpine build_dist: alpine
# build_type: clang-relsize-lto-ninja-static build_type: clang-relsize-lto-ninja-static
- build_arch: arm64v8 - build_arch: arm64v8
build_dist: alpine build_dist: alpine
build_type: clang-relsize-libressl-lto-ninja-static build_type: clang-relsize-libressl-lto-ninja-static
# - build_arch: arm64v8 - build_arch: arm64v8
# build_dist: alpine build_dist: alpine
# build_type: clang-relsize-minimal-lto-ninja-static build_type: clang-relsize-minimal-lto-ninja-static
# - build_arch: arm64v8 - build_arch: arm64v8
# build_dist: alpine build_dist: alpine
# build_type: clang-relsize-minimal-mimalloc-lto-ninja-static build_type: clang-relsize-minimal-mimalloc-lto-ninja-static
# - build_arch: arm64v8 - build_arch: arm64v8
# build_dist: alpine build_dist: alpine
# build_type: clang-reldbg-stacktrace-ninja-static build_type: clang-reldbg-stacktrace-ninja-static
# - build_arch: riscv64 - build_arch: riscv64
# build_dist: debian build_dist: debian
# build_type: gcc-release-ninja-full build_type: gcc-release-ninja-full
# - build_arch: riscv64 - build_arch: riscv64
# build_dist: ubuntu build_dist: ubuntu
# build_type: clang-debug-shared-ninja-split build_type: clang-debug-shared-ninja-split
- build_arch: amd64 - build_arch: amd64
build_dist: alpine build_dist: alpine

13
CMakeLists.txt
View File

@ -140,17 +140,6 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/modules")
find_package(PkgConfig) find_package(PkgConfig)
if(STATIC_BUILD_DO_NOT_USE) if(STATIC_BUILD_DO_NOT_USE)
# Strangely this is needed when linking statically against FLAC++
#add_compile_options(-fno-omit-frame-pointer)
if(STATIC_BUILD_EXTRA_PREFIX)
foreach (prefix ${STATIC_BUILD_EXTRA_PREFIX})
include_directories(BEFORE ${prefix}/include)
endforeach()
list(PREPEND CMAKE_PREFIX_PATH ${STATIC_BUILD_EXTRA_PREFIX})
set(PKG_CONFIG_USE_CMAKE_PREFIX_PATH ON)
endif()
set(CMAKE_FIND_LIBRARY_SUFFIXES set(CMAKE_FIND_LIBRARY_SUFFIXES
".a" ".a"
CACHE STRING "please look for static libs") CACHE STRING "please look for static libs")
@ -1058,7 +1047,7 @@ if(STATIC_BUILD_DO_NOT_USE OR WIN32)
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
) )
else() else()
if(${CMAKE_SYSTEM_PROCESSOR} MATCHES "^(i386|x86_64|AMD64|aarch64|ppc64le)$") if(${CMAKE_SYSTEM_PROCESSOR} MATCHES "^(i386|x86_64|AMD64|aarch64|ppc64le|arm)$")
find_program(UPX_EXE upx upx.exe PATHS "c:/bin" DOC "ultimate packer for executables") find_program(UPX_EXE upx upx.exe PATHS "c:/bin" DOC "ultimate packer for executables")
endif() endif()