Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_1554148732160590"
MIME-Version: 1.0
Date: Mon, 1 Apr 2019 19:58:52 +0000
From: "Mark Davies" <markd@netbsd.org>
Subject: CVS commit: pkgsrc/x11/qt5-qtbase
To: pkgsrc-changes@NetBSD.org
Reply-To: markd@netbsd.org
Message-Id: <20190401195852.0E4A7FB16@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

--_----------=_1554148732160590
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

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.


To generate a diff of this commit:
cvs rdiff -u -r1.73 -r1.74 pkgsrc/x11/qt5-qtbase/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/x11/qt5-qtbase/files/qmake.conf

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


--_----------=_1554148732160590
Content-Disposition: inline
Content-Length: 1944
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/x11/qt5-qtbase/Makefile
diff -u pkgsrc/x11/qt5-qtbase/Makefile:1.73 pkgsrc/x11/qt5-qtbase/Makefile:1.74
--- pkgsrc/x11/qt5-qtbase/Makefile:1.73	Mon Apr  1 04:33:01 2019
+++ pkgsrc/x11/qt5-qtbase/Makefile	Mon Apr  1 19:58:51 2019
@@ -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 @@ CONFIGURE_ARGS+=	-no-framework
 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=		QMAKE_PLATFORM += linux
 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' \

Index: pkgsrc/x11/qt5-qtbase/files/qmake.conf
diff -u pkgsrc/x11/qt5-qtbase/files/qmake.conf:1.8 pkgsrc/x11/qt5-qtbase/files/qmake.conf:1.9
--- pkgsrc/x11/qt5-qtbase/files/qmake.conf:1.8	Tue Nov 13 09:24:37 2018
+++ pkgsrc/x11/qt5-qtbase/files/qmake.conf	Mon Apr  1 19:58:51 2019
@@ -12,7 +12,7 @@ include(../common/gcc-base-unix.conf)
 include(../common/g++-unix.conf)
 include(../common/unix.conf)
 
-QMAKE_COMPILER		= @CC@
+QMAKE_COMPILER		= @COMPILER@
 
 QMAKE_CC		= @CC@
 QMAKE_CXX		= @CXX@


--_----------=_1554148732160590--