[pkgsrc/trunk]: pkgsrc/mk Move APPENDELF definition after the reassigning of ...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/a443fcb0b42c
branches:  trunk
changeset: 532272:a443fcb0b42c
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Wed Aug 15 13:25:47 2007 +0000

description:
Move APPENDELF definition after the reassigning of MACHINE_ARCH.
This allows cross-compiling of x86_64 from i386.

diffstat:

 mk/bsd.prefs.mk |  31 ++++++++++++++++---------------
 1 files changed, 16 insertions(+), 15 deletions(-)

diffs (52 lines):

diff -r 00479b9843f6 -r a443fcb0b42c mk/bsd.prefs.mk
--- a/mk/bsd.prefs.mk   Wed Aug 15 13:24:14 2007 +0000
+++ b/mk/bsd.prefs.mk   Wed Aug 15 13:25:47 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.prefs.mk,v 1.263 2007/08/13 09:03:41 rillig Exp $
+# $NetBSD: bsd.prefs.mk,v 1.264 2007/08/15 13:25:47 joerg Exp $
 #
 # This file includes the mk.conf file, which contains the user settings.
 #
@@ -332,20 +332,6 @@
 # include the defaults file
 .include "${_PKGSRC_TOPDIR}/mk/defaults/mk.conf"
 
-.if ${OPSYS} == "NetBSD"
-.  if ${OBJECT_FMT} == "ELF" && \
-   (${MACHINE_GNU_ARCH} == "arm" || \
-    ${MACHINE_ARCH} == "i386" || \
-    ${MACHINE_ARCH} == "m68k" || \
-    ${MACHINE_ARCH} == "m68000" || \
-    ${MACHINE_GNU_ARCH} == "sh" || \
-    ${MACHINE_GNU_ARCH} == "shle" || \
-    ${MACHINE_ARCH} == "sparc" || \
-    ${MACHINE_ARCH} == "vax")
-APPEND_ELF=            elf
-.  endif
-.endif
-
 SHAREOWN?=             ${DOCOWN}
 SHAREGRP?=             ${DOCGRP}
 SHAREMODE?=            ${DOCMODE}
@@ -433,6 +419,21 @@
 .  endif
 .endif
 
+# Depends on MACHINE_ARCH override above
+.if ${OPSYS} == "NetBSD"
+.  if ${OBJECT_FMT} == "ELF" && \
+   (${MACHINE_GNU_ARCH} == "arm" || \
+    ${MACHINE_ARCH} == "i386" || \
+    ${MACHINE_ARCH} == "m68k" || \
+    ${MACHINE_ARCH} == "m68000" || \
+    ${MACHINE_GNU_ARCH} == "sh" || \
+    ${MACHINE_GNU_ARCH} == "shle" || \
+    ${MACHINE_ARCH} == "sparc" || \
+    ${MACHINE_ARCH} == "vax")
+APPEND_ELF=            elf
+.  endif
+.endif
+
 PKG_INSTALLATION_TYPES?= overwrite
 # This is a whitespace-separated list of installation types supported
 # by the package.