[MacPorts] #22631: Boost 1.41 iostreams has broken header

MacPorts noreply at macports.org
Fri Nov 20 21:49:26 PST 2009


#22631: Boost 1.41 iostreams has broken header
------------------------------+---------------------------------------------
 Reporter:  dbsgeo@…          |       Owner:  macports-tickets@…                   
     Type:  defect            |      Status:  new                                  
 Priority:  Normal            |   Milestone:                                       
Component:  ports             |     Version:  1.8.1                                
 Keywords:                    |        Port:  boost                                
------------------------------+---------------------------------------------
 upstream let a bug slip through which prevents the compilation of
 py26-mapnik.

 Would it be possible to include the patch from
 https://svn.boost.org/trac/boost/ticket/3010 to the macports 1.41 boost
 port?


 I took a crack at patching but I'm not quite sure how to clean up the git
 based patch to work with macports:
 {{{
 Index: dports/devel/boost/files/boost_iostrems_missing_include_guard.patch
 ===================================================================
 --- dports/devel/boost/files/boost_iostrems_missing_include_guard.patch
 (revision 0)
 +++ dports/devel/boost/files/boost_iostrems_missing_include_guard.patch
 (revision 0)
 @@ -0,0 +1,20 @@
 +diff --git a/boost/iostreams/device/mapped_file.hpp
 b/boost/iostreams/device/mapped_file.hpp
 +index aae9dab..be656ef 100644
 +--- a/boost/iostreams/device/mapped_file.hpp
 ++++ b/boost/iostreams/device/mapped_file.hpp
 +@@ -4,6 +4,9 @@
 + // Distributed under the Boost Software License, Version 1.0. (See
 accompanying
 + // file LICENSE_1_0.txt or copy at
 http://www.boost.org/LICENSE_1_0.txt.)
 +
 ++#ifndef BOOST_IOSTREAMS_MAPPED_FILE_HPP_INCLUDED
 ++#define BOOST_IOSTREAMS_MAPPED_FILE_HPP_INCLUDED
 ++
 + #if defined(_MSC_VER) && (_MSC_VER >= 1020)
 + # pragma once
 + #endif
 +@@ -591,3 +594,5 @@ operator^=(mapped_file::mapmode& a,
 mapped_file::mapmode b)
 + } } // End namespaces iostreams, boost.
 +
 + #include <boost/config/abi_suffix.hpp> // pops abi_suffix.hpp pragmas
 ++
 ++#endif // #ifndef BOOST_IOSTREAMS_MAPPED_FILE_HPP_INCLUDED
 Index: dports/devel/boost/Portfile
 ===================================================================
 --- dports/devel/boost/Portfile (revision 60726)
 +++ dports/devel/boost/Portfile (working copy)
 @@ -25,6 +25,7 @@
                      rmd160  a604ef5a6f6f5bf50be59206c8534258ab431aea

  patchfiles      patch-libs-random-random_device.cpp.diff \
 +                boost_iostrems_missing_include_guard.patch

  post-extract {
      file mkdir ${worksrcpath}/libs/random/build
 }}}

 the above results in:

 {{{
 --->  Applying patches to boost
 Error: Target org.macports.patch returned: shell command " cd
 "/opt/local/var/macports/build/_opt_mports_trunk_dports_devel_boost/work/boost_1_41_0"
 && /usr/bin/patch -p0 <
 '/opt/mports/trunk/dports/devel/boost/files/boost_iostrems_missing_include_guard.patch'"
 returned error 1
 Command output: can't find file to patch at input line 5
 Perhaps you used the wrong -p or --strip option?
 The text leading up to this was:
 --------------------------
 |diff --git a/boost/iostreams/device/mapped_file.hpp
 b/boost/iostreams/device/mapped_file.hpp
 |index aae9dab..be656ef 100644
 |--- a/boost/iostreams/device/mapped_file.hpp
 |+++ b/boost/iostreams/device/mapped_file.hpp
 --------------------------
 File to patch:
 Skip this patch? [y]
 Skipping patch.
 2 out of 2 hunks ignored

 Error: Status 1 encountered during processing.
 }}}

-- 
Ticket URL: <http://trac.macports.org/ticket/22631>
MacPorts <http://www.macports.org/>
Ports system for Mac OS


More information about the macports-tickets mailing list