Skip to content

Commit

Permalink
fix patch
Browse files Browse the repository at this point in the history
  • Loading branch information
hemnstill committed May 15, 2024
1 parent 660d654 commit bd58bb6
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 21 deletions.
2 changes: 2 additions & 0 deletions 7-Zip/build_musl.sh
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@ bsdtar="$dp0/release/bsdtar"
curl --location "$download_url" --output "tool-$tool_version.tar.xz"
"$bsdtar" -xf "tool-$tool_version.tar.xz"

git apply "$dp0/release/0001-static.patch"

echo "::endgroup::"

echo "::group::build"
Expand Down
29 changes: 8 additions & 21 deletions 7-Zip/release/0001-static.patch
Original file line number Diff line number Diff line change
@@ -1,38 +1,25 @@
From 1d9a48d5589fd888d63f363ed654f81c1693bec7 Mon Sep 17 00:00:00 2001
From 83965d8dd1e6e802c46febc204cddd32fbecea8a Mon Sep 17 00:00:00 2001
From: Reshetnikov Alexandr <[email protected]>
Date: Sun, 6 Aug 2023 22:01:23 +0400
Subject: [PATCH] + static - affinity
Date: Wed, 15 May 2024 20:56:13 +0400
Subject: [PATCH] LDFLAGS_STATIC2 = -static

---
C/Threads.h | 1 -
CPP/7zip/7zip_gcc.mak | 2 ++
2 files changed, 2 insertions(+), 1 deletion(-)
1 file changed, 2 insertions(+)

diff --git a/C/Threads.h b/C/Threads.h
index c6aa6a8..7abb2ab 100644
--- a/C/Threads.h
+++ b/C/Threads.h
@@ -12,7 +12,6 @@
#if defined(__linux__)
#if !defined(__APPLE__) && !defined(_AIX) && !defined(__ANDROID__)
#ifndef Z7_AFFINITY_DISABLE
-#define Z7_AFFINITY_SUPPORTED
// #pragma message(" ==== Z7_AFFINITY_SUPPORTED")
// #define _GNU_SOURCE
#endif
diff --git a/CPP/7zip/7zip_gcc.mak b/CPP/7zip/7zip_gcc.mak
index a8eb6e3..bf3e671 100644
index b3f94be..d3b5066 100644
--- a/CPP/7zip/7zip_gcc.mak
+++ b/CPP/7zip/7zip_gcc.mak
@@ -68,6 +68,8 @@ endif
@@ -85,6 +85,8 @@ endif
endif
endif

+LDFLAGS_STATIC_2 = -static
+
LDFLAGS_STATIC = -DNDEBUG $(LDFLAGS_STATIC_2)
LDFLAGS_STATIC = $(CFLAGS_DEBUG) $(LDFLAGS_STATIC_2) $(LDFLAGS_STATIC_3)

ifndef O
--
2.37.2.windows.2
2.43.0.windows.1

0 comments on commit bd58bb6

Please sign in to comment.