From: r-ricci <r-ricci@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] 7zip: update to 23.01.
Date: Sun, 30 Jul 2023 20:57:20 +0200 [thread overview]
Message-ID: <20230730185720.7l_dmyem_D1dO4NYgjXNXo1Bjk0BPek55qsijfRngnM@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-44577@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 1236 bytes --]
There is an updated pull request by r-ricci against master on the void-packages repository
https://github.com/r-ricci/void-packages 7zip
https://github.com/void-linux/void-packages/pull/44577
7zip: update to 23.01.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/44577.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-7zip-44577.patch --]
[-- Type: text/x-diff, Size: 4679 bytes --]
From 7fd2bc094882ee6221ccdc732c93039552282138 Mon Sep 17 00:00:00 2001
From: Roberto Ricci <ricci@disroot.org>
Date: Thu, 22 Jun 2023 23:41:40 +0200
Subject: [PATCH] 7zip: update to 23.01.
---
srcpkgs/7zip/patches/build_flags.patch | 38 ++++++++++++++------------
srcpkgs/7zip/template | 10 +++----
2 files changed, 25 insertions(+), 23 deletions(-)
diff --git a/srcpkgs/7zip/patches/build_flags.patch b/srcpkgs/7zip/patches/build_flags.patch
index f36dd57916804..2db2d00cbe560 100644
--- a/srcpkgs/7zip/patches/build_flags.patch
+++ b/srcpkgs/7zip/patches/build_flags.patch
@@ -2,15 +2,17 @@ adapted from https://sources.debian.org/patches/7zip/22.01+dfsg-4/0001-Accept-De
and https://gitlab.alpinelinux.org/alpine/aports/-/raw/291a2b61d6e613fbe3ed057c1f2ee41fd2aea9ac/community/7zip/7-zip-flags.patch
--- a/CPP/7zip/7zip_gcc.mak
+++ b/CPP/7zip/7zip_gcc.mak
-@@ -18,13 +18,13 @@
+@@ -24,7 +24,7 @@
ifneq ($(CC), xlc)
--CFLAGS_WARN_WALL = -Wall -Werror -Wextra
+-CFLAGS_WARN_WALL = -Werror -Wall -Wextra
+CFLAGS_WARN_WALL = -Wall -Wextra
endif
# for object file
+@@ -32,7 +32,7 @@
+ # -save-temps
CFLAGS_BASE_LIST = -c
# CFLAGS_BASE_LIST = -S
-CFLAGS_BASE = -O2 $(CFLAGS_BASE_LIST) $(CFLAGS_WARN_WALL) $(CFLAGS_WARN) \
@@ -18,39 +20,39 @@ and https://gitlab.alpinelinux.org/alpine/aports/-/raw/291a2b61d6e613fbe3ed057c1
-DNDEBUG -D_REENTRANT -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE \
-fPIC
-@@ -82,7 +82,7 @@
+@@ -94,7 +94,7 @@
else
-LDFLAGS = $(LDFLAGS_STATIC)
+LDFLAGS = $(VOID_LDFLAGS) $(LDFLAGS_STATIC)
- # -s is not required for clang, do we need it for GGC ???
- # -s
+ # -s is not required for clang, do we need it for GCC ???
-@@ -138,7 +138,7 @@
+ #-static -static-libgcc -static-libstdc++
+@@ -149,7 +149,7 @@
--CFLAGS = $(MY_ARCH_2) $(LOCAL_FLAGS) $(CFLAGS_BASE2) $(CFLAGS_BASE) $(CC_SHARED) -o $@
-+CFLAGS = $(VOID_CFLAGS) $(VOID_CPPFLAGS) $(MY_ARCH_2) $(LOCAL_FLAGS) $(CFLAGS_BASE2) $(CFLAGS_BASE) $(CC_SHARED) -o $@
+-CFLAGS = $(MY_ARCH_2) $(LOCAL_FLAGS) $(CFLAGS_BASE2) $(CFLAGS_BASE) $(FLAGS_FLTO) $(CC_SHARED) -o $@
++CFLAGS = $(VOID_CFLAGS) $(VOID_CPPFLAGS) $(MY_ARCH_2) $(LOCAL_FLAGS) $(CFLAGS_BASE2) $(CFLAGS_BASE) $(FLAGS_FLTO) $(CC_SHARED) -o $@
ifdef IS_MINGW
-@@ -179,7 +179,7 @@
+@@ -190,7 +190,7 @@
#-Wno-invalid-offsetof
#-Wno-reorder
--CXXFLAGS = $(MY_ARCH_2) $(LOCAL_FLAGS) $(CXXFLAGS_BASE2) $(CFLAGS_BASE) $(CXXFLAGS_EXTRA) $(CC_SHARED) -o $@ $(CXX_WARN_FLAGS)
-+CXXFLAGS = $(VOID_CXXFLAGS) $(VOID_CPPFLAGS) $(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) $(FLAGS_FLTO) $(CXXFLAGS_EXTRA) $(CC_SHARED) $(CXX_WARN_FLAGS) $(CXX_STD_FLAGS) -o $@
++CXXFLAGS = $(VOID_CXXFLAGS) $(VOID_CPPFLAGS) $(MY_ARCH_2) $(LOCAL_FLAGS) $(CXXFLAGS_BASE2) $(CFLAGS_BASE) $(FLAGS_FLTO) $(CXXFLAGS_EXTRA) $(CC_SHARED) $(CXX_WARN_FLAGS) $(CXX_STD_FLAGS) -o $@
STATIC_TARGET=
ifdef COMPL_STATIC
-@@ -192,7 +192,7 @@
- $(O):
- $(MY_MKDIR) $(O)
+@@ -208,7 +208,7 @@
+ # -Wl,--print-gc-sections
--LFLAGS_ALL = -s $(MY_ARCH_2) $(LDFLAGS) $(LD_arch) $(OBJS) $(MY_LIBS) $(LIB2)
-+LFLAGS_ALL = $(MY_ARCH_2) $(LDFLAGS) $(LD_arch) $(OBJS) $(MY_LIBS) $(LIB2)
- $(PROGPATH): $(OBJS)
- $(CXX) -o $(PROGPATH) $(LFLAGS_ALL)
+ ifneq ($(CC), $(CROSS_COMPILE)clang)
+-LFLAGS_STRIP = -s
++LFLAGS_STRIP =
+ endif
+ LFLAGS_ALL = $(LFLAGS_STRIP) $(MY_ARCH_2) $(LDFLAGS) $(FLAGS_FLTO) $(LD_arch) $(OBJS) $(MY_LIBS) $(LIB2)
diff --git a/srcpkgs/7zip/template b/srcpkgs/7zip/template
index f34403896e2a0..0ed42b019f358 100644
--- a/srcpkgs/7zip/template
+++ b/srcpkgs/7zip/template
@@ -1,14 +1,14 @@
# Template file for '7zip'
pkgname=7zip
-version=22.01
-revision=2
+version=23.01
+revision=1
short_desc="File archiver with a high compression ratio"
maintainer="Roberto Ricci <ricci@disroot.org>"
license="LGPL-2.1-or-later, BSD-3-Clause"
homepage="https://www.7-zip.org"
changelog="https://www.7-zip.org/history.txt"
distfiles="https://www.7-zip.org/a/7z${version//./}-src.tar.xz"
-checksum=393098730c70042392af808917e765945dc2437dee7aae3cfcc4966eb920fbc5
+checksum=356071007360e5a1824d9904993e8b2480b51b570e8c9faf7c0f58ebe4bf9f74
alternatives="
7z:7z:/usr/bin/7zip
7z:7za:/usr/bin/7zip
@@ -16,8 +16,8 @@ alternatives="
if [ "$XBPS_TARGET_LIBC" = musl ]; then
# missing pthread_attr_setaffinity_np()
- CFLAGS+="-D_7ZIP_AFFINITY_DISABLE"
- CXXFLAGS+="-D_7ZIP_AFFINITY_DISABLE"
+ CFLAGS+="-DZ7_AFFINITY_DISABLE"
+ CXXFLAGS+="-DZ7_AFFINITY_DISABLE"
fi
do_build() {
next prev parent reply other threads:[~2023-07-30 18:57 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-06-22 22:16 [PR PATCH] " r-ricci
2023-07-30 18:57 ` r-ricci [this message]
2023-08-05 18:53 ` leahneukirchen
2023-08-06 18:16 ` [PR PATCH] [Updated] " r-ricci
2023-08-06 19:54 ` [PR PATCH] [Merged]: " leahneukirchen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230730185720.7l_dmyem_D1dO4NYgjXNXo1Bjk0BPek55qsijfRngnM@z \
--to=r-ricci@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).