Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

updpatch: upx 4.2.1-1 #3241

Merged
merged 1 commit into from
Nov 10, 2023
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
updpatch: upx 4.2.1-1
Fix rotten by disabling self-pack tests.
  • Loading branch information
moui0 committed Nov 8, 2023
commit a3b9452a7c79474cdc6c21783837a299278e1a25
17 changes: 11 additions & 6 deletions upx/riscv64.patch
Original file line number Diff line number Diff line change
@@ -1,11 +1,16 @@
--- PKGBUILD
+++ PKGBUILD
@@ -35,6 +35,8 @@ prepare() {
for x in doctest lzma-sdk ucl valgrind zlib; do
rm -frv vendor/$x && ln -s "$srcdir/upx-vendor-$x" vendor/$x
done
+
+ git cherry-pick -n 38a676f6f78e82ca0c2f08ef16446bc3e66cd453
@@ -37,10 +37,12 @@ prepare() {
}

build() {
+ # disable self-pack test for RISC-V
+ # https://github.com/upx/upx/blob/d7142312c9d65e4daa0c7fe504af196cd96e88d7/CMakeLists.txt#L48-L49
make -C $pkgname \
CHECK_WHITESPACE=/bin/true \
CXXFLAGS_WERROR="" \
- UPX_CMAKE_CONFIG_FLAGS='-D UPX_CONFIG_DISABLE_GITREV=1 -D UPX_CONFIG_DISABLE_SANITIZE=1 -D UPX_CONFIG_DISABLE_WERROR=1' \
+ UPX_CMAKE_CONFIG_FLAGS='-D UPX_CONFIG_DISABLE_GITREV=1 -D UPX_CONFIG_DISABLE_SANITIZE=1 -D UPX_CONFIG_DISABLE_WERROR=1 -D UPX_CONFIG_DISABLE_SELF_PACK_TEST=1' \
UPX_LZMA_VERSION=0x465 \
UPX_LZMADIR="$srcdir"
}