Fri Dec 10 19:00:14 2021 UTC ()
libreoffice: put a kludge to fix a build error on NetBSD/i386. PR/56440


(tsutsui)
diff -r1.275 -r1.276 pkgsrc/misc/libreoffice/Makefile
cvs diff -r1.275 -r1.276 pkgsrc/misc/libreoffice/Makefile (expand / switch to unified diff)

--- pkgsrc/misc/libreoffice/Makefile 2021/12/08 16:05:42 1.275
+++ pkgsrc/misc/libreoffice/Makefile 2021/12/10 19:00:13 1.276
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.275 2021/12/08 16:05:42 adam Exp $ 1# $NetBSD: Makefile,v 1.276 2021/12/10 19:00:13 tsutsui Exp $
2 2
3VERREL= 7.2.3 3VERREL= 7.2.3
4VERRC= 2 4VERRC= 2
5VER= ${VERREL}.${VERRC} 5VER= ${VERREL}.${VERRC}
6DISTNAME= libreoffice-${VER} 6DISTNAME= libreoffice-${VER}
7PKGREVISION= 1 7PKGREVISION= 1
8CATEGORIES= misc 8CATEGORIES= misc
9MASTER_SITES= http://download.documentfoundation.org/libreoffice/src/${VERREL}/ 9MASTER_SITES= http://download.documentfoundation.org/libreoffice/src/${VERREL}/
10EXTRACT_SUFX= .tar.xz 10EXTRACT_SUFX= .tar.xz
11 11
12MAINTAINER= ryoon@NetBSD.org 12MAINTAINER= ryoon@NetBSD.org
13HOMEPAGE= https://www.libreoffice.org/ 13HOMEPAGE= https://www.libreoffice.org/
14COMMENT= Office productivity suite from The Document Foundation 14COMMENT= Office productivity suite from The Document Foundation
@@ -253,26 +253,32 @@ LO_DESKTOP_FILES= calc.desktop draw.desk @@ -253,26 +253,32 @@ LO_DESKTOP_FILES= calc.desktop draw.desk
253#OBJDIR= pkgsrcbuild 253#OBJDIR= pkgsrcbuild
254#CONFIGURE_DIRS= ${OBJDIR} 254#CONFIGURE_DIRS= ${OBJDIR}
255CONFIGURE_SCRIPT= ${WRKSRC}/autogen.sh 255CONFIGURE_SCRIPT= ${WRKSRC}/autogen.sh
256 256
257#LD_LIBRARY_PATH+= ${WRKSRC}/instdir/sdk/lib:${WRKSRC}/instdir/ure/lib:${WRKSRC}/instdir/program 257#LD_LIBRARY_PATH+= ${WRKSRC}/instdir/sdk/lib:${WRKSRC}/instdir/ure/lib:${WRKSRC}/instdir/program
258 258
259MAKE_ENV+= ROOT_USER=${ROOT_USER} 259MAKE_ENV+= ROOT_USER=${ROOT_USER}
260MAKE_ENV+= ROOT_GROUP=${ROOT_GROUP} 260MAKE_ENV+= ROOT_GROUP=${ROOT_GROUP}
261MAKE_ENV+= SHELL=${BASH} 261MAKE_ENV+= SHELL=${BASH}
262#MAKE_ENV+= LD_LIBRARY_PATH=${LD_LIBRARY_PATH} 262#MAKE_ENV+= LD_LIBRARY_PATH=${LD_LIBRARY_PATH}
263BUILD_MAKE_FLAGS+= VERBOSE=true 263BUILD_MAKE_FLAGS+= VERBOSE=true
264#BUILD_MAKE_FLAGS+= GMAKE_OPTIONS+=-p 264#BUILD_MAKE_FLAGS+= GMAKE_OPTIONS+=-p
265 265
 266.if ${MACHINE_ARCH} == "i386"
 267# XXX: avoid unexpected substitution in the include path (work.i386 -> work.1)
 268# when ${OBJMACHINE} is set (PR/56440)
 269CFLAGS+= -Ui386
 270.endif
 271
266.if ${OPSYS} != "Linux" 272.if ${OPSYS} != "Linux"
267BUILDLINK_TRANSFORM+= rm:-ldl 273BUILDLINK_TRANSFORM+= rm:-ldl
268.endif 274.endif
269 275
270INSTALLATION_DIRS= bin share/applications 276INSTALLATION_DIRS= bin share/applications
271 277
272.PHONY: debugrun 278.PHONY: debugrun
273# For debugging 279# For debugging
274debugrun: 280debugrun:
275 cd ${WRKSRC} && gmake debugrun 281 cd ${WRKSRC} && gmake debugrun
276 282
277post-extract: 283post-extract:
278 ${MKDIR} -p ${WRKSRC}/src 284 ${MKDIR} -p ${WRKSRC}/src