[40060] trunk/base

[Ryan Schmidt]

On Sep 18, 2008, at 10:20 PM, toby at macports.org wrote:

> Revision: 40060
>           http://trac.macports.org/changeset/40060
> Author:   toby at macports.org
> Date:     2008-09-18 20:20:22 -0700 (Thu, 18 Sep 2008)
> Log Message:
> -----------
> handle _ in arch name (x86_64)
>
> Modified Paths:
> --------------
>     trunk/base/aclocal.m4
>     trunk/base/configure
>
> Modified: trunk/base/aclocal.m4
> ===================================================================
> --- trunk/base/aclocal.m4	2008-09-19 03:14:25 UTC (rev 40059)
> +++ trunk/base/aclocal.m4	2008-09-19 03:20:22 UTC (rev 40060)
> @@ -821,7 +821,7 @@
>  	CFLAGS_LIBCURL=$($CURL_CONFIG --cflags)
>  	# Due to a bug in dist, --arch flags are improperly supplied by  
> curl-config.
>  	# Get rid of them.
> -	LDFLAGS_LIBCURL=$($CURL_CONFIG --libs | [sed 's/-arch [A-Za-z0-9] 
> * //g'])
> +	LDFLAGS_LIBCURL=$($CURL_CONFIG --libs | [sed 's/-arch [A-Za-z0-9_] 
> * //g'])
>
>  	AC_SUBST(CFLAGS_LIBCURL)
>  	AC_SUBST(LDFLAGS_LIBCURL)
>
> Modified: trunk/base/configure
> ===================================================================
> --- trunk/base/configure	2008-09-19 03:14:25 UTC (rev 40059)
> +++ trunk/base/configure	2008-09-19 03:20:22 UTC (rev 40060)
> @@ -12019,7 +12019,7 @@
>  	CFLAGS_LIBCURL=$($CURL_CONFIG --cflags)
>  	# Due to a bug in dist, --arch flags are improperly supplied by  
> curl-config.
>  	# Get rid of them.
> -	LDFLAGS_LIBCURL=$($CURL_CONFIG --libs | sed 's/-arch [A-Za-z0-9] 
> * //g')
> +	LDFLAGS_LIBCURL=$($CURL_CONFIG --libs | sed 's/-arch [A-Za-z0-9_] 
> * //g')

I realize you're just fixing existing code, but were you actually  
still running into this situation (--arch flags supplied by curl- 
config)? The curl port no longer puts --arch flags in curl-config [1]  
and using "/usr/bin/curl-config --libs" on Mac OS X 10.4.11 on  
PowerPC and Intel I don't see any --arch flags in Apple's curl  
either. I didn't test Leopard however.


[1] http://trac.macports.org/ticket/15116