diff options
| author | Raphael Kubo da Costa <rakuco@FreeBSD.org> | 2016-02-14 13:21:26 +0000 |
|---|---|---|
| committer | Raphael Kubo da Costa <rakuco@FreeBSD.org> | 2016-02-14 13:21:26 +0000 |
| commit | d4c3da3d2f9cf8feec4aa834343fd687e3c0db5e (patch) | |
| tree | 4e17b9ce8e98762092c32cdbe578c331800a89ef | |
| parent | Update devel/cl-cffi and devel/cl-cffi-sbcl to version 0.16.1. (diff) | |
Use the right macro name when checking whether libc++ is being used.
This fixes a copy-paste error introduced in r397043 ("Update the Qt4 ports to
4.8.7"): libc++ defines _LIBCPP_VERSION, not _LIBCPP_VER (which is defined by a
Dinkumware-based standard library used by QNX). In practice, this meant
Q_COMPILER_INITIALIZER_LISTS was never being enabled with clang.
Submitted by: Tobias Berner <tcberner@gmail.com>
Notes
Notes:
svn path=/head/; revision=408855
| -rw-r--r-- | devel/qt4-corelib/Makefile | 2 | ||||
| -rw-r--r-- | devel/qt4/files/extrapatch-src-corelib-global-qglobal.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/devel/qt4-corelib/Makefile b/devel/qt4-corelib/Makefile index 5333f28a753d..486ee0f3fe51 100644 --- a/devel/qt4-corelib/Makefile +++ b/devel/qt4-corelib/Makefile @@ -3,7 +3,7 @@ PORTNAME= corelib DISTVERSION= ${QT4_VERSION} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel PKGNAMEPREFIX= qt4- diff --git a/devel/qt4/files/extrapatch-src-corelib-global-qglobal.h b/devel/qt4/files/extrapatch-src-corelib-global-qglobal.h index 715d52ac9b21..fa3cea956729 100644 --- a/devel/qt4/files/extrapatch-src-corelib-global-qglobal.h +++ b/devel/qt4/files/extrapatch-src-corelib-global-qglobal.h @@ -27,7 +27,7 @@ __GLIBCXX__) and not worth the effort. + */ +# if defined(__cplusplus) /* Only C++ has ciso646. */ +# include <ciso646> -+# if defined(_LIBCPP_VER) ++# if defined(_LIBCPP_VERSION) +# define Q_COMPILER_INITIALIZER_LISTS +# endif +# endif |