diff options
| author | joerg <joerg@pkgsrc.org> | 2007-08-15 13:25:47 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2007-08-15 13:25:47 +0000 |
| commit | ff4ca43fd6e56dcced73fbdb5f0fa8f61e21a894 (patch) | |
| tree | 77e549174822a60311f3006b5a0af75466cc50c1 /mk/bsd.prefs.mk | |
| parent | f3e91441c91d0f52086e9ce817d5cdfbf71c9975 (diff) | |
| download | pkgsrc-ff4ca43fd6e56dcced73fbdb5f0fa8f61e21a894.tar.gz | |
Move APPENDELF definition after the reassigning of MACHINE_ARCH.
This allows cross-compiling of x86_64 from i386.
Diffstat (limited to 'mk/bsd.prefs.mk')
| -rw-r--r-- | mk/bsd.prefs.mk | 31 |
1 files changed, 16 insertions, 15 deletions
diff --git a/mk/bsd.prefs.mk b/mk/bsd.prefs.mk index a8b0931e1bc..e6d26526e05 100644 --- a/mk/bsd.prefs.mk +++ b/mk/bsd.prefs.mk @@ -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 @@ _PKGSRC_TOPDIR= ${.CURDIR}/../.. # 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 @@ _CROSS_DESTDIR= ${CROSS_DESTDIR} . 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. |