From 9c1f56751f4e1ffea75c0c4d3d333ea8f9978b23 Mon Sep 17 00:00:00 2001
From: sbd <sbd@pkgsrc.org>
Date: Wed, 7 Nov 2012 03:58:00 +0000
Subject: Set ccflags and ldflags in Policy.sh instead of with CONFIGURE_ARGS.

---
 lang/perl5/Makefile        | 5 ++---
 lang/perl5/files/Policy.sh | 8 +++++---
 2 files changed, 7 insertions(+), 6 deletions(-)

(limited to 'lang')

diff --git a/lang/perl5/Makefile b/lang/perl5/Makefile
index f4f28bb9073..3df227cbddc 100644
--- a/lang/perl5/Makefile
+++ b/lang/perl5/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.190 2012/11/07 02:46:19 sbd Exp $
+# $NetBSD: Makefile,v 1.191 2012/11/07 03:58:00 sbd Exp $
 
 .include "license.mk"
 .include "Makefile.common"
@@ -45,8 +45,6 @@ PERL5_API_VERS_cmd=	\
 HAS_CONFIGURE=		yes
 CONFIGURE_SCRIPT=	./Configure
 CONFIGURE_ARGS+=	-sde
-CONFIGURE_ARGS+=	-D ccflags=${CFLAGS:Q}
-CONFIGURE_ARGS+=	-D ldflags=${LDFLAGS:Q}
 MAKE_ENV+=		LC_ALL="C"
 
 TEST_TARGET=		test
@@ -61,6 +59,7 @@ SUBST_VARS.policysh+=	LOWER_OPSYS
 SUBST_VARS.policysh+=	OBJECT_FMT
 SUBST_VARS.policysh+=	CC
 SUBST_VARS.policysh+=	CFLAGS
+SUBST_VARS.policysh+=	LDFLAGS
 SUBST_VARS.policysh+=	COMPILER_RPATH_FLAG
 SUBST_VARS.policysh+=	PERL5_PREFIX
 SUBST_VARS.policysh+=	PERL5_SITEPREFIX
diff --git a/lang/perl5/files/Policy.sh b/lang/perl5/files/Policy.sh
index cdba25b2295..d203fe33865 100644
--- a/lang/perl5/files/Policy.sh
+++ b/lang/perl5/files/Policy.sh
@@ -1,11 +1,13 @@
-# $NetBSD: Policy.sh,v 1.4 2012/11/07 02:46:19 sbd Exp $
+# $NetBSD: Policy.sh,v 1.5 2012/11/07 03:58:00 sbd Exp $
 #
 # Site-wide policy settings for pkgsrc Perl
 #
 archname='@MACHINE_ARCH@-@LOWER_OPSYS@'
 cc='@CC@'
-if $test -n '@CFLAGS@'; then
-	optimize='@CFLAGS@'
+ccflags='@CFLAGS@'
+ldflags='@LDFLAGS@'
+if $test -n "$ccflags"; then
+	optimize="$ccflags"
 fi
 i_malloc='undef'
 installusrbinperl='undef'
-- 
cgit v1.2.3