On Wed, Jun 17, 2020 at 08:02:13PM +0100, Stuart Henderson wrote:
> On 2020/06/17 12:16, Kurt Mosiejczuk wrote:
> > On Wed, Jun 10, 2020 at 11:41:50AM +0200, Antoine Jacoutot wrote:
> > > On Wed, Jun 10, 2020 at 02:02:13AM -0400, Kurt Mosiejczuk wrote:
> > > > base-gcc needs to be told to use c99 for geary to build.
> > > > This fixes the build of geary on sparc64 (and presumably other base-gcc
> > > > arches).
> > > > ok?
> > > Can we ifdef it for base-gcc?
> > How? I can't use CHOSEN_COMPILER in a .if condition because it is
> > defined in the includes, so is not defined in the Makefile body.
> > If you can tell me how, I'll change it to a conditional.
> The only use I see for CHOSEN_COMPILER how it currently works is with
> 'make show=CHOSEN_COMPILER'.. You can do this though:
> .include <bsd.port.arch.mk>
> .if !${PROPERTIES:Mclang}
> CFLAGS += -std=gnu99
> .endif
OK. Here's a version of the diff that does that.
--Kurt
Index: Makefile
===================================================================
RCS file: /cvs/ports/mail/geary/Makefile,v
retrieving revision 1.59
diff -u -p -r1.59 Makefile
--- Makefile 14 May 2020 14:54:45 -0000 1.59
+++ Makefile 18 Jun 2020 01:40:38 -0000
@@ -31,6 +31,11 @@ CONFIGURE_ARGS= -Dlibunwind_optional=tr
-Diso_639_xml=${LOCALBASE}/share/xml/iso-codes/iso_639.xml \
-Diso_3166_xml=${LOCALBASE}/share/xml/iso-codes/iso_3166.xml
+.include <bsd.port.arch.mk>
+.if !${PROPERTIES:Mclang}
+CFLAGS += -std=gnu99
+.endif
+
RUN_DEPENDS= devel/iso-codes
BUILD_DEPENDS= devel/appstream-glib \
