diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml index bf17cf413..e3280a26e 100644 --- a/.gitea/workflows/build.yaml +++ b/.gitea/workflows/build.yaml @@ -66,45 +66,12 @@ jobs: # Add new cmake to PATH echo "$(pwd)/cmake-3.28.1-linux-x86_64/bin" >> $GITHUB_PATH - - name: Sanitize Dependencies (Fix New Makefiles) + - name: Sanitize Makefiles (Strict Formatting) run: | - # 1. CLEAN PACKAGES.MK (No extra spaces) - echo "packages := boost openssl expat libusb hidapi protobuf libiconv sodium zeromq unbound zlib zstd" > contrib/depends/packages/packages.mk + # 1. FIX PACKAGES.MK (Clean single line) + printf "packages := boost openssl expat libusb hidapi protobuf libiconv sodium zeromq unbound zlib zstd\n" > contrib/depends/packages/packages.mk - # 2. CLEAN ZLIB.MK (Fix Separator Errors) - printf "package=zlib\n" > contrib/depends/packages/zlib.mk - printf "\$(package)_version=1.3.1\n" >> contrib/depends/packages/zlib.mk - printf "\$(package)_download_path=https://zlib.net/\n" >> contrib/depends/packages/zlib.mk - printf "\$(package)_file_name=\$(package)-\$(\$(package)_version).tar.gz\n" >> contrib/depends/packages/zlib.mk - printf "\$(package)_sha256_hash=9a93b2b7dfdac77ceba5a558a580e74667dd6fede4585b91eefb60f03b72df23\n" >> contrib/depends/packages/zlib.mk - printf "define \$(package)_set_vars\n" >> contrib/depends/packages/zlib.mk - printf " \$(package)_config_opts=--static\n" >> contrib/depends/packages/zlib.mk - printf "endef\n" >> contrib/depends/packages/zlib.mk - printf "define \$(package)_config_cmds\n" >> contrib/depends/packages/zlib.mk - printf " CHOST=\${host} ./configure \$(\$(package)_config_opts) --prefix=\$(\$(package)_staging_prefix_dir)\n" >> contrib/depends/packages/zlib.mk - printf "endef\n" >> contrib/depends/packages/zlib.mk - printf "define \$(package)_build_cmds\n" >> contrib/depends/packages/zlib.mk - printf " \$(MAKE) libz.a\n" >> contrib/depends/packages/zlib.mk - printf "endef\n" >> contrib/depends/packages/zlib.mk - printf "define \$(package)_stage_cmds\n" >> contrib/depends/packages/zlib.mk - printf " \$(MAKE) install\n" >> contrib/depends/packages/zlib.mk - printf "endef\n" >> contrib/depends/packages/zlib.mk - - # 3. CLEAN ZSTD.MK (Fix Separator Errors) - printf "package=zstd\n" > contrib/depends/packages/zstd.mk - printf "\$(package)_version=1.5.5\n" >> contrib/depends/packages/zstd.mk - printf "\$(package)_download_path=https://github.com/facebook/zstd/releases/download/v\$(\$(package)_version)/\n" >> contrib/depends/packages/zstd.mk - printf "\$(package)_file_name=\$(package)-\$(\$(package)_version).tar.gz\n" >> contrib/depends/packages/zstd.mk - printf "\$(package)_sha256_hash=9c4396cc829cfae319a6e2615202e82aad41372073482fce286fac78646d3ee4\n" >> contrib/depends/packages/zstd.mk - printf "define \$(package)_build_cmds\n" >> contrib/depends/packages/zstd.mk - printf " \$(MAKE) -C lib libzstd.a\n" >> contrib/depends/packages/zstd.mk - printf "endef\n" >> contrib/depends/packages/zstd.mk - printf "define \$(package)_stage_cmds\n" >> contrib/depends/packages/zstd.mk - printf " cp lib/libzstd.a \$(\$(package)_staging_prefix_dir)/lib/\n" >> contrib/depends/packages/zstd.mk - printf " cp lib/zstd.h \$(\$(package)_staging_prefix_dir)/include/\n" >> contrib/depends/packages/zstd.mk - printf "endef\n" >> contrib/depends/packages/zstd.mk - - # 4. CLEAN BOOST.MK (MacOS ARM Fix) + # 2. FIX BOOST.MK (FLUSH LEFT - NO INDENTATION) cat <<'EOF' > contrib/depends/packages/boost.mk package=boost $(package)_version=1.90.0 @@ -112,48 +79,74 @@ jobs: $(package)_file_name=$(package)_$(subst .,_,$($(package)_version)).tar.bz2 $(package)_sha256_hash=49551aff3b22cbc5c5a9ed3dbc92f0e23ea50a0f7325b0d198b705e8ee3fc305 $(package)_dependencies=libiconv - define $(package)_set_vars - $(package)_config_opts_release=variant=release - $(package)_config_opts_debug=variant=debug - $(package)_config_opts+=--layout=system --user-config=user-config.jam - $(package)_config_opts+=threading=multi link=static -sNO_BZIP2=1 -sNO_ZLIB=1 - - $(package)_config_opts_linux=threadapi=pthread runtime-link=static - $(package)_config_opts_darwin=target-os=darwin runtime-link=shared - $(package)_config_opts_mingw32=binary-format=pe target-os=windows threadapi=win32 runtime-link=static - - $(package)_config_opts_x86_64_mingw32=address-model=64 - $(package)_config_opts_i686_mingw32=address-model=32 - $(package)_config_opts_i686_linux=address-model=32 architecture=x86 - $(package)_config_opts_x86_64_darwin=address-model=64 - - # MACOS ARM FIX - $(package)_config_opts_aarch64_darwin=address-model=64 architecture=arm binary-format=mach-o abi=aapcs - - $(package)_toolset_$(host_os)=gcc - $(package)_archiver_$(host_os)=$($(package)_ar) - $(package)_toolset_darwin=darwin - $(package)_archiver_darwin=$($(package)_libtool) - - $(package)_config_libraries=atomic,chrono,date_time,filesystem,program_options,regex,serialization,system,thread,locale,context,coroutine - $(package)_cxxflags=-std=c++17 -fPIC + $(package)_config_opts_release=variant=release + $(package)_config_opts_debug=variant=debug + $(package)_config_opts+=--layout=system --user-config=user-config.jam + $(package)_config_opts+=threading=multi link=static -sNO_BZIP2=1 -sNO_ZLIB=1 + $(package)_config_opts_linux=threadapi=pthread runtime-link=static + $(package)_config_opts_darwin=target-os=darwin runtime-link=shared + $(package)_config_opts_mingw32=binary-format=pe target-os=windows threadapi=win32 runtime-link=static + $(package)_config_opts_x86_64_mingw32=address-model=64 + $(package)_config_opts_i686_mingw32=address-model=32 + $(package)_config_opts_i686_linux=address-model=32 architecture=x86 + $(package)_config_opts_x86_64_darwin=address-model=64 + $(package)_config_opts_aarch64_darwin=address-model=64 architecture=arm binary-format=mach-o abi=aapcs + $(package)_toolset_$(host_os)=gcc + $(package)_archiver_$(host_os)=$($(package)_ar) + $(package)_toolset_darwin=darwin + $(package)_archiver_darwin=$($(package)_libtool) + $(package)_config_libraries=atomic,chrono,date_time,filesystem,program_options,regex,serialization,system,thread,locale,context,coroutine + $(package)_cxxflags=-std=c++17 -fPIC endef - define $(package)_preprocess_cmds - echo "using $(boost_toolset_$(host_os)) : : $($(package)_cxx) : \"$($(package)_cxxflags) $($(package)_cppflags)\" \"$($(package)_ldflags)\" \"$(boost_archiver_$(host_os))\" \"$($(package)_arflags)\" \"$(host_STRIP)\" \"$(host_RANLIB)\" \"$(host_WINDRES)\" : ;" > user-config.jam + echo "using $(boost_toolset_$(host_os)) : : $($(package)_cxx) : \"$($(package)_cxxflags) $($(package)_cppflags)\" \"$($(package)_ldflags)\" \"$(boost_archiver_$(host_os))\" \"$($(package)_arflags)\" \"$(host_STRIP)\" \"$(host_RANLIB)\" \"$(host_WINDRES)\" : ;" > user-config.jam endef - define $(package)_config_cmds - ./bootstrap.sh --without-icu --with-libraries=$(boost_config_libraries) + ./bootstrap.sh --without-icu --with-libraries=$(boost_config_libraries) endef - define $(package)_build_cmds - ./b2 -d2 -j2 -d1 --prefix=$($(package)_staging_prefix_dir) $($(package)_config_opts) stage + ./b2 -d2 -j2 -d1 --prefix=$($(package)_staging_prefix_dir) $($(package)_config_opts) stage endef - define $(package)_stage_cmds - ./b2 -d0 -j4 --prefix=$($(package)_staging_prefix_dir) $($(package)_config_opts) install + ./b2 -d0 -j4 --prefix=$($(package)_staging_prefix_dir) $($(package)_config_opts) install + endef + EOF + + # 3. FIX ZLIB.MK (FLUSH LEFT) + cat <<'EOF' > contrib/depends/packages/zlib.mk + package=zlib + $(package)_version=1.3.1 + $(package)_download_path=https://zlib.net/ + $(package)_file_name=$(package)-$($(package)_version).tar.gz + $(package)_sha256_hash=9a93b2b7dfdac77ceba5a558a580e74667dd6fede4585b91eefb60f03b72df23 + define $(package)_set_vars + $(package)_config_opts=--static + endef + define $(package)_config_cmds + CHOST=${host} ./configure $($(package)_config_opts) --prefix=$($(package)_staging_prefix_dir) + endef + define $(package)_build_cmds + $(MAKE) libz.a + endef + define $(package)_stage_cmds + $(MAKE) install + endef + EOF + + # 4. FIX ZSTD.MK (FLUSH LEFT) + cat <<'EOF' > contrib/depends/packages/zstd.mk + package=zstd + $(package)_version=1.5.5 + $(package)_download_path=https://github.com/facebook/zstd/releases/download/v$($(package)_version)/ + $(package)_file_name=$(package)-$($(package)_version).tar.gz + $(package)_sha256_hash=9c4396cc829cfae319a6e2615202e82aad41372073482fce286fac78646d3ee4 + define $(package)_build_cmds + $(MAKE) -C lib libzstd.a + endef + define $(package)_stage_cmds + cp lib/libzstd.a $($(package)_staging_prefix_dir)/lib/ + cp lib/zstd.h $($(package)_staging_prefix_dir)/include/ endef EOF