pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc/mk If LOWER_ARCH is x86_64 on Linux, force it for MACH...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/fdc9e11d7b77
branches:  trunk
changeset: 537627:fdc9e11d7b77
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Sat Jan 12 14:40:21 2008 +0000

description:
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)".

diffstat:

 mk/bsd.prefs.mk |  5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diffs (19 lines):

diff -r 81f1a5ecc154 -r fdc9e11d7b77 mk/bsd.prefs.mk
--- a/mk/bsd.prefs.mk   Sat Jan 12 14:28:03 2008 +0000
+++ b/mk/bsd.prefs.mk   Sat Jan 12 14:40:21 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.prefs.mk,v 1.274 2008/01/04 01:46:24 rillig Exp $
+# $NetBSD: bsd.prefs.mk,v 1.275 2008/01/12 14:40:21 joerg Exp $
 #
 # This file includes the mk.conf file, which contains the user settings.
 #
@@ -187,6 +187,9 @@
 .  if !defined(LOWER_ARCH)
 LOWER_ARCH!=           ${UNAME} -m | sed -e 's/i.86/i386/' -e 's/ppc/powerpc/'
 .  endif # !defined(LOWER_ARCH)
+.  if ${LOWER_ARCH} == "x86_64"
+MACHINE_ARCH=          x86_64
+.  endif
 .  if ${MACHINE_ARCH} == "unknown" || ${MACHINE_ARCH} == ""
 MACHINE_ARCH=          ${LOWER_ARCH}
 MAKEFLAGS+=            LOWER_ARCH=${LOWER_ARCH:Q}



Home | Main Index | Thread Index | Old Index