Re: Mac OS X Snow Leopard and "imake"

[Matthias Scheler <tron%zhadum.org.uk@localhost>]

On Sat, Jun 12, 2010 at 12:40:36AM +0200, Georg Schwarz wrote:
> doing the same for non-modular xorg without native imake, I consequently 
> applied the following patch:
> 
> --- mk/buildlink3/imake-check.mk.orig 2010-06-12 00:27:43.000000000 +0200
> +++ mk/buildlink3/imake-check.mk      2010-06-12 00:33:59.000000000 +0200
> @@ -57,16 +57,22 @@
>  # .include "../../mk/buildlink3/imake-check.mk"
>  #
>  
> +.if defined(IMAKE)
> +_TMP_IMAKE=  ${IMAKE}
> +.else
> +_TMP_IMAKE=  ${X11BASE}/bin/imake
> +.endif
> +
>  .for _pair_ in ${BUILTIN_IMAKE_CHECK}
>  .  for pkg in ${_pair_:C/\:[^:]*$//}
>  .  for symbol in ${_pair_:C/^[^:]*\://}
> -.  if ${X11_TYPE} == "modular"
> +.  if ${X11_TYPE} == "modular" || !exists(${_TMP_IMAKE})
>  BUILTIN_IMAKE_CHECK.${pkg}=  no
>  .  else
>  USE_TOOLS+=  cat:pkgsrc echo:pkgsrc grep:pkgsrc mkdir:pkgsrc         \
>               rm:pkgsrc test:pkgsrc
> -USE_TOOLS+=  imake:pkgsrc ${IMAKE_TOOLS:S/$/:pkgsrc/}        # XXX
> -IMAKE?=              ${X11BASE}/bin/imake                            # XXX
> +USE_TOOLS+=  imake:pkgsrc ${IMAKE_TOOLS:S/$/:pkgsrc/}
> +IMAKE?=              ${X11BASE}/bin/imake
>  
>  .    if !defined(BUILTIN_IMAKE_CHECK.${pkg})
>  BUILTIN_IMAKE_CHECK.${pkg}!=                         \
> 
> 
> This seems to do the trick for me, though I haven't given too much thought 
> yet to possible side effects.
> Any comments, also on the syntax used, would be welcome.

I encountered the same problem when I tried to bootstrap from scratch
on my Mac after upgrading to Mac OS 10.6.4. Your patch fixed the
problem for me.

        Kind regards

-- 
Matthias Scheler                                  http://zhadum.org.uk/