[MacPorts] #44062: root6: make it work on 10.6
MacPorts
noreply at macports.org
Sun Jun 22 14:19:38 PDT 2014
#44062: root6: make it work on 10.6
----------------------+-------------------------
Reporter: mojca@… | Owner: mojca@…
Type: defect | Status: new
Priority: Normal | Milestone:
Component: ports | Version:
Resolution: | Keywords: snowleopard
Port: root6 |
----------------------+-------------------------
Comment (by jonesc@…):
Replying to [comment:38 mojca@…]:
> What about this for the first part of the patch?
>
> {{{
> #!patch
> --- Portfile (revision 121302)
> +++ Portfile (working copy)
> @@ -61,12 +61,6 @@
>
> patchfiles patch-cmake-modules-
SearchInstalledSoftware.cmake.diff
>
> -# an ugly workaround for lack of __thread on 10.6
> -platform darwin 10 {
> - patchfiles-append \
> - patch-montecarlo-vmc-inc-TMCtls.h.diff
> -}
> -
> # Force a compatible compiler
> # (macports-clang-3.3 works; it's blacklisted only to give the
preference to 3.4)
> compiler.blacklist-append *gcc* {clang < 500} macports-clang-2.9
macports-clang-3.0 macports-clang-3.1 macports-clang-3.2 macports-
clang-3.3
> @@ -128,6 +122,17 @@
> configure.post_args ${worksrcpath}
>
> platform darwin {
> +
> + if {${os.major} < 10} {
> + pre-fetch {
> + ui_error "${name} requires Mac OS X 10.6 or later."
> + return -code error "incompatible Mac OS X version"
> + }
> + } elseif {${os.major} == 10} {
> + # an ugly workaround for lack of __thread on 10.6
> + patchfiles-append patch-montecarlo-vmc-inc-TMCtls.h.diff
> + }
> +
> # Note that we are forcing this choice. This means that anything
linking
> # against root6 needs to also be using libc++. This is possibly
> # problematic, but luckily there is just a limited set of such
dependents.
> }}}
Seems reasonable enough, until one of us has a VM for <10.6 ;)
Chris
--
Ticket URL: <https://trac.macports.org/ticket/44062#comment:39>
MacPorts <http://www.macports.org/>
Ports system for OS X
More information about the macports-tickets
mailing list