[pkgsrc/trunk]: pkgsrc/x11/qt5-qtbase qt5-qtbase: fix setting QMAKE_COMPILER

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/03fbbdaa098b
branches:  trunk
changeset: 332032:03fbbdaa098b
user:      markd <markd%pkgsrc.org@localhost>
date:      Mon Apr 01 19:58:51 2019 +0000

description:
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 16b60d7fba53 -r 03fbbdaa098b x11/qt5-qtbase/Makefile
--- a/x11/qt5-qtbase/Makefile   Mon Apr 01 17:42:15 2019 +0000
+++ b/x11/qt5-qtbase/Makefile   Mon Apr 01 19:58:51 2019 +0000
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.73 2019/04/01 04:33:01 markd Exp $
+# $NetBSD: Makefile,v 1.74 2019/04/01 19:58:51 markd 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 16b60d7fba53 -r 03fbbdaa098b x11/qt5-qtbase/files/qmake.conf
--- a/x11/qt5-qtbase/files/qmake.conf   Mon Apr 01 17:42:15 2019 +0000
+++ b/x11/qt5-qtbase/files/qmake.conf   Mon Apr 01 19:58:51 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@