svn commit: r303619 - head/Mk

[Juergen Lock]

On Wed, Sep 05, 2012 at 01:00:18AM -0500, Gerald Pfeifer wrote:
> On Mon, 3 Sep 2012, Mark Linimon wrote:
> > +.if defined(USE_READLINE)
> > +.if ${USE_READLINE} == "port" || ${OSVERSION} > 1000000
> > +LIB_DEPENDS+=	readline.6:${PORTSDIR}/devel/readline
> > +CPPFLAGS+=		-I${LOCALBASE}/include
> > +LDFLAGS+=		-L${LOCALBASE}/lib -lreadline
> 
> These two clearly show that we finally should get over it and
> add -I${LOCALBASE}/include and -L${LOCALBASE}/lib by default.
> 
> There must be thousands of cases where ports and Mk/bsd.*.mk
> do this manually as of today.
> 
> > +CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
> > +.endif
> 
> Really?
> 
> Something looks fundamentally wrong if you have to do this under
> .if defined(USE_READLINE), at least past
> 
>   r270411 | erwin | 2011-03-07 07:32:05 +0000 (Mon, 07 Mar 2011) | 5 lines
> 
>   Pass CPPFLAGS to MAKE_ENV and CONFIGURE_ENV
> 
>   PR:             153625
>   Submitted by:   gerald
> 
> How about the patch below?
> 
> Gerald
> 
> Index: bsd.port.mk
> ===================================================================
> --- bsd.port.mk	(revision 303674)
> +++ bsd.port.mk	(working copy)
> @@ -1708,7 +1708,6 @@
>  LIB_DEPENDS+=	readline.6:${PORTSDIR}/devel/readline
>  CPPFLAGS+=		-I${LOCALBASE}/include
>  LDFLAGS+=		-L${LOCALBASE}/lib -lreadline
> -CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
>  .endif
>  .endif
>  
Btw there are cases where one needs to -I a different dir before
${LOCALBASE}/include so if we do this it needs to be optional.
(For example when one needs to include a different version of
a header than what is or may be in ${LOCALBASE}/include, like
when using ffmpeg011 or an internal ffmpeg version instead of the
default ffmpeg port that may be also installed.  I know at least
avidemux and vlc need this.)

 Just thought I'd mention... :)
	Juergen