[112869] trunk/dports/science/uhd

[Adam Mercer]

Hi

After syncing my ports this morning I got the following error when
port tried to index science/uhd after this change:

Failed to parse file science/uhd/Portfile: can't read
"configure.cxx_stdlib": no such variable

I'm running MacPorts 2.2.1 under Mavericks.

Cheers

Adam

On Sun, Nov 3, 2013 at 3:12 AM,  <michaelld at macports.org> wrote:
> Revision 112869 Author michaelld at macports.org Date 2013-11-02 20:12:40 -0700
> (Sat, 02 Nov 2013)
>
> Log Message
>
> uhd:
> * patch use of boost::lexical_cast and libc++;
> * addresses ticket #41004.
>
> Modified Paths
>
> trunk/dports/science/uhd/Portfile
>
> Added Paths
>
> trunk/dports/science/uhd/files/
> trunk/dports/science/uhd/files/patch-host_lib_usrp_dboard_id.cpp.diff
> trunk/dports/science/uhd/files/patch-host_utils_b2xx_fx3_utils.cpp.diff
>
> Diff
>
> Modified: trunk/dports/science/uhd/Portfile (112868 => 112869)
>
> --- trunk/dports/science/uhd/Portfile 2013-11-03 02:57:02 UTC (rev 112868)
> +++ trunk/dports/science/uhd/Portfile 2013-11-03 03:12:40 UTC (rev 112869)
> @@ -51,6 +51,15 @@
>  configure.dir       ${workpath}/build
>  build.dir           ${workpath}/build
>
> +# patches to fix use of boost::lexical_cast and libc++
> +
> +if {[string match libc++ ${configure.cxx_stdlib}]} {
> +    patchfiles-append patch-host_lib_usrp_dboard_id.cpp.diff
> +    if {${subport} eq "uhd-devel"} {
> +        patchfiles-append patch-host_utils_b2xx_fx3_utils.cpp.diff
> +    }
> +}
> +
>  # set last configure argument to the reletive path
>  # to the top-level cmake source
>
>
> Added: trunk/dports/science/uhd/files/patch-host_lib_usrp_dboard_id.cpp.diff
> (0 => 112869)
>
> --- trunk/dports/science/uhd/files/patch-host_lib_usrp_dboard_id.cpp.diff
> (rev 0)
> +++
> trunk/dports/science/uhd/files/patch-host_lib_usrp_dboard_id.cpp.diff 2013-11-03
> 03:12:40 UTC (rev 112869)
> @@ -0,0 +1,14 @@
> +--- host/lib/usrp/dboard_id.cpp.orig 2013-11-02 22:41:27.000000000 -0400
> ++++ host/lib/usrp/dboard_id.cpp 2013-11-02 22:43:20.000000000 -0400
> +@@ -51,7 +51,10 @@
> +
> + dboard_id_t dboard_id_t::from_string(const std::string &string){
> +     if (string.substr(0, 2) == "0x"){
> +-        return
> dboard_id_t::from_uint16(boost::lexical_cast<to_hex<boost::uint16_t>
>>(string));
> ++        std::stringstream interpreter(string);
> ++        to_hex<boost::uint16_t> hh;
> ++        interpreter >> hh;
> ++        return dboard_id_t::from_uint16(hh);
> +     }
> +     return
> dboard_id_t::from_uint16(boost::lexical_cast<boost::uint16_t>(string));
> + }
>
> Added:
> trunk/dports/science/uhd/files/patch-host_utils_b2xx_fx3_utils.cpp.diff (0
> => 112869)
>
> --- trunk/dports/science/uhd/files/patch-host_utils_b2xx_fx3_utils.cpp.diff
> (rev 0)
> +++
> trunk/dports/science/uhd/files/patch-host_utils_b2xx_fx3_utils.cpp.diff 2013-11-03
> 03:12:40 UTC (rev 112869)
> @@ -0,0 +1,14 @@
> +--- host/utils/b2xx_fx3_utils.cpp.orig 2013-11-02 22:41:27.000000000 -0400
> ++++ host/utils/b2xx_fx3_utils.cpp 2013-11-02 22:43:00.000000000 -0400
> +@@ -85,7 +85,10 @@
> + //!parse hex-formatted ASCII text into an int
> + boost::uint16_t atoh(const std::string &string){
> +     if (string.substr(0, 2) == "0x"){
> +-        return boost::lexical_cast<to_hex<boost::uint16_t> >(string);
> ++        std::stringstream interpreter(string);
> ++        to_hex<boost::uint16_t> hh;
> ++        interpreter >> hh;
> ++        return hh.value;
> +     }
> +     return boost::lexical_cast<boost::uint16_t>(string);
> + }
>
>
> _______________________________________________
> macports-changes mailing list
> macports-changes at lists.macosforge.org
> https://lists.macosforge.org/mailman/listinfo/macports-changes
>