svn commit: r443455 - in branches/2017Q2: . Mk devel/qt5-core devel/qt5-qmake

[Tobias C. Berner]

Author: tcberner
Date: Mon Jun 12 17:29:04 2017
New Revision: 443455
URL: https://svnweb.freebsd.org/changeset/ports/443455

Log:
  MFH: r442460
  
  Do not use gold linker for Qt5 ports.
  
    gold linker from binutils 2.28 may produce duplicate library
    symbols, which makes shared libraries created with it not usable
    with conventional ld linker.
  
  PR:		218187
  Submitted by:	amdmi3
  
  Approved by:	ports-secteam (miwi)

Modified:
  branches/2017Q2/Mk/bsd.qt.mk
  branches/2017Q2/UPDATING
  branches/2017Q2/devel/qt5-core/Makefile
  branches/2017Q2/devel/qt5-qmake/Makefile
Directory Properties:
  branches/2017Q2/   (props changed)

Modified: branches/2017Q2/Mk/bsd.qt.mk
==============================================================================
--- branches/2017Q2/Mk/bsd.qt.mk	Mon Jun 12 16:35:05 2017	(r443454)
+++ branches/2017Q2/Mk/bsd.qt.mk	Mon Jun 12 17:29:04 2017	(r443455)
@@ -147,7 +147,9 @@ CONFIGURE_ARGS+=-nomake examples -nomake tests \
 .  if ${ARCH} == i386 && empty(MACHINE_CPU:Msse2)
 CONFIGURE_ARGS+=-no-sse2
 .  endif
-
+# Work around a bug in current binutils, where the gold linker creates
+# duplicate symbols. See pr 218187. Disable the gold-linker for Qt5 ports.
+CONFIGURE_ARGS+=	-no-use-gold-linker
 . endif
 
 . if defined(WANT_QT_DEBUG) || defined(WITH_DEBUG)

Modified: branches/2017Q2/UPDATING
==============================================================================
--- branches/2017Q2/UPDATING	Mon Jun 12 16:35:05 2017	(r443454)
+++ branches/2017Q2/UPDATING	Mon Jun 12 17:29:04 2017	(r443455)
@@ -5,6 +5,27 @@ they are unavoidable.
 You should get into the habit of checking this file for changes each time
 you update your ports collection, before attempting any port upgrades.
 
+20170602:
+  AFFECTS: users of Qt 5 in presence of binutils
+  AUTHOR: amdmi3 at FreeBSD.org
+
+  gold linker from binutils 2.28 may produce duplicate library
+  symbols, which makes shared libraries created with it not usable
+  with conventional ld linker.
+
+  This affects Qt, as qt5-qmake will detect gold and use it to build
+  Qt libraries. Broken libQt5Core will be produced and ports which
+  depend on it will then fail to link with the following errors:
+
+    ...lib/libQt5Core.so:(.dynamic+0x27ac8): multiple definition of `__bss_start at Qt_5'
+    ...lib/libQt5Core.so:(.dynamic+0x27ac8): first defined here
+    ...lib/libQt5Core.so:(.dynamic+0x27ac8): multiple definition of `_edata at Qt_5'
+    ...lib/libQt5Core.so:(.dynamic+0x27ac8): first defined here
+    ...lib/libQt5Core.so:(.dynamic+0x2b2d0): multiple definition of `_end at Qt_5'
+
+  Qt5 was fixed to ignore gold. If you see these errors, you
+  need to rebuild qt5-qmake, then all qt5-* ports.
+
 20170411:
   AFFECTS: www/firefox
   AUTHOR: gecko at FreeBSD.org

Modified: branches/2017Q2/devel/qt5-core/Makefile
==============================================================================
--- branches/2017Q2/devel/qt5-core/Makefile	Mon Jun 12 16:35:05 2017	(r443454)
+++ branches/2017Q2/devel/qt5-core/Makefile	Mon Jun 12 17:29:04 2017	(r443455)
@@ -2,6 +2,7 @@
 
 PORTNAME=	core
 DISTVERSION=	${QT5_VERSION}
+PORTREVISION=	1
 CATEGORIES=	devel
 PKGNAMEPREFIX=	qt5-
 

Modified: branches/2017Q2/devel/qt5-qmake/Makefile
==============================================================================
--- branches/2017Q2/devel/qt5-qmake/Makefile	Mon Jun 12 16:35:05 2017	(r443454)
+++ branches/2017Q2/devel/qt5-qmake/Makefile	Mon Jun 12 17:29:04 2017	(r443455)
@@ -2,7 +2,7 @@
 
 PORTNAME=	qmake
 DISTVERSION=	${QT5_VERSION}
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel
 PKGNAMEPREFIX=	qt5-