From f280eba5d5d473810b36bf1f5094d73d45ae6914 Mon Sep 17 00:00:00 2001 From: "Alex Xu (Hello71)" Date: Tue, 1 Oct 2024 15:23:59 -0400 Subject: app-arch/7-zip: drop upstreamed --- app-arch/7-zip/files/7-zip-flags.patch | 28 --------------------- app-arch/7-zip/files/7-zip-less-asm.patch | 41 ------------------------------- 2 files changed, 69 deletions(-) delete mode 100644 app-arch/7-zip/files/7-zip-flags.patch delete mode 100644 app-arch/7-zip/files/7-zip-less-asm.patch (limited to 'app-arch/7-zip/files') diff --git a/app-arch/7-zip/files/7-zip-flags.patch b/app-arch/7-zip/files/7-zip-flags.patch deleted file mode 100644 index 963037c..0000000 --- a/app-arch/7-zip/files/7-zip-flags.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff -ru a/CPP/7zip/7zip_gcc.mak b/CPP/7zip/7zip_gcc.mak ---- a/CPP/7zip/7zip_gcc.mak 2021-11-20 04:00:00.000000000 -0500 -+++ b/CPP/7zip/7zip_gcc.mak 2021-12-16 11:01:16.236763027 -0500 -@@ -14,13 +14,13 @@ - - - ifneq ($(CC), xlc) --CFLAGS_WARN_WALL = -Wall -Werror -Wextra -+CFLAGS_WARN_WALL = -Wall -Wextra - endif - - # for object file - CFLAGS_BASE_LIST = -c - # CFLAGS_BASE_LIST = -S --CFLAGS_BASE = -O2 $(CFLAGS_BASE_LIST) $(CFLAGS_WARN_WALL) $(CFLAGS_WARN) \ -+CFLAGS_BASE = $(CFLAGS_BASE_LIST) $(CFLAGS_WARN_WALL) $(CFLAGS_WARN) \ - -DNDEBUG -D_REENTRANT -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE \ - -fPIC - -@@ -162,7 +162,7 @@ - $(O): - $(MY_MKDIR) $(O) - --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) - diff --git a/app-arch/7-zip/files/7-zip-less-asm.patch b/app-arch/7-zip/files/7-zip-less-asm.patch deleted file mode 100644 index 040b445..0000000 --- a/app-arch/7-zip/files/7-zip-less-asm.patch +++ /dev/null @@ -1,41 +0,0 @@ ---- a/CPP/7zip/7zip_gcc.mak 2021-12-25 09:00:00.000000000 -0500 -+++ b/CPP/7zip/7zip_gcc.mak 2022-05-13 12:20:17.539629635 -0400 -@@ -1127,21 +1127,6 @@ - endif - endif - --ifdef USE_X86_ASM --$O/7zCrcOpt.o: ../../../../Asm/x86/7zCrcOpt.asm -- $(MY_ASM) $(AFLAGS) $< --$O/XzCrc64Opt.o: ../../../../Asm/x86/XzCrc64Opt.asm -- $(MY_ASM) $(AFLAGS) $< --$O/Sha1Opt.o: ../../../../Asm/x86/Sha1Opt.asm -- $(MY_ASM) $(AFLAGS) $< --$O/Sha256Opt.o: ../../../../Asm/x86/Sha256Opt.asm -- $(MY_ASM) $(AFLAGS) $< -- --ifndef USE_JWASM --USE_X86_ASM_AES=1 --endif -- --else - $O/7zCrcOpt.o: ../../../../C/7zCrcOpt.c - $(CC) $(CFLAGS) $< - $O/XzCrc64Opt.o: ../../../../C/XzCrc64Opt.c -@@ -1150,16 +1135,10 @@ - $(CC) $(CFLAGS) $< - $O/Sha256Opt.o: ../../../../C/Sha256Opt.c - $(CC) $(CFLAGS) $< --endif - - --ifdef USE_X86_ASM_AES --$O/AesOpt.o: ../../../../Asm/x86/AesOpt.asm -- $(MY_ASM) $(AFLAGS) $< --else - $O/AesOpt.o: ../../../../C/AesOpt.c - $(CC) $(CFLAGS) $< --endif - - - ifdef USE_X64_ASM -- cgit v1.2.3-70-g09d2