Fri Oct 15 19:36:35 2021 UTC ()
boost-libs: disable pch everywhere

Operating under the assumption that more and more platforms will be
RELRO enabled and this will keep breaking because the conditional is
not kept up-to-date. (it broke on aarch64 after RELRO enablement)


(tnn)
diff -r1.90 -r1.91 pkgsrc/devel/boost-libs/Makefile
cvs diff -r1.90 -r1.91 pkgsrc/devel/boost-libs/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/boost-libs/Makefile 2021/09/30 20:34:17 1.90
+++ pkgsrc/devel/boost-libs/Makefile 2021/10/15 19:36:35 1.91
@@ -1,35 +1,31 @@ @@ -1,35 +1,31 @@
1# $NetBSD: Makefile,v 1.90 2021/09/30 20:34:17 adam Exp $ 1# $NetBSD: Makefile,v 1.91 2021/10/15 19:36:35 tnn Exp $
2 2
3BOOST_PACKAGE= libs 3BOOST_PACKAGE= libs
4BOOST_COMMENT= (binary libraries) 4BOOST_COMMENT= (binary libraries)
5BOOST_CONFIG= installed 5BOOST_CONFIG= installed
6BOOST_INSTALL_LIBS= yes 6BOOST_INSTALL_LIBS= yes
7 7
8.include "../../meta-pkgs/boost/Makefile.common" 8.include "../../meta-pkgs/boost/Makefile.common"
9 9
10INSTALLATION_DIRS+= lib 10INSTALLATION_DIRS+= lib
11 11
12BJAM_ARGS+= --without-python 12BJAM_ARGS+= --without-python
13PLIST_VARS+= backtrace context fiber log longdbl 13PLIST_VARS+= backtrace context fiber log longdbl
14 14
15.include "../../mk/compiler.mk" 15.include "../../mk/compiler.mk"
16 16
17.if (${OPSYS} == "NetBSD" && \ 17# pch enabled build is generally fragile and breaks with RELRO
18 ((${MACHINE_ARCH} == "i386") || \ 
19 (!empty(MACHINE_ARCH:Mearm*) && !empty(PKGSRC_COMPILER:Mgcc)))) || \ 
20 (!empty(MACHINE_PLATFORM:MNetBSD-[89].*-x86_64) && !empty(PKGSRC_COMPILER:Mgcc)) 
21BJAM_ARGS+= pch=off 18BJAM_ARGS+= pch=off
22.endif 
23 19
24.if !empty(MACHINE_ARCH:Malpha) || !empty(MACHINE_ARCH:Mm68k) || !empty(MACHINE_ARCH:Msparc64) 20.if !empty(MACHINE_ARCH:Malpha) || !empty(MACHINE_ARCH:Mm68k) || !empty(MACHINE_ARCH:Msparc64)
25BJAM_ARGS+= --without-context 21BJAM_ARGS+= --without-context
26BJAM_ARGS+= --without-coroutine 22BJAM_ARGS+= --without-coroutine
27BJAM_ARGS+= --without-fiber 23BJAM_ARGS+= --without-fiber
28.else 24.else
29PLIST.context= yes 25PLIST.context= yes
30. if !(${OPSYS} == "NetBSD" && !empty(PKGSRC_COMPILER:Mgcc)) && \ 26. if !(${OPSYS} == "NetBSD" && !empty(PKGSRC_COMPILER:Mgcc)) && \
31 empty(MACHINE_PLATFORM:MDarwin-1[0-4].*-*) 27 empty(MACHINE_PLATFORM:MDarwin-1[0-4].*-*)
32PLIST.fiber= yes 28PLIST.fiber= yes
33. endif 29. endif
34.endif 30.endif
35 31