From owner-svn-ports-all@freebsd.org Wed Aug 24 08:12:36 2016 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 1DE31BC2AA7; Wed, 24 Aug 2016 08:12:36 +0000 (UTC) (envelope-from rakuco@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id E9E7318EC; Wed, 24 Aug 2016 08:12:35 +0000 (UTC) (envelope-from rakuco@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u7O8CZWs018820; Wed, 24 Aug 2016 08:12:35 GMT (envelope-from rakuco@FreeBSD.org) Received: (from rakuco@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u7O8CYV5018818; Wed, 24 Aug 2016 08:12:34 GMT (envelope-from rakuco@FreeBSD.org) Message-Id: <201608240812.u7O8CYV5018818@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: rakuco set sender to rakuco@FreeBSD.org using -f From: Raphael Kubo da Costa Date: Wed, 24 Aug 2016 08:12:34 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r420773 - in head/devel/qmake5: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 24 Aug 2016 08:12:36 -0000 Author: rakuco Date: Wed Aug 24 08:12:34 2016 New Revision: 420773 URL: https://svnweb.freebsd.org/changeset/ports/420773 Log: Import upstream patch to fix the detection of clang's version number. Our clang reports itself as "FreeBSD clang version x.y.z" instead of just "clang version x.y.z", which was preventing the sed pattern used in the configure script from matching and thus QT_CLANG_MAJOR_VERSION and QT_CLANG_MINOR_VERSION were never defined. One of the consequences is that tests for those values in mkspecs later always failed, which led to some features such as C++14 support being disabled. PR: 210327 MFH: 2016Q3 Modified: head/devel/qmake5/Makefile head/devel/qmake5/files/patch-configure Modified: head/devel/qmake5/Makefile ============================================================================== --- head/devel/qmake5/Makefile Wed Aug 24 08:07:47 2016 (r420772) +++ head/devel/qmake5/Makefile Wed Aug 24 08:12:34 2016 (r420773) @@ -2,6 +2,7 @@ PORTNAME= qmake DISTVERSION= ${QT5_VERSION} +PORTREVISION= 1 CATEGORIES= devel PKGNAMEPREFIX= qt5- Modified: head/devel/qmake5/files/patch-configure ============================================================================== --- head/devel/qmake5/files/patch-configure Wed Aug 24 08:07:47 2016 (r420772) +++ head/devel/qmake5/files/patch-configure Wed Aug 24 08:12:34 2016 (r420773) @@ -1,6 +1,27 @@ ---- ./configure.orig 2013-10-22 01:49:15.000000000 -0700 -+++ ./configure 2013-11-04 07:40:28.945418565 -0800 -@@ -4194,11 +4194,11 @@ +The first two hunks make sure only qmake is build, as the rest of Qt is built +in other ports. + +The last hunk is backported from upstream: + +commit a9474d1260a8c8cc9eae14f2984098919d9684e5 +Author: Raphael Kubo da Costa +Date: Tue Aug 23 20:25:14 2016 +0200 + + configure: Correctly detect clang's version on FreeBSD + + "clang -v" on FreeBSD reports something like "FreeBSD clang version + x.y.z [...]" instead of just "clang version x.y.z [...]", which fails to + match the sed pattern in the configure script, resulting in qconfig.pri + having no clang version defined. + + Augment the pattern so that both version strings match. + + Change-Id: I5f38f8480f4b1156ca7147e32c1157a009557035 + Reviewed-by: Thiago Macieira + +--- configure.orig 2015-10-13 04:35:07 UTC ++++ configure +@@ -4038,11 +4038,11 @@ if true; then ###[ '!' -f "$outpath/bin/ fi echo "QMAKESPEC = $adjqmakespec" >> "$mkfile" echo "QT_VERSION = $QT_VERSION" >> "$mkfile" @@ -15,11 +36,20 @@ echo "EXEEXT = $EXEEXT" >> "$mkfile" echo "RM_F = rm -f" >> "$mkfile" echo "RM_RF = rm -rf" >> "$mkfile" -@@ -4214,6 +4214,7 @@ - rm "$mkfile.tmp" +@@ -4061,6 +4061,7 @@ if true; then ###[ '!' -f "$outpath/bin/ + fi fi done + exit 0 - (cd "$outpath/qmake"; "$MAKE") || exit 2 - fi # Build qmake + if [ "$OPT_VERBOSE" = yes ]; then + # Show the output of make +@@ -6474,7 +6472,7 @@ case "$QMAKE_CONF_COMPILER" in + # Clang + COMPILER_VERSION=`${QMAKE_CONF_COMPILER} -v 2>&1 | sed -n -E ' + /^Apple (clang|LLVM) version /{s///; s/^([0-9]*)\.([0-9]*).*$/QT_APPLE_CLANG_MAJOR_VERSION=\1; QT_APPLE_CLANG_MINOR_VERSION=\2/;p;q;} +-/^clang version /{s///; s/^([0-9]*)\.([0-9]*).*$/QT_CLANG_MAJOR_VERSION=\1; QT_CLANG_MINOR_VERSION=\2/;p;q;}'` ++/^(FreeBSD )?clang version /{s///; s/^([0-9]*)\.([0-9]*).*$/QT_CLANG_MAJOR_VERSION=\1; QT_CLANG_MINOR_VERSION=\2/;p;q;}'` + eval "$COMPILER_VERSION" + ;; + *icpc)