cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- Remove OpenBSD long double workaround for Boost.Functional/Hash.

Browse Source 
- Have Boost.Filesystem use statvfs().

from brad
ok aja@
This commit is contained in:
jasper 2011-11-06 20:05:47 +00:00
parent 64e978a250
commit edfae0e0ad
3 changed files with 59 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
devel/boost/Makefile
View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.32 2011/11/02 11:54:15 jasper Exp $
# $OpenBSD: Makefile,v 1.33 2011/11/06 20:05:47 jasper Exp $
COMMENT= free peer-reviewed portable C++ source libraries
PKGNAME= boost-${VERSION}
REVISION= 9
REVISION= 10
VERSION= 1.42.0
DISTNAME= boost_${VERSION:S/./_/g}

38
devel/boost/patches/patch-boost_functional_hash_detail_limits_hpp Normal file
View File

@ -0,0 +1,38 @@
$OpenBSD: patch-boost_functional_hash_detail_limits_hpp,v 1.1 2011/11/06 20:05:47 jasper Exp $
--- boost/functional/hash/detail/limits.hpp.orig Thu Nov 3 07:03:59 2011
+++ boost/functional/hash/detail/limits.hpp Thu Nov 3 07:05:08 2011
@@ -15,11 +15,7 @@
#include <boost/limits.hpp>
-// On OpenBSD, numeric_limits is not reliable for long doubles, but
-// the macros defined in <float.h> are and support long double when STLport
-// doesn't.
-
-#if defined(__OpenBSD__) || defined(_STLP_NO_LONG_DOUBLE)
+#if defined(_STLP_NO_LONG_DOUBLE)
#include <float.h>
#endif
@@ -30,7 +26,7 @@ namespace boost
template <class T>
struct limits : std::numeric_limits<T> {};
-#if defined(__OpenBSD__) || defined(_STLP_NO_LONG_DOUBLE)
+#if defined(_STLP_NO_LONG_DOUBLE)
template <>
struct limits<long double>
: std::numeric_limits<long double>
@@ -50,11 +46,9 @@ namespace boost
BOOST_STATIC_CONSTANT(int, digits = LDBL_MANT_DIG);
BOOST_STATIC_CONSTANT(int, max_exponent = LDBL_MAX_EXP);
BOOST_STATIC_CONSTANT(int, min_exponent = LDBL_MIN_EXP);
-#if defined(_STLP_NO_LONG_DOUBLE)
BOOST_STATIC_CONSTANT(int, radix = FLT_RADIX);
-#endif
};
-#endif // __OpenBSD__
+#endif
}
}

19
devel/boost/patches/patch-libs_filesystem_src_operations_cpp Normal file
View File

@ -0,0 +1,19 @@
$OpenBSD: patch-libs_filesystem_src_operations_cpp,v 1.1 2011/11/06 20:05:47 jasper Exp $
--- libs/filesystem/src/operations.cpp.orig Thu Nov 3 06:53:43 2011
+++ libs/filesystem/src/operations.cpp Thu Nov 3 06:54:19 2011
@@ -58,14 +58,11 @@ using boost::system::system_category;
# else // BOOST_POSIX_API
# include <sys/types.h>
-# if !defined(__APPLE__) && !defined(__OpenBSD__)
+# ifndef __APPLE__
# include <sys/statvfs.h>
# define BOOST_STATVFS statvfs
# define BOOST_STATVFS_F_FRSIZE vfs.f_frsize
# else
-#ifdef __OpenBSD__
-# include <sys/param.h>
-#endif
# include <sys/mount.h>
# define BOOST_STATVFS statfs
# define BOOST_STATVFS_F_FRSIZE static_cast<boost::uintmax_t>( vfs.f_bsize )