diff options
| author | sbd <sbd> | 2011-10-02 10:20:28 +0000 |
|---|---|---|
| committer | sbd <sbd> | 2011-10-02 10:20:28 +0000 |
| commit | 53c732f04b929f7b30433c191d20f0f106feadb5 (patch) | |
| tree | 35c00f52ba5c23169cd0e32bb7485ce0b494c404 /meta-pkgs/boost | |
| parent | 62e750c05871049ead5f5e175b9643228d1b847f (diff) | |
| download | pkgsrc-53c732f04b929f7b30433c191d20f0f106feadb5.tar.gz | |
Fix the boost-header fenv.h test on linux.
(The incorrectly failing test stops boost-libs from building.)
Bump boost-header PKGREVISION.
Diffstat (limited to 'meta-pkgs/boost')
| -rw-r--r-- | meta-pkgs/boost/distinfo | 4 | ||||
| -rw-r--r-- | meta-pkgs/boost/patches/patch-libs_config_test_boost__no__fenv__h.ipp | 23 |
2 files changed, 25 insertions, 2 deletions
diff --git a/meta-pkgs/boost/distinfo b/meta-pkgs/boost/distinfo index b91d0e8a1eb..28bfe7940a9 100644 --- a/meta-pkgs/boost/distinfo +++ b/meta-pkgs/boost/distinfo @@ -1,10 +1,9 @@ -$NetBSD: distinfo,v 1.32 2011/03/18 07:49:44 adam Exp $ +$NetBSD: distinfo,v 1.33 2011/10/02 10:20:28 sbd Exp $ SHA1 (boost_1_46_1.tar.bz2) = 3ca6e173ec805e5126868d8a03618e587aa26aef RMD160 (boost_1_46_1.tar.bz2) = bb43b39f7c4b683b80bafa3042b95e65a242d9c3 Size (boost_1_46_1.tar.bz2) = 42001335 bytes SHA1 (patch-aa) = b42e255c8ad2138f226ec14633aedeb9b9a9fd32 -SHA1 (patch-ab) = b6898f7b12d2fdbaacb25a0643d4d8af6c460602 SHA1 (patch-ac) = 54d40e6a62cdf40c4155c64d9f02df475fbe111d SHA1 (patch-ad) = d36799e40e1f7e6f62768e1144859f22ce76a265 SHA1 (patch-ae) = 0acb8eaa1b5096d86ef0cd1320363f9ae75b7090 @@ -13,3 +12,4 @@ SHA1 (patch-ag) = badf96038d7ac5bc566c6ce685116e756d976b13 SHA1 (patch-ah) = c32b43bdbbe3cecc15ad56172083ee6ed926b45b SHA1 (patch-aq) = e5c7b72ffa2942ce401f3d9bf05498fd761df17a SHA1 (patch-ar) = 91981e2edb93666de78c203a6cef3d5011b2b26a +SHA1 (patch-libs_config_test_boost__no__fenv__h.ipp) = 240d87c048c1e846a31a944e68d3d9b112f4600d diff --git a/meta-pkgs/boost/patches/patch-libs_config_test_boost__no__fenv__h.ipp b/meta-pkgs/boost/patches/patch-libs_config_test_boost__no__fenv__h.ipp new file mode 100644 index 00000000000..b63cb849b7f --- /dev/null +++ b/meta-pkgs/boost/patches/patch-libs_config_test_boost__no__fenv__h.ipp @@ -0,0 +1,23 @@ +$NetBSD: patch-libs_config_test_boost__no__fenv__h.ipp,v 1.1 2011/10/02 10:20:28 sbd Exp $ + +The fenv.h test normaly fails with: +./../../libs/config/test/boost_no_fenv_h.ipp: In function 'int boost_no_fenv_h::test()': +./../../libs/config/test/boost_no_fenv_h.ipp:67:49: error: invalid conversion from 'int (*)()throw ()' to 'int (*)(fexcept_t*, int)' + +This causes BOOST_NO_FENV_H to be set (breaking boost-libs). + +--- libs/config/test/boost_no_fenv_h.ipp.orig 2010-12-31 17:08:07.000000000 +0000 ++++ libs/config/test/boost_no_fenv_h.ipp +@@ -61,7 +61,11 @@ int test() + + int (*has_feclearexcept)(int) = ::feclearexcept; + int (*has_fegetenv)(fenv_t*) = ::fegetenv; +- int (*has_fegetexcept)(fexcept_t*, int) = ::fegetexcept; ++ #ifdef __linux__ ++ int (*has_fegetexcept)(void) = ::fegetexcept; ++ #else ++ int (*has_fegetexcept)(fexcept_t*, int) = ::fegetexcept; ++ #endif + int (*has_fegetround)(void) = ::fegetround; + int (*has_feholdexcept)(fenv_t*) = ::feholdexcept; + int (*has_feraiseexcept)(int) = ::feraiseexcept; |