Attachment #194931 for bug #229396

Lines 3-8 Link Here

(-)x11-toolkits/wxgtk30/Makefile (+6 lines)
3	PORTNAME= wx	3	PORTNAME= wx
4	PORTVERSION= 3.0.4	4	PORTVERSION= 3.0.4
5	DISTVERSIONPREFIX= v	5	DISTVERSIONPREFIX= v
		6	PORTREVISION= 1
6	CATEGORIES= x11-toolkits	7	CATEGORIES= x11-toolkits
7	PKGNAMESUFFIX= 30-gtk2	8	PKGNAMESUFFIX= 30-gtk2
8		9
Lines 65-70 Link Here
65		66
66	.include <bsd.port.pre.mk>	67	.include <bsd.port.pre.mk>
67		68
		69	# TLS is broken on armv6/7, PR 229396
		70	.if ${ARCH} == armv6 \|\| ${ARCH} == armv7
		71	CONFIGURE_ARGS+=--disable-tls
		72	.endif
		73
68	# PR 196703, 197031	74	# PR 196703, 197031
69	.if ${CHOSEN_COMPILER_TYPE} == gcc	75	.if ${CHOSEN_COMPILER_TYPE} == gcc
70	CONFIGURE_ARGS+=--disable-precomp-headers	76	CONFIGURE_ARGS+=--disable-precomp-headers

Lines 3-9 Link Here

(-)x11-toolkits/wxgtk31/Makefile (-1 / +6 lines)
3	PORTNAME= wx	3	PORTNAME= wx
4	DISTVERSIONPREFIX= v	4	DISTVERSIONPREFIX= v
5	DISTVERSION= 3.1.1	5	DISTVERSION= 3.1.1
6	PORTREVISION= 1	6	PORTREVISION= 2
7	CATEGORIES= x11-toolkits	7	CATEGORIES= x11-toolkits
8	PKGNAMESUFFIX= 31-gtk3	8	PKGNAMESUFFIX= 31-gtk3
9		9
Lines 71-76 Link Here
71		71
72	.include <bsd.port.pre.mk>	72	.include <bsd.port.pre.mk>
73		73
		74	# TLS is broken on armv6/7, PR 229396
		75	.if ${ARCH} == armv6 \|\| ${ARCH} == armv7
		76	CONFIGURE_ARGS+=--disable-tls
		77	.endif
		78
74	# PR 196703, 197031	79	# PR 196703, 197031
75	.if ${CHOSEN_COMPILER_TYPE} == gcc	80	.if ${CHOSEN_COMPILER_TYPE} == gcc
76	CONFIGURE_ARGS+=--disable-precomp-headers	81	CONFIGURE_ARGS+=--disable-precomp-headers

Return to bug 229396