summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjlam <jlam@pkgsrc.org>2005-05-11 16:15:50 +0000
committerjlam <jlam@pkgsrc.org>2005-05-11 16:15:50 +0000
commitf983f6fd443e1f9c367629d65a78d55493fed4ff (patch)
tree873c84ac068bb716509540eac65cfcd7f0be9b68
parent0754d57002bbd50ffae10fe43752d63cfe01c103 (diff)
downloadpkgsrc-f983f6fd443e1f9c367629d65a78d55493fed4ff.tar.gz
Move the arm-specific hack into the hacks.mk file, and properly document
what is happening.
-rw-r--r--lang/perl58/Makefile8
-rw-r--r--lang/perl58/hacks.mk11
2 files changed, 11 insertions, 8 deletions
diff --git a/lang/perl58/Makefile b/lang/perl58/Makefile
index 48b2129143f..11b559b5a8a 100644
--- a/lang/perl58/Makefile
+++ b/lang/perl58/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.80 2005/05/09 15:41:52 xtraeme Exp $
+# $NetBSD: Makefile,v 1.81 2005/05/11 16:15:50 jlam Exp $
# The following two variables should have empty values unless we're
# building a perl snapshot or release candidate.
@@ -52,13 +52,7 @@ CONFIGURE_ARGS+= -Dprefix="${PREFIX}"
CONFIGURE_ARGS+= -Dscriptdir="${PREFIX}/bin"
CONFIGURE_ARGS+= -Darchname="${MACHINE_ARCH}-${LOWER_OPSYS}"
CONFIGURE_ARGS+= -Dcc="${CC}"
-.if !empty(MACHINE_ARCH:Marm)
-. if !empty(CC_VERSION:Mgcc-3*)
-CONFIGURE_ARGS+= -Doptimize="${CFLAGS} -fno-cse-skip-blocks"
-. endif
-.else
CONFIGURE_ARGS+= -Doptimize="${CFLAGS}"
-.endif
CONFIGURE_ARGS+= -Dinstallstyle="lib/perl5"
CONFIGURE_ARGS+= -Duseshrplib
CONFIGURE_ARGS+= -Ui_malloc
diff --git a/lang/perl58/hacks.mk b/lang/perl58/hacks.mk
index 4f8c5750443..7130e3111f8 100644
--- a/lang/perl58/hacks.mk
+++ b/lang/perl58/hacks.mk
@@ -1,4 +1,4 @@
-# $NetBSD: hacks.mk,v 1.5 2004/12/10 23:48:50 jlam Exp $
+# $NetBSD: hacks.mk,v 1.6 2005/05/11 16:15:50 jlam Exp $
.include "../../mk/compiler.mk"
@@ -61,3 +61,12 @@ NaN-vax-exception:
PKG_HACKS+= alpha-mieee
BUILDLINK_TRANSFORM+= rm:-mieee
.endif
+
+### [Mon May 9 15:35:44 UTC 2005 : jlam]
+### On NetBSD/arm, skipping one part of the optimization pass empirically
+### "fixes" the build of perl using gcc-3.x.
+###
+.if !empty(CC_VERSION:Mgcc-3.*) && !empty(MACHINE_ARCH:Marm*)
+PKG_HACKS+= arm-codegen
+CFLAGS+= -fno-cse-skip-blocks
+.endif