diff options
| author | tsutsui <tsutsui@pkgsrc.org> | 2020-04-18 11:16:31 +0000 |
|---|---|---|
| committer | tsutsui <tsutsui@pkgsrc.org> | 2020-04-18 11:16:31 +0000 |
| commit | 6812a100d175f549d9ef33de64f45101ab6962bd (patch) | |
| tree | 9475ccaf64987868059f79bad85d8e14adbb38eb /misc | |
| parent | 3fb2ef353a89e099dde222e840e31d70b8a46f8c (diff) | |
| download | pkgsrc-6812a100d175f549d9ef33de64f45101ab6962bd.tar.gz | |
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
Diffstat (limited to 'misc')
| -rw-r--r-- | misc/libreoffice/Makefile | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/misc/libreoffice/Makefile b/misc/libreoffice/Makefile index 5baa57999d0..d08a05f07fc 100644 --- a/misc/libreoffice/Makefile +++ b/misc/libreoffice/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.225 2020/04/18 04:18:05 ryoon Exp $ +# $NetBSD: Makefile,v 1.226 2020/04/18 11:16:31 tsutsui Exp $ VERREL= 6.4.3 VERRC= 2 @@ -252,6 +252,11 @@ BUILD_MAKE_FLAGS+= VERBOSE=true BUILDLINK_TRANSFORM+= rm:-ldl .endif +.if ${MACHINE_ARCH} == "i386" +# For 64 bit atomic ops (PR/54826) +CXXFLAGS+= -march=i586 +.endif + INSTALLATION_DIRS= bin share/applications .PHONY: debugrun |