[pkgsrc/pkgsrc-2019Q1]: pkgsrc/x11/qt5-qtbase Pullup ticket #5927 - requested...

[bsiegert <bsiegert%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/6aec2ce74002
branches:  pkgsrc-2019Q1
changeset: 408228:6aec2ce74002
user:      bsiegert <bsiegert%pkgsrc.org@localhost>
date:      Sun Apr 07 09:35:04 2019 +0000

description:
Pullup ticket #5927 - requested by markd
x11/qt5-qtbase: build fix

Revisions pulled up:
- x11/qt5-qtbase/Makefile                                       1.74
- x11/qt5-qtbase/files/qmake.conf                               1.9

---
   Module Name: pkgsrc
   Committed By:        markd
   Date:                Mon Apr  1 19:58:51 UTC 2019

   Modified Files:
        pkgsrc/x11/qt5-qtbase: Makefile
        pkgsrc/x11/qt5-qtbase/files: qmake.conf

   Log Message:
   qt5-qtbase: fix setting QMAKE_COMPILER

   QMAKE_COMPILER is meant to signify the compiler family being used
        gcc              for gcc
        gcc clang llvm   for clang
   should properly fix the build issue seen on CentOS and likely other
   systems.

diffstat:

 x11/qt5-qtbase/Makefile         |  15 ++++++++-------
 x11/qt5-qtbase/files/qmake.conf |   2 +-
 2 files changed, 9 insertions(+), 8 deletions(-)

diffs (54 lines):

diff -r cf4e1432e0d8 -r 6aec2ce74002 x11/qt5-qtbase/Makefile
--- a/x11/qt5-qtbase/Makefile   Sat Apr 06 19:40:52 2019 +0000
+++ b/x11/qt5-qtbase/Makefile   Sun Apr 07 09:35:04 2019 +0000
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.72.2.1 2019/04/06 19:40:52 bsiegert Exp $
+# $NetBSD: Makefile,v 1.72.2.2 2019/04/07 09:35:04 bsiegert Exp $
 
 DISTNAME=      qtbase-everywhere-src-${QTVERSION}
 PKGNAME=       qt5-qtbase-${QTVERSION}
+PKGREVISION=   1
 COMMENT=       C++ X GUI toolkit
 
 .include "../../x11/qt5-qtbase/Makefile.common"
@@ -95,12 +96,6 @@
 LDFLAGS+=              -lresolv
 .  endif
 .elif ${OPSYS} == "Linux"
-# FIXME: Try to move fix upstream
-# See $$lcan in mkspecs/features/qt_configure.prf
-# Also QMAKE_DEFAULT_LIBDIRS in mkspecs/features/toolchain.prf
-.  if ${LOWER_VENDOR} == "redhat" && ${MACHINE_ARCH} == "x86_64"
-CONFIGURE_ARGS+=       -L "/usr/lib64"
-.  endif
 LDFLAGS+=              -ldl
 .elif ${OPSYS} == "NetBSD" || ${OPSYS} == "FreeBSD"
 .  if exists(/usr/lib/libexecinfo.so)
@@ -165,9 +160,15 @@
 QMAKE_EXTRA=
 .endif
 
+COMPILER=      gcc
+.if !empty(PKGSRC_COMPILER:Mclang)
+COMPILER+=     clang llvm
+.endif
+
 pre-configure:
        ${SED}  -e 's:@LOCALBASE@:${LOCALBASE}:g' \
                -e 's:@X11BASE@:${X11BASE}:g' \
+               -e 's:@COMPILER@:${COMPILER:Q}:g' \
                -e 's:@CC@:${CC:Q}:g' \
                -e 's:@CXX@:${CXX:Q}:g' \
                -e 's:@LDFLAGS@:${LDFLAGS:Q}:g' \
diff -r cf4e1432e0d8 -r 6aec2ce74002 x11/qt5-qtbase/files/qmake.conf
--- a/x11/qt5-qtbase/files/qmake.conf   Sat Apr 06 19:40:52 2019 +0000
+++ b/x11/qt5-qtbase/files/qmake.conf   Sun Apr 07 09:35:04 2019 +0000
@@ -12,7 +12,7 @@
 include(../common/g++-unix.conf)
 include(../common/unix.conf)
 
-QMAKE_COMPILER         = @CC@
+QMAKE_COMPILER         = @COMPILER@
 
 QMAKE_CC               = @CC@
 QMAKE_CXX              = @CXX@