Sat Apr 18 11:16:31 2020 UTC ()
libreoffice: add "CXXFLAGS+= -march=i586" on i386 for 64bit atomic ops.

Fixes the first part of PR/54826.  libreoffice-6.4.2.2 from
pkgsrc-2020Q1 on NetBSD/i386 9.0 builds and works with this change.
Note the second part of the PR (memalign error) was already fixed as
patches/patch-external_pdfium_pkgsrc2.patch.1 in the following commit:
 https://mail-index.netbsd.org/pkgsrc-changes/2020/02/07/msg206251.html


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

--- pkgsrc/misc/libreoffice/Makefile 2020/04/18 04:18:05 1.225
+++ pkgsrc/misc/libreoffice/Makefile 2020/04/18 11:16:31 1.226
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.225 2020/04/18 04:18:05 ryoon Exp $ 1# $NetBSD: Makefile,v 1.226 2020/04/18 11:16:31 tsutsui Exp $
2 2
3VERREL= 6.4.3 3VERREL= 6.4.3
4VERRC= 2 4VERRC= 2
5VER= ${VERREL}.${VERRC} 5VER= ${VERREL}.${VERRC}
6DISTNAME= libreoffice-${VER} 6DISTNAME= libreoffice-${VER}
7CATEGORIES= misc 7CATEGORIES= misc
8MASTER_SITES= http://download.documentfoundation.org/libreoffice/src/${VERREL}/ 8MASTER_SITES= http://download.documentfoundation.org/libreoffice/src/${VERREL}/
9EXTRACT_SUFX= .tar.xz 9EXTRACT_SUFX= .tar.xz
10 10
11MAINTAINER= ryoon@NetBSD.org 11MAINTAINER= ryoon@NetBSD.org
12HOMEPAGE= https://www.libreoffice.org/ 12HOMEPAGE= https://www.libreoffice.org/
13COMMENT= Office productivity suite from The Document Foundation 13COMMENT= Office productivity suite from The Document Foundation
14LICENSE= gnu-lgpl-v3 14LICENSE= gnu-lgpl-v3
@@ -242,26 +242,31 @@ CONFIGURE_SCRIPT= ${WRKSRC}/autogen.sh @@ -242,26 +242,31 @@ CONFIGURE_SCRIPT= ${WRKSRC}/autogen.sh
242#LD_LIBRARY_PATH+= ${WRKSRC}/instdir/sdk/lib:${WRKSRC}/instdir/ure/lib:${WRKSRC}/instdir/program 242#LD_LIBRARY_PATH+= ${WRKSRC}/instdir/sdk/lib:${WRKSRC}/instdir/ure/lib:${WRKSRC}/instdir/program
243 243
244MAKE_ENV+= ROOT_USER=${ROOT_USER} 244MAKE_ENV+= ROOT_USER=${ROOT_USER}
245MAKE_ENV+= ROOT_GROUP=${ROOT_GROUP} 245MAKE_ENV+= ROOT_GROUP=${ROOT_GROUP}
246MAKE_ENV+= SHELL=${BASH} 246MAKE_ENV+= SHELL=${BASH}
247#MAKE_ENV+= LD_LIBRARY_PATH=${LD_LIBRARY_PATH} 247#MAKE_ENV+= LD_LIBRARY_PATH=${LD_LIBRARY_PATH}
248BUILD_MAKE_FLAGS+= VERBOSE=true 248BUILD_MAKE_FLAGS+= VERBOSE=true
249#BUILD_MAKE_FLAGS+= GMAKE_OPTIONS+=-p 249#BUILD_MAKE_FLAGS+= GMAKE_OPTIONS+=-p
250 250
251.if ${OPSYS} != "Linux" 251.if ${OPSYS} != "Linux"
252BUILDLINK_TRANSFORM+= rm:-ldl 252BUILDLINK_TRANSFORM+= rm:-ldl
253.endif 253.endif
254 254
 255.if ${MACHINE_ARCH} == "i386"
 256# For 64 bit atomic ops (PR/54826)
 257CXXFLAGS+= -march=i586
 258.endif
 259
255INSTALLATION_DIRS= bin share/applications 260INSTALLATION_DIRS= bin share/applications
256 261
257.PHONY: debugrun 262.PHONY: debugrun
258# For debugging 263# For debugging
259debugrun: 264debugrun:
260 cd ${WRKSRC} && gmake debugrun 265 cd ${WRKSRC} && gmake debugrun
261 266
262post-extract: 267post-extract:
263 ${MKDIR} -p ${WRKSRC}/src 268 ${MKDIR} -p ${WRKSRC}/src
264.for md in ${MORE_DISTFILES} ${MORE_DISTFILES2} 269.for md in ${MORE_DISTFILES} ${MORE_DISTFILES2}
265 ${LN} -s ${DISTDIR}/${DIST_SUBDIR}/${md} ${WRKSRC}/src/${md} 270 ${LN} -s ${DISTDIR}/${DIST_SUBDIR}/${md} ${WRKSRC}/src/${md}
266.endfor 271.endfor
267 mkdir ${WRKSRC}/tmp 272 mkdir ${WRKSRC}/tmp