Date: Sun, 14 Feb 2016 13:21:26 +0000 (UTC) From: Raphael Kubo da Costa <rakuco@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r408855 - in head/devel: qt4-corelib qt4/files Message-ID: <201602141321.u1EDLQWx045362@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: rakuco Date: Sun Feb 14 13:21:26 2016 New Revision: 408855 URL: https://svnweb.freebsd.org/changeset/ports/408855 Log: 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> Modified: head/devel/qt4-corelib/Makefile head/devel/qt4/files/extrapatch-src-corelib-global-qglobal.h Modified: head/devel/qt4-corelib/Makefile ============================================================================== --- head/devel/qt4-corelib/Makefile Sun Feb 14 12:56:30 2016 (r408854) +++ head/devel/qt4-corelib/Makefile Sun Feb 14 13:21:26 2016 (r408855) @@ -3,7 +3,7 @@ PORTNAME= corelib DISTVERSION= ${QT4_VERSION} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel PKGNAMEPREFIX= qt4- Modified: head/devel/qt4/files/extrapatch-src-corelib-global-qglobal.h ============================================================================== --- head/devel/qt4/files/extrapatch-src-corelib-global-qglobal.h Sun Feb 14 12:56:30 2016 (r408854) +++ head/devel/qt4/files/extrapatch-src-corelib-global-qglobal.h Sun Feb 14 13:21:26 2016 (r408855) @@ -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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201602141321.u1EDLQWx045362>