pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/lang/perl5 Set ccflags and ldflags in Policy.sh instea...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/80fc4e62399c
branches:  trunk
changeset: 610791:80fc4e62399c
user:      sbd <sbd%pkgsrc.org@localhost>
date:      Wed Nov 07 03:58:00 2012 +0000

description:
Set ccflags and ldflags in Policy.sh instead of with CONFIGURE_ARGS.

diffstat:

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

diffs (46 lines):

diff -r 9a45c157fc8d -r 80fc4e62399c lang/perl5/Makefile
--- a/lang/perl5/Makefile       Wed Nov 07 02:46:19 2012 +0000
+++ b/lang/perl5/Makefile       Wed Nov 07 03:58:00 2012 +0000
@@ -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 @@
 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+=  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 -r 9a45c157fc8d -r 80fc4e62399c lang/perl5/files/Policy.sh
--- a/lang/perl5/files/Policy.sh        Wed Nov 07 02:46:19 2012 +0000
+++ b/lang/perl5/files/Policy.sh        Wed Nov 07 03:58:00 2012 +0000
@@ -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'



Home | Main Index | Thread Index | Old Index