Received: by mail.netbsd.org (Postfix, from userid 605) id 28FC584D45; Wed, 20 Sep 2017 14:33:27 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id B123184D3B for ; Wed, 20 Sep 2017 14:33:26 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id sXb_8I035diG for ; Wed, 20 Sep 2017 14:33:26 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 0F6C184CE0 for ; Wed, 20 Sep 2017 14:33:26 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 0A716FA9A; Wed, 20 Sep 2017 14:33:26 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1505918006292760" MIME-Version: 1.0 Date: Wed, 20 Sep 2017 14:33:26 +0000 From: "Jonathan Perkin" Subject: CVS commit: pkgsrc/meta-pkgs/boost To: pkgsrc-changes@NetBSD.org Reply-To: jperkin@netbsd.org X-Mailer: log_accum Message-Id: <20170920143326.0A716FA9A@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1505918006292760 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: jperkin Date: Wed Sep 20 14:33:25 UTC 2017 Modified Files: pkgsrc/meta-pkgs/boost: distinfo Added Files: pkgsrc/meta-pkgs/boost/patches: patch-boost_stacktrace_detail_frame__unwind.ipp patch-boost_stacktrace_detail_location__from__symbol.hpp Log Message: boost: Fix build on OS where dladdr() takes a void *. To generate a diff of this commit: cvs rdiff -u -r1.107 -r1.108 pkgsrc/meta-pkgs/boost/distinfo cvs rdiff -u -r0 -r1.1 \ pkgsrc/meta-pkgs/boost/patches/patch-boost_stacktrace_detail_frame__unwind.ipp \ pkgsrc/meta-pkgs/boost/patches/patch-boost_stacktrace_detail_location__from__symbol.hpp Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1505918006292760 Content-Disposition: inline Content-Length: 3361 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/meta-pkgs/boost/distinfo diff -u pkgsrc/meta-pkgs/boost/distinfo:1.107 pkgsrc/meta-pkgs/boost/distinfo:1.108 --- pkgsrc/meta-pkgs/boost/distinfo:1.107 Wed Sep 13 17:34:41 2017 +++ pkgsrc/meta-pkgs/boost/distinfo Wed Sep 20 14:33:25 2017 @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.107 2017/09/13 17:34:41 adam Exp $ +$NetBSD: distinfo,v 1.108 2017/09/20 14:33:25 jperkin Exp $ SHA1 (boost_1_65_1.tar.bz2) = 4a5b0c3c1b1b9a4d6cb6a6cc395e903e76f76720 RMD160 (boost_1_65_1.tar.bz2) = 695537a00f6f9ae80e4d682b155ce097017c49a9 @@ -19,6 +19,8 @@ SHA1 (patch-boost_numeric_ublas_storage. SHA1 (patch-boost_property__tree_detail_xml__parser__read__rapidxml.hpp) = 3499fcc37e72396d23a9fce0f1c97891adf12a9f SHA1 (patch-boost_regex_config.hpp) = 6b752c7c23168c591cd391739c7a4539bef44c12 SHA1 (patch-boost_stacktrace_detail_collect__unwind.ipp) = a0e9722872121ddc0db6b0d370e848ad5b315d43 +SHA1 (patch-boost_stacktrace_detail_frame__unwind.ipp) = 0b06b1a1b28decbe61a6f6891b91c6751ff647e1 +SHA1 (patch-boost_stacktrace_detail_location__from__symbol.hpp) = 860bfd99ffce4f6462683fc344d43850632cb6c1 SHA1 (patch-boost_test_impl_execution__monitor.ipp) = bab0d31f9ae0516de343cc2c6c5b08f6154ba8d5 SHA1 (patch-boostcpp.jam) = 8914fe56f183649a394032513483e29d1c49e30c SHA1 (patch-libs_config_configure) = e2f204d4fa4f1bd9b4131d28f9be0a1ac22bf711 Added files: Index: pkgsrc/meta-pkgs/boost/patches/patch-boost_stacktrace_detail_frame__unwind.ipp diff -u /dev/null pkgsrc/meta-pkgs/boost/patches/patch-boost_stacktrace_detail_frame__unwind.ipp:1.1 --- /dev/null Wed Sep 20 14:33:25 2017 +++ pkgsrc/meta-pkgs/boost/patches/patch-boost_stacktrace_detail_frame__unwind.ipp Wed Sep 20 14:33:25 2017 @@ -0,0 +1,15 @@ +$NetBSD: patch-boost_stacktrace_detail_frame__unwind.ipp,v 1.1 2017/09/20 14:33:25 jperkin Exp $ + +Fix build on OS where dladdr() takes a void *. + +--- boost/stacktrace/detail/frame_unwind.ipp.orig 2017-09-20 14:09:31.984874879 +0000 ++++ boost/stacktrace/detail/frame_unwind.ipp +@@ -84,7 +84,7 @@ std::string to_string(const frame* frame + std::string frame::name() const { + #if !defined(BOOST_WINDOWS) && !defined(__CYGWIN__) + ::Dl_info dli; +- const bool dl_ok = !!::dladdr(addr_, &dli); ++ const bool dl_ok = !!::dladdr(const_cast(addr_), &dli); + if (dl_ok && dli.dli_sname) { + return boost::core::demangle(dli.dli_sname); + } Index: pkgsrc/meta-pkgs/boost/patches/patch-boost_stacktrace_detail_location__from__symbol.hpp diff -u /dev/null pkgsrc/meta-pkgs/boost/patches/patch-boost_stacktrace_detail_location__from__symbol.hpp:1.1 --- /dev/null Wed Sep 20 14:33:25 2017 +++ pkgsrc/meta-pkgs/boost/patches/patch-boost_stacktrace_detail_location__from__symbol.hpp Wed Sep 20 14:33:25 2017 @@ -0,0 +1,15 @@ +$NetBSD: patch-boost_stacktrace_detail_location__from__symbol.hpp,v 1.1 2017/09/20 14:33:25 jperkin Exp $ + +Fix build on OS where dladdr() takes a void *. + +--- boost/stacktrace/detail/location_from_symbol.hpp.orig 2017-09-20 14:09:31.984783070 +0000 ++++ boost/stacktrace/detail/location_from_symbol.hpp +@@ -28,7 +28,7 @@ public: + explicit location_from_symbol(const void* addr) BOOST_NOEXCEPT + : dli_() + { +- if (!::dladdr(addr, &dli_)) { ++ if (!::dladdr(const_cast(addr), &dli_)) { + dli_.dli_fname = 0; + } + } --_----------=_1505918006292760--