3 files changed, 16 insertions, 10 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 2e2f4eb733ba..4fc221ecc11b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = 7-zip-full
 	pkgdesc = File archiver with a high compression ratio. (Full package to replace p7zip.)
 	pkgver = 22.01
-	pkgrel = 1
+	pkgrel = 2
 	url = https://www.7-zip.org
 	arch = x86_64
 	license = LGPL
@@ -13,6 +13,6 @@ pkgbase = 7-zip-full
 	source = 7z2201-src.tar.xz::https://www.7-zip.org/a/7z2201-src.tar.xz
 	source = prepare.patch
 	sha256sums = 393098730c70042392af808917e765945dc2437dee7aae3cfcc4966eb920fbc5
-	sha256sums = 9682e6493d372424be837f2385820935a104b7ce60c3dc8946fdaaefd00ac21f
+	sha256sums = fa1fd77e9d95f97d349f057c53b9ba4bacde64b2fae3a50d16b1d93e991d7866
 
 pkgname = 7-zip-full
diff --git a/PKGBUILD b/PKGBUILD
index b54be1d58be3..d382295250f9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,6 +1,6 @@
 pkgname=7-zip-full
 pkgver=22.01
-pkgrel=1
+pkgrel=2
 pkgdesc="File archiver with a high compression ratio. (Full package to replace p7zip.)"
 url="https://www.7-zip.org"
 license=(LGPL)
@@ -18,7 +18,7 @@ source=(
 
 sha256sums=(
     '393098730c70042392af808917e765945dc2437dee7aae3cfcc4966eb920fbc5'
-    '9682e6493d372424be837f2385820935a104b7ce60c3dc8946fdaaefd00ac21f'
+    'fa1fd77e9d95f97d349f057c53b9ba4bacde64b2fae3a50d16b1d93e991d7866'
 )
 
 prepare() {
diff --git a/prepare.patch b/prepare.patch
index 20e9fd9f1f9a..f3db0237c117 100644
--- a/prepare.patch
+++ b/prepare.patch
@@ -3,12 +3,18 @@
 @@ -10 +10 @@

 -MY_ASM = asmc

 +MY_ASM = uasm

-@@ -29 +29 @@

-- -fPIC

-+ -fPIC -Wno-maybe-uninitialized

-@@ -170 +170 @@

--LFLAGS_ALL = -s $(MY_ARCH_2) $(LDFLAGS) $(LD_arch) $(OBJS) $(MY_LIBS) $(LIB2)

-+LFLAGS_ALL = -s $(MY_ARCH_2) $(LDFLAGS) -Wl,-z,noexecstack $(LD_arch) $(OBJS) $(MY_LIBS) $(LIB2)

+@@ -78 +78 @@

+-LDFLAGS = -shared -fPIC $(LDFLAGS_STATIC)

++LDFLAGS += -shared -fPIC $(LDFLAGS_STATIC)

+@@ -85 +85 @@

+-LDFLAGS = $(LDFLAGS_STATIC)

++LDFLAGS += $(LDFLAGS_STATIC)

+@@ -141 +141 @@

+-CFLAGS = $(MY_ARCH_2) $(LOCAL_FLAGS) $(CFLAGS_BASE2) $(CFLAGS_BASE) $(CC_SHARED) -o $@

++CFLAGS += $(MY_ARCH_2) $(LOCAL_FLAGS) $(CFLAGS_BASE2) $(CFLAGS_BASE) $(CC_SHARED) -o $@

+@@ -182 +182 @@

+-CXXFLAGS = $(MY_ARCH_2) $(LOCAL_FLAGS) $(CXXFLAGS_BASE2) $(CFLAGS_BASE) $(CXXFLAGS_EXTRA) $(CC_SHARED) -o $@ $(CXX_WARN_FLAGS)

++CXXFLAGS += $(MY_ARCH_2) $(LOCAL_FLAGS) $(CXXFLAGS_BASE2) $(CFLAGS_BASE) $(CXXFLAGS_EXTRA) $(CC_SHARED) -o $@ $(CXX_WARN_FLAGS)

 

 --- CPP/7zip/var_gcc_x64.mak

 +++ CPP/7zip/var_gcc_x64.mak