Sat Jan 12 14:40:21 2008 UTC ()
If LOWER_ARCH is x86_64 on Linux, force it for MACHINE_ARCH as well.
On a Core 2 Xeon, it breaks a lot of things otherwise as it ends up as
something like "Intel(R) Core(R)".


(joerg)
diff -r1.274 -r1.275 pkgsrc/mk/bsd.prefs.mk
cvs diff -r1.274 -r1.275 pkgsrc/mk/bsd.prefs.mk (expand / switch to unified diff)

--- pkgsrc/mk/bsd.prefs.mk 2008/01/04 01:46:24 1.274
+++ pkgsrc/mk/bsd.prefs.mk 2008/01/12 14:40:21 1.275
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: bsd.prefs.mk,v 1.274 2008/01/04 01:46:24 rillig Exp $ 1# $NetBSD: bsd.prefs.mk,v 1.275 2008/01/12 14:40:21 joerg Exp $
2# 2#
3# This file includes the mk.conf file, which contains the user settings. 3# This file includes the mk.conf file, which contains the user settings.
4# 4#
5# Packages should include this file before any of the .if directives, as 5# Packages should include this file before any of the .if directives, as
6# well as before modifying variables like CFLAGS, LDFLAGS, and so on. 6# well as before modifying variables like CFLAGS, LDFLAGS, and so on.
7# Otherwise the behavior may be unexpected. 7# Otherwise the behavior may be unexpected.
8# 8#
9# When mk.conf is included by this file, the following variables are 9# When mk.conf is included by this file, the following variables are
10# defined: 10# defined:
11# 11#
12# ACCEPTABLE_LICENSES 12# ACCEPTABLE_LICENSES
13# This variable is set to the list of Open Source licenses. See 13# This variable is set to the list of Open Source licenses. See
14# mk/license.mk for details. 14# mk/license.mk for details.
@@ -177,26 +177,29 @@ LOWER_ARCH!= ${UNAME} -p @@ -177,26 +177,29 @@ LOWER_ARCH!= ${UNAME} -p
177LOWER_OPSYS?= irix 177LOWER_OPSYS?= irix
178LOWER_OPSYS_VERSUFFIX?= ${OS_VERSION} 178LOWER_OPSYS_VERSUFFIX?= ${OS_VERSION}
179LOWER_VENDOR?= sgi 179LOWER_VENDOR?= sgi
180 180
181.elif ${OPSYS} == "Linux" 181.elif ${OPSYS} == "Linux"
182OS_VERSION:= ${OS_VERSION:C/-.*$//} 182OS_VERSION:= ${OS_VERSION:C/-.*$//}
183LOWER_OS_VERSION:= ${LOWER_OS_VERSION_CMD:C/-.*$//} 183LOWER_OS_VERSION:= ${LOWER_OS_VERSION_CMD:C/-.*$//}
184LOWER_OPSYS?= linux 184LOWER_OPSYS?= linux
185MACHINE_ARCH:= ${MACHINE_ARCH:C/i.86/i386/} 185MACHINE_ARCH:= ${MACHINE_ARCH:C/i.86/i386/}
186MACHINE_ARCH:= ${MACHINE_ARCH:C/ppc/powerpc/} 186MACHINE_ARCH:= ${MACHINE_ARCH:C/ppc/powerpc/}
187. if !defined(LOWER_ARCH) 187. if !defined(LOWER_ARCH)
188LOWER_ARCH!= ${UNAME} -m | sed -e 's/i.86/i386/' -e 's/ppc/powerpc/' 188LOWER_ARCH!= ${UNAME} -m | sed -e 's/i.86/i386/' -e 's/ppc/powerpc/'
189. endif # !defined(LOWER_ARCH) 189. endif # !defined(LOWER_ARCH)
 190. if ${LOWER_ARCH} == "x86_64"
 191MACHINE_ARCH= x86_64
 192. endif
190. if ${MACHINE_ARCH} == "unknown" || ${MACHINE_ARCH} == "" 193. if ${MACHINE_ARCH} == "unknown" || ${MACHINE_ARCH} == ""
191MACHINE_ARCH= ${LOWER_ARCH} 194MACHINE_ARCH= ${LOWER_ARCH}
192MAKEFLAGS+= LOWER_ARCH=${LOWER_ARCH:Q} 195MAKEFLAGS+= LOWER_ARCH=${LOWER_ARCH:Q}
193. endif 196. endif
194. if exists(/etc/debian_version) 197. if exists(/etc/debian_version)
195LOWER_VENDOR?= debian 198LOWER_VENDOR?= debian
196. elif exists(/etc/mandrake-release) 199. elif exists(/etc/mandrake-release)
197LOWER_VENDOR?= mandrake 200LOWER_VENDOR?= mandrake
198. elif exists(/etc/redhat-version) 201. elif exists(/etc/redhat-version)
199LOWER_VENDOR?= redhat 202LOWER_VENDOR?= redhat
200. elif exists(/etc/slackware-version) 203. elif exists(/etc/slackware-version)
201LOWER_VENDOR?= slackware 204LOWER_VENDOR?= slackware
202. elif ${LOWER_ARCH} == "i386" 205. elif ${LOWER_ARCH} == "i386"