svn commit: r477626 - in branches/2018Q3/x11-toolkits: wxgtk30 wxgtk31

[Yuri Victorovich]

Author: yuri
Date: Mon Aug 20 05:01:25 2018
New Revision: 477626
URL: https://svnweb.freebsd.org/changeset/ports/477626

Log:
  MFH: r477608
  
  x11-toolkits/wxgtk30 and x11-toolkits/wxgtk31: Fix the problem that TLS is broken on armv6/7
  
  ftp/filezilla was dumping core
  
  PR:		229396
  Submitted by:	Ulrich Grey <usenet at ulrich-grey.de>
  Approved by:	ports-secteam (miwi at FreeBSD.org)

Modified:
  branches/2018Q3/x11-toolkits/wxgtk30/Makefile
  branches/2018Q3/x11-toolkits/wxgtk31/Makefile
Directory Properties:
  branches/2018Q3/   (props changed)

Modified: branches/2018Q3/x11-toolkits/wxgtk30/Makefile
==============================================================================
--- branches/2018Q3/x11-toolkits/wxgtk30/Makefile	Mon Aug 20 04:18:24 2018	(r477625)
+++ branches/2018Q3/x11-toolkits/wxgtk30/Makefile	Mon Aug 20 05:01:25 2018	(r477626)
@@ -1,7 +1,8 @@
 # $FreeBSD$
 
 PORTNAME=	wx
-PORTVERSION=	3.0.3.1
+PORTVERSION=	3.0.4
+PORTREVISION=	2
 DISTVERSIONPREFIX=	v
 CATEGORIES=	x11-toolkits
 PKGNAMESUFFIX=	30-gtk2
@@ -64,6 +65,11 @@ WEBKIT_CONFIGURE_ENABLE=	webview
 WEBKIT_LIB_DEPENDS=	libwebkitgtk-1.0.so:www/webkit-gtk2
 
 .include <bsd.port.pre.mk>
+
+# TLS is broken on armv6/7, PR 229396
+.if ${ARCH} == armv6 || ${ARCH} == armv7
+CONFIGURE_ARGS+=--disable-tls
+.endif
 
 # PR 196703, 197031
 .if ${CHOSEN_COMPILER_TYPE} == gcc

Modified: branches/2018Q3/x11-toolkits/wxgtk31/Makefile
==============================================================================
--- branches/2018Q3/x11-toolkits/wxgtk31/Makefile	Mon Aug 20 04:18:24 2018	(r477625)
+++ branches/2018Q3/x11-toolkits/wxgtk31/Makefile	Mon Aug 20 05:01:25 2018	(r477626)
@@ -3,7 +3,7 @@
 PORTNAME=	wx
 DISTVERSIONPREFIX=	v
 DISTVERSION=	3.1.1
-PORTREVISION=	1
+PORTREVISION=	3
 CATEGORIES=	x11-toolkits
 PKGNAMESUFFIX=	31-gtk3
 
@@ -70,6 +70,11 @@ WEBKIT_CONFIGURE_ENABLE=	webview
 WEBKIT_LIB_DEPENDS=		libwebkit2gtk-4.0.so:www/webkit2-gtk3
 
 .include <bsd.port.pre.mk>
+
+# TLS is broken on armv6/7, PR 229396
+.if ${ARCH} == armv6 || ${ARCH} == armv7
+CONFIGURE_ARGS+=--disable-tls
+.endif
 
 # PR 196703, 197031
 .if ${CHOSEN_COMPILER_TYPE} == gcc