commit: aef3252046b1146d2d52ad2a3594709888318c0d Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at> AuthorDate: Tue Aug 20 06:34:04 2024 +0000 Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org> CommitDate: Tue Aug 20 06:52:46 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aef32520
app-arch/7zip: remove unused patch Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at> Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org> .../7zip/files/7zip-23.01-respect-build-env.patch | 53 ---------------------- 1 file changed, 53 deletions(-) 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 deleted file mode 100644 index a5871db9159c..000000000000 --- a/app-arch/7zip/files/7zip-23.01-respect-build-env.patch +++ /dev/null @@ -1,53 +0,0 @@ -Respect build environment settings - -Bug: https://bugs.gentoo.org/913186 -Bug: https://bugs.gentoo.org/913188 -Bug: https://bugs.gentoo.org/913189 - - ---- a/CPP/7zip/7zip_gcc.mak -+++ b/CPP/7zip/7zip_gcc.mak -@@ -87,14 +87,14 @@ SHARED_EXT=.dll - LDFLAGS = -shared -DEF $(DEF_FILE) $(LDFLAGS_STATIC) - else - SHARED_EXT=.so --LDFLAGS = -shared -fPIC $(LDFLAGS_STATIC) -+LDFLAGS = -shared -fPIC $(G_LDFLAGS) $(LDFLAGS_STATIC) - CC_SHARED=-fPIC - endif - - - else - --LDFLAGS = $(LDFLAGS_STATIC) -+LDFLAGS = $(LDFLAGS_STATIC) $(G_LDFLAGS) - # -s is not required for clang, do we need it for GCC ??? - - #-static -static-libgcc -static-libstdc++ -@@ -149,7 +149,7 @@ endif - - - --CFLAGS = $(MY_ARCH_2) $(LOCAL_FLAGS) $(CFLAGS_BASE2) $(CFLAGS_BASE) $(FLAGS_FLTO) $(CC_SHARED) -o $@ -+CFLAGS = $(MY_ARCH_2) $(LOCAL_FLAGS) $(CFLAGS_BASE2) $(CFLAGS_BASE) $(FLAGS_FLTO) $(CC_SHARED) $(G_CFLAGS) -o $@ - - - ifdef IS_MINGW -@@ -190,7 +190,7 @@ CXX_WARN_FLAGS = - #-Wno-invalid-offsetof - #-Wno-reorder - --CXXFLAGS = $(MY_ARCH_2) $(LOCAL_FLAGS) $(CXXFLAGS_BASE2) $(CFLAGS_BASE) $(FLAGS_FLTO) $(CXXFLAGS_EXTRA) $(CC_SHARED) $(CXX_WARN_FLAGS) $(CXX_STD_FLAGS) -o $@ -+CXXFLAGS = $(MY_ARCH_2) $(LOCAL_FLAGS) $(CXXFLAGS_BASE2) $(CFLAGS_BASE) $(FLAGS_FLTO) $(CXXFLAGS_EXTRA) $(CC_SHARED) $(CXX_WARN_FLAGS) $(CXX_STD_FLAGS) $(G_CXXFLAGS) -o $@ - - STATIC_TARGET= - ifdef COMPL_STATIC -@@ -208,7 +208,7 @@ $(O): - # -Wl,--print-gc-sections - - ifneq ($(CC), $(CROSS_COMPILE)clang) --LFLAGS_STRIP = -s -+ - endif - - LFLAGS_ALL = $(LFLAGS_STRIP) $(MY_ARCH_2) $(LDFLAGS) $(FLAGS_FLTO) $(LD_arch) $(OBJS) $(MY_LIBS) $(LIB2)
