pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/misc/libreoffice libreoffice: put a kludge to fix a bu...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/dcf44080659f
branches:  trunk
changeset: 770869:dcf44080659f
user:      tsutsui <tsutsui%pkgsrc.org@localhost>
date:      Fri Dec 10 19:00:13 2021 +0000

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

diffstat:

 misc/libreoffice/Makefile |  8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)

diffs (22 lines):

diff -r e10ec69a4bb2 -r dcf44080659f misc/libreoffice/Makefile
--- a/misc/libreoffice/Makefile Fri Dec 10 18:42:53 2021 +0000
+++ b/misc/libreoffice/Makefile Fri Dec 10 19:00:13 2021 +0000
@@ -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 @@
 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



Home | Main Index | Thread Index | Old Index