summaryrefslogtreecommitdiff
path: root/lang
diff options
context:
space:
mode:
authorhubertf <hubertf@pkgsrc.org>2006-12-01 10:55:24 +0000
committerhubertf <hubertf@pkgsrc.org>2006-12-01 10:55:24 +0000
commitcdfb109833a9ae76467e53dfd719dcc94ea7719e (patch)
tree56cf03493b4e98197e21b156ac271e810ac7d604 /lang
parent25f8ff738bd19612cf7f5930d3147905d17f39ca (diff)
downloadpkgsrc-cdfb109833a9ae76467e53dfd719dcc94ea7719e.tar.gz
uname -m returns amd64, not x86_86.
Reported and tested by Blair Sadewitz (blair.sadewitz at gmail dot com)
Diffstat (limited to 'lang')
-rw-r--r--lang/spidermonkey/Makefile4
-rw-r--r--lang/spidermonkey/files/pkgsrc.mk4
2 files changed, 4 insertions, 4 deletions
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