[120998] trunk/dports/devel/boost
devans at macports.org
devans at macports.org
Fri Jun 13 20:32:35 PDT 2014
Revision: 120998
https://trac.macports.org/changeset/120998
Author: devans at macports.org
Date: 2014-06-13 20:32:35 -0700 (Fri, 13 Jun 2014)
Log Message:
-----------
boost: a refinement of r120994 suggested by ecronin, check specifically for the absence of libc++ without regard to OS X version, allows for the possible use of libc++ where libstdc++ is now the default.
Revision Links:
--------------
https://trac.macports.org/changeset/120994
Modified Paths:
--------------
trunk/dports/devel/boost/Portfile
trunk/dports/devel/boost/files/patch-apple-clang-no-libcxx.diff
Modified: trunk/dports/devel/boost/Portfile
===================================================================
--- trunk/dports/devel/boost/Portfile 2014-06-13 23:03:42 UTC (rev 120997)
+++ trunk/dports/devel/boost/Portfile 2014-06-14 03:32:35 UTC (rev 120998)
@@ -10,7 +10,7 @@
name boost
version 1.55.0
-revision 5
+revision 6
license Boost-1
categories devel
platforms darwin
@@ -60,9 +60,9 @@
# error that occurs on OS X 10.7 and 10.8 due to the assumption
# that if clang is the compiler in use it must be using libc++.
# Apple Clang uses libstdc++ by default on these OS versions.
- # The patch adds an additional configuration flag in the BOOST
- # style that is set if Apple clang is being used and the OS version
- # is 10.8 or less. This flag is then used to prevent boost or a
+ # The patch adds an additional BOOST_* configuration flag
+ # that is set if Apple clang is being used but libc++
+ # is not. This flag is then used to prevent boost or a
# dependent package from using functions such as std::forward that
# are only available in libc++. Fixes build of libcdr on these
# OS versions without effecting build on 10.6 and less (where clang is not
Modified: trunk/dports/devel/boost/files/patch-apple-clang-no-libcxx.diff
===================================================================
--- trunk/dports/devel/boost/files/patch-apple-clang-no-libcxx.diff 2014-06-13 23:03:42 UTC (rev 120997)
+++ trunk/dports/devel/boost/files/patch-apple-clang-no-libcxx.diff 2014-06-14 03:32:35 UTC (rev 120998)
@@ -1,22 +1,22 @@
---- boost/config/compiler/clang.hpp.orig 2014-06-13 09:35:07.000000000 -0700
-+++ boost/config/compiler/clang.hpp 2014-06-13 09:50:36.000000000 -0700
+--- boost/config/compiler/clang.hpp.orig 2013-07-20 10:17:10.000000000 -0700
++++ boost/config/compiler/clang.hpp 2014-06-13 14:52:46.000000000 -0700
@@ -168,6 +168,16 @@
# define BOOST_NO_CXX11_INLINE_NAMESPACES
#endif
-
+
+// Apple Clang uses libc++ by default on Mavericks (OS X 10.9) and higher
+// Apple Clang uses libstdc++ by default on Mountain Lion (OS X 10.8) and lower
+
+#ifdef __APPLE__
-+#include <Availability.h>
-+#if __MAC_OS_X_VERSION_MIN_REQUIRED <= 1080
++#include <ciso646>
++#ifndef _LIBCPP_VERSION
+# define BOOST_APPLE_CLANG_NO_LIBCXX
+#endif
+#endif
+
// Clang always supports variadic macros
// Clang always supports extern templates
-
+
--- boost/multi_index/detail/vartempl_support.hpp.orig 2014-06-13 09:57:53.000000000 -0700
+++ boost/multi_index/detail/vartempl_support.hpp 2014-06-13 09:59:52.000000000 -0700
@@ -42,7 +42,8 @@
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140613/0c64225f/attachment-0001.html>
More information about the macports-changes
mailing list