CVS commit: pkgsrc/misc/libreoffice

["Izumi Tsutsui" <tsutsui%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tsutsui
Date:           Fri Dec 10 19:00:14 UTC 2021

Modified Files:
        pkgsrc/misc/libreoffice: Makefile

Log Message:
libreoffice: put a kludge to fix a build error on NetBSD/i386. PR/56440


To generate a diff of this commit:
cvs rdiff -u -r1.275 -r1.276 pkgsrc/misc/libreoffice/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/misc/libreoffice/Makefile
diff -u pkgsrc/misc/libreoffice/Makefile:1.275 pkgsrc/misc/libreoffice/Makefile:1.276
--- pkgsrc/misc/libreoffice/Makefile:1.275      Wed Dec  8 16:05:42 2021
+++ pkgsrc/misc/libreoffice/Makefile    Fri Dec 10 19:00:13 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.275 2021/12/08 16:05:42 adam Exp $
+# $NetBSD: Makefile,v 1.276 2021/12/10 19:00:13 tsutsui Exp $
 
 VERREL=                7.2.3
 VERRC=         2
@@ -263,6 +263,12 @@ MAKE_ENV+=         SHELL=${BASH}
 BUILD_MAKE_FLAGS+=     VERBOSE=true
 #BUILD_MAKE_FLAGS+=    GMAKE_OPTIONS+=-p
 
+.if ${MACHINE_ARCH} == "i386"
+# XXX: avoid unexpected substitution in the include path (work.i386 -> work.1)
+#      when ${OBJMACHINE} is set (PR/56440)
+CFLAGS+=               -Ui386
+.endif
+
 .if ${OPSYS} != "Linux"
 BUILDLINK_TRANSFORM+=  rm:-ldl
 .endif