[pkgsrc/trunk]: pkgsrc/lang/tcl Migrate OS/architecture hacks for correct com...

[jlam <jlam%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/a0a9e1b84e7a
branches:  trunk
changeset: 483663:a0a9e1b84e7a
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Tue Nov 16 22:44:51 2004 +0000

description:
Migrate OS/architecture hacks for correct compilation to a separate
hacks.mk file.

diffstat:

 lang/tcl/Makefile |   8 +-------
 lang/tcl/hacks.mk |  14 ++++++++++++++
 2 files changed, 15 insertions(+), 7 deletions(-)

diffs (40 lines):

diff -r ad39a82dc904 -r a0a9e1b84e7a lang/tcl/Makefile
--- a/lang/tcl/Makefile Tue Nov 16 21:48:38 2004 +0000
+++ b/lang/tcl/Makefile Tue Nov 16 22:44:51 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.40 2004/10/30 05:18:51 minskim Exp $
+# $NetBSD: Makefile,v 1.41 2004/11/16 22:44:51 jlam Exp $
 
 DISTNAME=      tcl8.4.7-src
 PKGNAME=       tcl-8.4.7
@@ -41,12 +41,6 @@
 # Add ${VIEWBASE}/lib/tcl to the list of locations for Tcl packages.
 CONFIGURE_ENV+=                TCL_PACKAGE_PATH="${VIEWBASE}/lib/tcl"
 
-# NetBSD-1.5.x-m68k platforms apparently have a compiler optimization bug
-# tickled by the Tcl code that manifests in code generation problems.
-.if (${MACHINE_PLATFORM:MNetBSD-1.5*-m68k} != "")
-CONFIGURE_ENV+=                COMPILER_OPTIMIZATION_BUG=YES
-.endif
-
 .if ${OPSYS} == "NetBSD"
 .if empty(OS_VERSION:M1.[56].*)
 .include "../../mk/pthread.buildlink3.mk"
diff -r ad39a82dc904 -r a0a9e1b84e7a lang/tcl/hacks.mk
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/lang/tcl/hacks.mk Tue Nov 16 22:44:51 2004 +0000
@@ -0,0 +1,14 @@
+# $NetBSD: hacks.mk,v 1.1 2004/11/16 22:44:51 jlam Exp $
+
+### [Wed Jul 25 19:42:58 UTC 2001 : jlam]
+### Force no optimization (-O0) on NetBSD-1.5.x/m68k machines as there
+### appears to be an optimization bug that causes the build to fail
+### (pkg/13395).  The problem appeared in the original PR on an Amiga
+### running NetBSD 1.5.1 and also on a mac68k running NetBSD 1.5.1.
+### This workaround was tested on the mac68k system (kindly provided
+### by Jon Lindgren).
+###
+.if !empty(MACHINE_PLATFORM:MNetBSD-1.5*-m68k)
+PKG_HACKS+=            netbsd-1-5-m68k-codegen
+BUILDLINK_TRANSFORM+=  rm:-O[0-9]*
+.endif