From 1be6cb44980cf8233900889326d14aa054987a62 Mon Sep 17 00:00:00 2001 From: Alessandro Barbieri Date: Wed, 29 Jun 2022 22:02:42 +0200 Subject: app-i18n/canna: don't call gcc directly Bug: https://bugs.gentoo.org/855125 Signed-off-by: Alessandro Barbieri --- app-i18n/canna/files/canna-respect-flags.patch | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/app-i18n/canna/files/canna-respect-flags.patch b/app-i18n/canna/files/canna-respect-flags.patch index 13fb1ed9c..893fc9cd8 100644 --- a/app-i18n/canna/files/canna-respect-flags.patch +++ b/app-i18n/canna/files/canna-respect-flags.patch @@ -1,5 +1,16 @@ ---- /var/tmp/portage/app-i18n/canna-3.7_p3-r4/work/Canna37p3/canuum/Imakefile -+++ Canna37p3/canuum/Imakefile +--- a/Canna.conf ++++ b/Canna.conf +@@ -548,7 +548,7 @@ + Concat3(lib,libname,.dll): solist @@\ + RemoveFile(LibraryTargetName(libname)) @@\ + RemoveFile(Concat3(lib,libname,.dll)) @@\ +- gcc -shared -nostartfiles -Wl,--out-implib=Concat(lib,libname.a) -o Concat3(lib,libname,.dll) solist $(REQUIREDLIBS) @@\ ++ $(CC) $(CFLAGS) $(LDFLAGS) -shared -nostartfiles -Wl,--out-implib=Concat(lib,libname.a) -o Concat3(lib,libname,.dll) solist $(REQUIREDLIBS) @@\ + @@\ + clean:: @@\ + RemoveFile(LibraryTargetName(libname)) @@\ +--- a/canuum/Imakefile ++++ b/canuum/Imakefile @@ -51,6 +51,8 @@ $(CONFIGURE_CMD) XCOMM Invoked from confwrapper @@ -11,8 +22,8 @@ + $(CANNAROOT)/confwrapper mkenv AR $(AR) >> $@ $(CANNAROOT)/confwrapper mkenv CFLAGS $(PURE_CFLAGS) >> $@ + $(CANNAROOT)/confwrapper mkenv LDFLAGS $(LDFLAGS) >> $@ ---- /var/tmp/portage/app-i18n/canna-3.7_p3-r4/work/Canna37p3/Imakefile -+++ Canna37p3/Imakefile +--- a/Imakefile ++++ b/Imakefile @@ -117,9 +117,11 @@ $(CONFIGURE_CMD) XCOMM Invoked from confwrapper -- cgit v1.2.3-65-gdbad