mirror of
https://git.freebsd.org/ports.git
synced 2025-06-07 13:50:38 -04:00
f3c180c343
* Update Qt5 to 5.7.1
* Move Qt4 binaries to lib/qt4/bin
* Move Qt5 libraries to lib/qt5/lib
By moving the libraries we should finally be able to get rid of the inplace
upgrade bug (see ports bugs 194088, 195105 and 198720): when Qt5's libraries
were lying in /usr/local/lib, which would often get added by pkgconfig to the
linker paths via dependencies, the already installed libraries were linked
against, instead of the ones that were being built. This forced us to make
sure, that -L${WRKSRC}/lib was always coming before -L/usr/local/lib in the
linker flags. With this change this should no longer be the case.
* Rename some ports to match the rest (foo-qtX -> qtX-foo)
* Depend on new port misc/qtchooser [see UPDATING & CHANGES]
There are several new Qt5 ports which all have been created by Marie Loise Nolden
<nolden@kde.org>. Thanks again.
PR: 216797
Exp-Run by: antoine
Reviewed by: rakuco, mat, groot_kde.org
Approved by: rakuco (mentor)
Differential Revision: https://reviews.freebsd.org/D9213
25 lines
1.1 KiB
Text
25 lines
1.1 KiB
Text
From ea9a8672a19588e89c0bda8e0c31424687c1e05f Mon Sep 17 00:00:00 2001
|
|
From: Thiago Macieira <thiago.macieira@intel.com>
|
|
Date: Thu, 3 Nov 2016 12:14:56 -0700
|
|
Subject: [PATCH] Fix build with ICC on macOS: <atomic> is properly supported
|
|
|
|
I'm guess I introduced the regression in the commit
|
|
18ed6f20ad4327fa2ffbb687ac2f3ca7429c4348, which I wasn't sure about.
|
|
|
|
Change-Id: Ic46ff326a6ba46bc877cfffd14839f84fdf796e7
|
|
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
|
|
--- src/corelib/global/qcompilerdetection.h.orig 2017-02-10 22:14:51 UTC
|
|
+++ src/corelib/global/qcompilerdetection.h
|
|
@@ -1066,12 +1066,6 @@
|
|
# ifndef _HAS_VARIADIC_TEMPLATES
|
|
# undef Q_COMPILER_VARIADIC_TEMPLATES
|
|
# endif
|
|
-# elif defined(_LIBCPP_VERSION)
|
|
-// libc++ uses __has_feature(cxx_atomic), so disable the feature if the compiler
|
|
-// doesn't support it. That's required for the Intel compiler 14.x or earlier on OS X, for example.
|
|
-# if !__has_feature(cxx_atomic)
|
|
-# undef Q_COMPILER_ATOMICS
|
|
-# endif
|
|
# endif
|
|
# if defined(Q_COMPILER_THREADSAFE_STATICS) && defined(Q_OS_MAC)
|
|
// Apple's low-level implementation of the C++ support library
|