svn commit: r303619 - head/Mk

[Gerald Pfeifer]

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