diff options
| author | tez <tez@pkgsrc.org> | 2010-08-25 22:50:12 +0000 |
|---|---|---|
| committer | tez <tez@pkgsrc.org> | 2010-08-25 22:50:12 +0000 |
| commit | 12a833c4f385beb3fb206fcb63367f2ee93a944e (patch) | |
| tree | fa36dee137974ac069800e41590b6add8980d216 /meta-pkgs | |
| parent | 11bf9ddfa8e8f259d14252f1c06ae42697545ebe (diff) | |
| download | pkgsrc-12a833c4f385beb3fb206fcb63367f2ee93a944e.tar.gz | |
Cater to compilers too stupid to interpret a bitwise OR in a template
argument as a constant. From https://svn.boost.org/trac/boost/ticket/4146
This fixes building boost-libs with lang/gcc34.
Diffstat (limited to 'meta-pkgs')
| -rw-r--r-- | meta-pkgs/boost/distinfo | 3 | ||||
| -rw-r--r-- | meta-pkgs/boost/patches/patch-ar | 31 |
2 files changed, 33 insertions, 1 deletions
diff --git a/meta-pkgs/boost/distinfo b/meta-pkgs/boost/distinfo index 90d32b71206..9c7cee1ba7c 100644 --- a/meta-pkgs/boost/distinfo +++ b/meta-pkgs/boost/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.25 2010/05/15 05:42:24 adam Exp $ +$NetBSD: distinfo,v 1.26 2010/08/25 22:50:12 tez Exp $ SHA1 (boost_1_43_0.tar.bz2) = b8257b7da2a7222739314f8d1e07e217debe71d6 RMD160 (boost_1_43_0.tar.bz2) = 950fe7c50ed8644ceffd8e494a8e0636037adacd @@ -8,3 +8,4 @@ SHA1 (patch-ab) = 2fa89ce671e5fb0dca160a820524cff2d1ec8927 SHA1 (patch-ac) = 12304069d394b56bb6294701ff30fe811a91abed SHA1 (patch-af) = ef9a9363420f519c45baaf98badff4c885a7595c SHA1 (patch-aq) = 6078cb5ac979c339a787e48cfe949e76613987e7 +SHA1 (patch-ar) = 6b7e3b808fe0c20d92522b87ee949690ce34f749 diff --git a/meta-pkgs/boost/patches/patch-ar b/meta-pkgs/boost/patches/patch-ar new file mode 100644 index 00000000000..dcc8534f6d5 --- /dev/null +++ b/meta-pkgs/boost/patches/patch-ar @@ -0,0 +1,31 @@ +$NetBSD: patch-ar,v 1.1 2010/08/25 22:50:13 tez Exp $ + +Cater to compilers too stupid to interpret a bitwise OR in a template +argument as a constant. (From https://svn.boost.org/trac/boost/ticket/4146) + +--- boost/property_tree/detail/xml_parser_read_rapidxml.hpp.orig 2010-08-20 13:41:30.645363600 -0500 ++++ boost/property_tree/detail/xml_parser_read_rapidxml.hpp 2010-08-20 13:46:11.091510100 -0500 +@@ -94,9 +94,12 @@ + try { + // Parse using appropriate flags + using namespace rapidxml; +- const int f_tws = parse_normalize_whitespace +- | parse_trim_whitespace; ++ const int f_tws = (parse_normalize_whitespace ++ | parse_trim_whitespace); + const int f_c = parse_comment_nodes; ++ const int f_tws_c = (parse_normalize_whitespace ++ | parse_trim_whitespace ++ | parse_comment_nodes); + xml_document<Ch> doc; + if (flags & no_comments) { + if (flags & trim_whitespace) +@@ -105,7 +108,7 @@ + doc.BOOST_NESTED_TEMPLATE parse<0>(&v.front()); + } else { + if (flags & trim_whitespace) +- doc.BOOST_NESTED_TEMPLATE parse<f_tws | f_c>(&v.front()); ++ doc.BOOST_NESTED_TEMPLATE parse<f_tws_c>(&v.front()); + else + doc.BOOST_NESTED_TEMPLATE parse<f_c>(&v.front()); + } |