diff options
| author | markd <markd@pkgsrc.org> | 2019-04-01 19:58:51 +0000 |
|---|---|---|
| committer | markd <markd@pkgsrc.org> | 2019-04-01 19:58:51 +0000 |
| commit | 7153af426c0606192c0931edbe5c9c0675257523 (patch) | |
| tree | 111ef6cb959299f2cf1c9429f52743f677a6852f | |
| parent | e9ad0dae26eb162b2c3d4671daf5c6c64d6b2a69 (diff) | |
| download | pkgsrc-7153af426c0606192c0931edbe5c9c0675257523.tar.gz | |
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.
| -rw-r--r-- | x11/qt5-qtbase/Makefile | 15 | ||||
| -rw-r--r-- | x11/qt5-qtbase/files/qmake.conf | 2 |
2 files changed, 9 insertions, 8 deletions
diff --git a/x11/qt5-qtbase/Makefile b/x11/qt5-qtbase/Makefile index 9bc63181728..690cfab60e3 100644 --- a/x11/qt5-qtbase/Makefile +++ b/x11/qt5-qtbase/Makefile @@ -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' \ diff --git a/x11/qt5-qtbase/files/qmake.conf b/x11/qt5-qtbase/files/qmake.conf index abe3dbf2539..e40a88e1d52 100644 --- a/x11/qt5-qtbase/files/qmake.conf +++ b/x11/qt5-qtbase/files/qmake.conf @@ -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@ |