From 4d2dd8dac167b35beeb5345702a379269d7a0a64 Mon Sep 17 00:00:00 2001
From: hubertf <hubertf>
Date: Fri, 1 Dec 2006 10:55:24 +0000
Subject: uname -m returns amd64, not x86_86. Reported and tested by Blair
 Sadewitz (blair.sadewitz at gmail dot com)

---
 lang/spidermonkey/Makefile        | 4 ++--
 lang/spidermonkey/files/pkgsrc.mk | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'lang/spidermonkey')

diff --git a/lang/spidermonkey/Makefile b/lang/spidermonkey/Makefile
index 1da7f4dd3f0..880c185a7cd 100644
--- a/lang/spidermonkey/Makefile
+++ b/lang/spidermonkey/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2006/09/09 02:43:09 obache Exp $
+# $NetBSD: Makefile,v 1.9 2006/12/01 10:55:24 hubertf Exp $
 
 DISTNAME=	js-1.5
 PKGNAME=	${DISTNAME:S/js/spidermonkey/}
-PKGREVISION=	4
+PKGREVISION=	5
 CATEGORIES=	lang
 MASTER_SITES=	http://ftp.mozilla.org/pub/mozilla.org/js/
 
diff --git a/lang/spidermonkey/files/pkgsrc.mk b/lang/spidermonkey/files/pkgsrc.mk
index 88707f95a1c..a835d0418d4 100644
--- a/lang/spidermonkey/files/pkgsrc.mk
+++ b/lang/spidermonkey/files/pkgsrc.mk
@@ -54,7 +54,7 @@ MKSHLIB = $(LD) -shared $(XMKSHLIBOPTS)
 
 CPU_ARCH = $(shell uname -m)
 # don't filter in x86-64 architecture
-ifneq (x86_64,$(CPU_ARCH))
+ifneq (amd64,$(CPU_ARCH))
 ifeq (86,$(findstring 86,$(CPU_ARCH)))
 CPU_ARCH = x86
 OS_CFLAGS+= -DX86_LINUX
@@ -90,7 +90,7 @@ endif
 # Use the editline library to provide line-editing support.
 JS_EDITLINE = 1
 
-ifeq ($(CPU_ARCH),x86_64)
+ifeq ($(CPU_ARCH),amd64)
 # Use VA_COPY() standard macro on x86-64
 # FIXME: better use it everywhere
 OS_CFLAGS += -DHAVE_VA_COPY -DVA_COPY=va_copy
-- 
cgit v1.2.3