diff options
| author |   Sam James <sam@gentoo.org> | 2024-04-05 15:11:18 +0100 |
|---|---|---|
| committer | Sam James <sam@gentoo.org> | 2024-04-05 15:25:19 +0100 |
| commit | e0577057b8cc6b4bb3c1445a7d1015843ef1cb54 (patch) | |
| tree | 729e1f58986f944278c7365da4f0670f30e424a5 /app-arch/7zip/files | |
| parent | dev-lang/uasm: workaround modern C issues for now (diff) | |
| download | gentoo-e0577057b8cc6b4bb3c1445a7d1015843ef1cb54.tar.gz gentoo-e0577057b8cc6b4bb3c1445a7d1015843ef1cb54.tar.bz2 gentoo-e0577057b8cc6b4bb3c1445a7d1015843ef1cb54.zip | |
app-arch/7zip: new package, add 23.01
Imported from ::guru as of commit ea612f548c48f74fce1abc60d5ad205c521c7492.
Adding arthur and myself as well as NRK as discussed in #gentoo-guru. I'll
email the other maint in guru too.
Bug: https://bugs.gentoo.org/664664
Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'app-arch/7zip/files')
| -rw-r--r-- | app-arch/7zip/files/7zip-23.01-respect-build-env.patch | 53 |
1 files changed, 53 insertions, 0 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 new file mode 100644 index 000000000000..c897cf625931 --- /dev/null +++ b/app-arch/7zip/files/7zip-23.01-respect-build-env.patch @@ -0,0 +1,53 @@ +Respect build environment settings + +Bug: https://bugs.gentoo.org/913186 +Bug: https://bugs.gentoo.org/913188 +Bug: https://bugs.gentoo.org/913189 + + +--- a/7zip_gcc.mak ++++ b/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) |