[gentoo-commits] repo/proj/guru:dev commit in: app-arch/7zip/, app-arch/7zip/files/

[gentoo-commits] repo/proj/guru:dev commit in: app-arch/7zip/, app-arch/7zip/files/

[Nickolas Raymond Kaczynski]

commit:     f324f3dde6e0be2d5893756315b8413754252407
Author:     NRK <nrk <AT> disroot <DOT> org>
AuthorDate: Sat Feb 24 21:42:27 2024 +0000
Commit:     Nickolas Raymond Kaczynski <nrk <AT> disroot <DOT> org>
CommitDate: Mon Feb 26 17:45:02 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=f324f3dd

app-arch/7zip: simplify patch

Signed-off-by: NRK <nrk <AT> disroot.org>

 app-arch/7zip/7zip-23.01.ebuild                    | 12 ++++--
 .../7zip/files/7zip-23.01-respect-build-env.patch  | 45 ----------------------
 2 files changed, 9 insertions(+), 48 deletions(-)

diff --git a/app-arch/7zip/7zip-23.01.ebuild b/app-arch/7zip/7zip-23.01.ebuild
index 414d6e33be..c3ec08e7e0 100644
--- a/app-arch/7zip/7zip-23.01.ebuild
+++ b/app-arch/7zip/7zip-23.01.ebuild
@@ -26,6 +26,10 @@ BDEPEND="
 	jwasm? ( dev-lang/jwasm )
 "
 
+# TODO(NRK): also build and install the library
+# TODO(NRK): make it so this package can be used as a drop-in replacement
+# for app-arch/p7zip ??
+
 pkg_setup() {
 	# instructions in DOC/readme.txt, Compiling 7-Zip for Unix/Linux
 	# TLDR; every combination of options (clang|gcc)+(asm/noasm)
@@ -61,12 +65,14 @@ src_prepare() {
 src_compile() {
 	pushd "./Bundles/Alone2" || die "Unable to switch directory"
 	append-ldflags -Wl,-z,noexecstack
-	export G_CC=$(tc-getCC)
-	export G_CXX=$(tc-getCXX)
 	export G_CFLAGS=${CFLAGS}
 	export G_CXXFLAGS=${CXXFLAGS}
 	export G_LDFLAGS=${LDFLAGS}
-	local args=( -f "../../${mfile}" )
+	local args=(
+		-f "../../${mfile}"
+		CC=$(tc-getCC)
+		CXX=$(tc-getCXX)
+	)
 	# NOTE: makefile doesn't check the value of DISABLE_RAR_COMPRESS, only
 	# whether it's defined or not. so in case user has `rar` enabled
 	# DISABLE_RAR_COMPRESS (and DISABLE_RAR) needs to stay undefined.

diff --git a/app-arch/7zip/files/7zip-23.01-respect-build-env.patch b/app-arch/7zip/files/7zip-23.01-respect-build-env.patch
index 2615a9e34a..c897cf6259 100644
--- a/app-arch/7zip/files/7zip-23.01-respect-build-env.patch
+++ b/app-arch/7zip/files/7zip-23.01-respect-build-env.patch
@@ -51,48 +51,3 @@ Bug: https://bugs.gentoo.org/913189
  endif
 
  LFLAGS_ALL = $(LFLAGS_STRIP) $(MY_ARCH_2) $(LDFLAGS) $(FLAGS_FLTO) $(LD_arch) $(OBJS) $(MY_LIBS) $(LIB2)
---- a/var_clang.mak
-+++ b/var_clang.mak
-@@ -6,6 +6,6 @@ IS_ARM64=
- CROSS_COMPILE=
- MY_ARCH=
- USE_ASM=
--CC=$(CROSS_COMPILE)clang
--CXX=$(CROSS_COMPILE)clang++
-+CC=$(G_CC)
-+CXX=$(G_CXX)
- USE_CLANG=1
---- a/var_clang_x64.mak
-+++ b/var_clang_x64.mak
-@@ -6,7 +6,7 @@ IS_ARM64=
- CROSS_COMPILE=
- MY_ARCH=
- USE_ASM=1
--CC=$(CROSS_COMPILE)clang
--CXX=$(CROSS_COMPILE)clang++
-+CC=$(G_CC)
-+CXX=$(G_CXX)
- USE_CLANG=1
-
---- a/var_gcc.mak
-+++ b/var_gcc.mak
-@@ -6,7 +6,7 @@ IS_ARM64=
- CROSS_COMPILE=
- MY_ARCH=
- USE_ASM=
--CC=$(CROSS_COMPILE)gcc
--CXX=$(CROSS_COMPILE)g++
-+CC=$(G_CC)
-+CXX=$(G_CXX)
-
- # -march=armv8-a+crc+crypto
---- a/var_gcc_x64.mak
-+++ b/var_gcc_x64.mak
-@@ -6,5 +6,5 @@ IS_ARM64=
- CROSS_COMPILE=
- MY_ARCH=
- USE_ASM=1
--CC=$(CROSS_COMPILE)gcc
--CXX=$(CROSS_COMPILE)g++
-+CC=$(G_CC)
-+CXX=$(G_CXX)