aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRaphael Kubo da Costa <rakuco@FreeBSD.org>2016-08-25 07:41:00 +0000
committerRaphael Kubo da Costa <rakuco@FreeBSD.org>2016-08-25 07:41:00 +0000
commitc2dff48ac8142e3900d0f9f37fb7145a4f276e0b (patch)
tree57821539ef341ec3c030bda8ab8e6fbae07676da
parent12112839ffb5a7bce358f802b6617445e41b198d (diff)
downloadports-c2dff48ac8142e3900d0f9f37fb7145a4f276e0b.tar.gz
ports-c2dff48ac8142e3900d0f9f37fb7145a4f276e0b.zip
MFH: r420773
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 Approved by: ports-secteam (junovitch)
Notes
Notes: svn path=/branches/2016Q3/; revision=420837
-rw-r--r--devel/qmake5/Makefile1
-rw-r--r--devel/qmake5/files/patch-configure44
2 files changed, 38 insertions, 7 deletions
diff --git a/devel/qmake5/Makefile b/devel/qmake5/Makefile
index 224913b4b1d5..ec2acd9fbc71 100644
--- a/devel/qmake5/Makefile
+++ b/devel/qmake5/Makefile
@@ -2,6 +2,7 @@
PORTNAME= qmake
DISTVERSION= ${QT5_VERSION}
+PORTREVISION= 1
CATEGORIES= devel
PKGNAMEPREFIX= qt5-
diff --git a/devel/qmake5/files/patch-configure b/devel/qmake5/files/patch-configure
index 756ec5e61b5f..cddfbd368bc9 100644
--- a/devel/qmake5/files/patch-configure
+++ b/devel/qmake5/files/patch-configure
@@ -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 <rakuco@FreeBSD.org>
+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 <thiago.macieira@intel.com>
+
+--- 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)