pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc/databases/db4 Migrate powerpc hack to hacks.mk to simp...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/0135cacd5416
branches:  trunk
changeset: 483664:0135cacd5416
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Tue Nov 16 23:45:25 2004 +0000

description:
Migrate powerpc hack to hacks.mk to simplify core logic in Makefile.

diffstat:

 databases/db4/Makefile |  24 +-----------------------
 databases/db4/hacks.mk |  29 +++++++++++++++++++++++++++++
 2 files changed, 30 insertions(+), 23 deletions(-)

diffs (71 lines):

diff -r a0a9e1b84e7a -r 0135cacd5416 databases/db4/Makefile
--- a/databases/db4/Makefile    Tue Nov 16 22:44:51 2004 +0000
+++ b/databases/db4/Makefile    Tue Nov 16 23:45:25 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2004/11/10 15:51:23 jlam Exp $
+# $NetBSD: Makefile,v 1.26 2004/11/16 23:45:25 jlam Exp $
 
 DISTNAME=              db-4.2.52
 PKGNAME=               ${DISTNAME:S/db/db4/}
@@ -34,28 +34,6 @@
 # needed for this package the following does no harm on other platform.
 CONFIGURE_ENV+=                F77=${FALSE}
 
-.if ${MACHINE_ARCH} == "powerpc"
-.  include "../../mk/compiler.mk"
-.  if !empty(CC_VERSION:Mgcc*)
-.    if !defined(_GCC_IS_TOO_OLD)
-_GCC_IS_TOO_OLD!=      \
-       if ${PKG_ADMIN} pmatch 'gcc<3.3' ${CC_VERSION}; then            \
-               ${ECHO} "yes";                                          \
-       else                                                            \
-               ${ECHO} "no";                                           \
-       fi
-MAKEFLAGS+=    _GCC_IS_TOO_OLD=${_GCC_IS_TOO_OLD}
-.    endif
-.    if !empty(_GCC_IS_TOO_OLD:M[yY][eE][sS])
-#
-# Pre-3.3 GCC has an optimization bug tickled by the db4 code, so remove
-# optimization.
-#
-BUILDLINK_TRANSFORM+=  rm:-O[0-9]*
-.    endif
-.  endif
-.endif
-
 .if defined(WITH_JAVA) && (${WITH_JAVA} == "yes")
 CONFIGURE_ARGS+=       --enable-java
 .  include "../../mk/java-vm.mk"
diff -r a0a9e1b84e7a -r 0135cacd5416 databases/db4/hacks.mk
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/databases/db4/hacks.mk    Tue Nov 16 23:45:25 2004 +0000
@@ -0,0 +1,29 @@
+# $NetBSD: hacks.mk,v 1.1 2004/11/16 23:45:25 jlam Exp $
+
+### [Sun Mar 14 19:32:40 UTC 2004 : jlam]
+### Pre-3.3 GCC has an optimization bug on powerpc that's tickled by
+### the db4 source code, so remove optimization flags in that case.
+### This fixes PR 23737 by John Klos.
+###
+.if ${MACHINE_ARCH} == "powerpc"
+.  include "../../mk/compiler.mk"
+.  if !empty(CC_VERSION:Mgcc*)
+.    if !defined(_GCC_IS_TOO_OLD)
+_GCC_IS_TOO_OLD!=      \
+       if ${PKG_ADMIN} pmatch 'gcc<3.3' ${CC_VERSION}; then            \
+               ${ECHO} "yes";                                          \
+       else                                                            \
+               ${ECHO} "no";                                           \
+       fi
+MAKEFLAGS+=    _GCC_IS_TOO_OLD=${_GCC_IS_TOO_OLD}
+.    endif
+.    if !empty(_GCC_IS_TOO_OLD:M[yY][eE][sS])
+#
+# Pre-3.3 GCC has an optimization bug tickled by the db4 code, so remove
+# optimization.
+#
+PKG_HACKS+=            powerpc-codegen
+BUILDLINK_TRANSFORM+=  rm:-O[0-9]*
+.    endif
+.  endif
+.endif



Home | Main Index | Thread Index | Old Index