mirror/upx
1
0
Fork 0
mirror of https://github.com/upx/upx synced 2025-09-28 19:06:07 +08:00
Code Issues Releases Wiki Activity

CI updates

Browse Source
This commit is contained in:
Markus F.X.J. Oberhumer 2023-11-08 10:08:19 +01:00
parent 283ab0e7ea
commit d7142312c9
7 changed files with 43 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/ci.yml vendored
View File

@ -13,8 +13,8 @@ env:
CTEST_OUTPUT_ON_FAILURE: "ON"
DEBIAN_FRONTEND: noninteractive
UPX_CMAKE_BUILD_FLAGS: --verbose
# 2023-11-04
ZIG_DIST_VERSION: 0.12.0-dev.1396+f6de3ec96
# 2023-11-08
ZIG_DIST_VERSION: 0.12.0-dev.1502+b3462b7ce
jobs:
job-rebuild-and-verify-stubs:

2
.github/workflows/misc-spell-check.yml vendored
View File

@ -17,5 +17,5 @@ jobs:
uses: actions/checkout@v4
with: { submodules: false }
- name: 'Spell check with crate-ci/typos'
uses: crate-ci/typos@0d04ce91a7a8436a6e3c589750514ac586632192 # v1.16.22
uses: crate-ci/typos@c97d621b6b01d8b0258538ca15abeca5c5764601 # v1.16.23
with: { config: ./.github/typos_config.toml }

4
.github/workflows/weekly-ci-cc-zigcc.yml vendored
View File

@ -11,8 +11,8 @@ env:
CMAKE_REQUIRED_QUIET: "OFF"
CTEST_OUTPUT_ON_FAILURE: "ON"
DEBIAN_FRONTEND: noninteractive
# 2023-11-04
ZIG_DIST_VERSION: 0.12.0-dev.1396+f6de3ec96
# 2023-11-08
ZIG_DIST_VERSION: 0.12.0-dev.1502+b3462b7ce
jobs:
job-linux-zigcc: # uses cmake + make

7
CMakeLists.txt
View File

@ -187,6 +187,13 @@ include(CheckIncludeFile)
include(CheckStructHasMember)
include(CheckSymbolExists)
# TODO later: use pledge()
# https://justine.lol/pledge/
# https://github.com/jart/cosmopolitan
# https://news.ycombinator.com/item?id=32096801
##find_package(PkgConfig QUIET)
##pkg_check_modules(PKG_libseccomp QUIET libseccomp)
if(NOT DEFINED HAVE_UNISTD_H)
check_include_file("unistd.h" HAVE_UNISTD_H)
endif()

6
src/conf.h
View File

@ -83,6 +83,12 @@ ACC_COMPILE_TIME_ASSERT_HEADER((char) (-1) == 255)
#endif // UPX_CONFIG_DISABLE_WSTRICT
// multithreading (UPX currently does not use multithreading)
#if (WITH_THREADS) && defined(_WIN32) && defined(__GLIBCXX__)
#if !defined(_GLIBCXX_HAS_GTHREADS)
#error "broken MinGW installation: missing _GLIBCXX_HAS_GTHREADS"
#undef WITH_THREADS
#endif
#endif
#if (WITH_THREADS)
#define upx_thread_local thread_local
#define upx_std_atomic(Type) std::atomic<Type>

15
src/headers.h
View File

@ -62,6 +62,21 @@ static_assert(sizeof(void *) == 8);
#define _USE_MINGW_ANSI_STDIO 1
#endif
#endif
#if defined(_WIN32)
// disable silly warnings about using "deprecated" POSIX functions like fopen()
#if !defined(_CRT_NONSTDC_NO_DEPRECATE)
#define _CRT_NONSTDC_NO_DEPRECATE 1
#endif
#if !defined(_CRT_NONSTDC_NO_WARNINGS)
#define _CRT_NONSTDC_NO_WARNINGS 1
#endif
#if !defined(_CRT_SECURE_NO_DEPRECATE)
#define _CRT_SECURE_NO_DEPRECATE 1
#endif
#if !defined(_CRT_SECURE_NO_WARNINGS)
#define _CRT_SECURE_NO_WARNINGS 1
#endif
#endif // _WIN32
// ACC and C system headers
#ifndef ACC_CFG_USE_NEW_STYLE_CASTS

10
src/help.cpp
View File

@ -529,6 +529,16 @@ void show_sysinfo(const char *options_var) {
#endif
#if defined(__GLIBC_MINOR__)
cf_print("__GLIBC_MINOR__", "%lld", __GLIBC_MINOR__ + 0);
#endif
// misc compilation options
#if defined(UPX_CONFIG_DISABLE_WSTRICT)
cf_print("UPX_CONFIG_DISABLE_WSTRICT", "%lld", UPX_CONFIG_DISABLE_WSTRICT + 0, 3);
#endif
#if defined(UPX_CONFIG_DISABLE_WERROR)
cf_print("UPX_CONFIG_DISABLE_WERROR", "%lld", UPX_CONFIG_DISABLE_WERROR + 0, 3);
#endif
#if defined(WITH_THREADS)
cf_print("WITH_THREADS", "%lld", WITH_THREADS + 0);
#endif
UNUSED(cf_count);
UNUSED(cf_print);