Date: Sun, 3 Mar 2002 20:39:09 +0900 (JST) From: Takahashi Yoshihiro <nyan@jp.FreeBSD.org> To: FreeBSD-gnats-submit@freebsd.org Subject: ports/35514: Use the value of hw.machine_arch instead of hw.machine to get the arch of the machine. Message-ID: <200203031139.g23Bd9X24342@watery.cc.kogakuin.ac.jp>
next in thread | raw e-mail | index | archive | help
>Number: 35514
>Category: ports
>Synopsis: Use the value of hw.machine_arch instead of hw.machine to get the arch of the machine.
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Sun Mar 03 03:40:01 PST 2002
>Closed-Date:
>Last-Modified:
>Originator: Takahashi Yoshihiro
>Release: FreeBSD 4.5-STABLE i386
>Organization:
Kogakuin, Univ.
>Environment:
System: FreeBSD watery.cc.kogakuin.ac.jp 4.5-STABLE FreeBSD 4.5-STABLE #3: Wed Feb 27 13:34:36 JST 2002 nyan@watery.cc.kogakuin.ac.jp:/usr/src/sys/compile/WATERY i386
>Description:
Currently, we use the value of hw.machine to get the arch of the machine in
bsd.port.mk and bsd.port.subdir.mk. But, we should use the value of
hw.machine_arch instead of hw.machine.
We can use 'uname -p' to get hw.machine_arch because 'uname -p' prints the
value of hw.machine_arch now.
>How-To-Repeat:
>Fix:
Index: ports/Mk/bsd.port.mk
===================================================================
RCS file: /home/ncvs/ports/Mk/bsd.port.mk,v
retrieving revision 1.397
diff -u -r1.397 bsd.port.mk
--- ports/Mk/bsd.port.mk 24 Jan 2002 01:15:03 -0000 1.397
+++ ports/Mk/bsd.port.mk 3 Feb 2002 12:24:22 -0000
@@ -32,7 +32,7 @@
# These are meta-variables that are automatically set to the system
# you are running on.
#
-# ARCH - The architecture, as returned by "uname -m".
+# ARCH - The architecture, as returned by "uname -p".
# OPSYS - Portability clause. This is the operating system the
# makefile is being used on. Automatically set to
# "FreeBSD," "NetBSD," or "OpenBSD" as appropriate.
@@ -593,7 +593,7 @@
# Get the architecture
.if !defined(ARCH)
-ARCH!= ${UNAME} -m
+ARCH!= ${UNAME} -p
.endif
# Kludge for pre-3.0 systems
Index: ports/Mk/bsd.port.subdir.mk
===================================================================
RCS file: /home/ncvs/ports/Mk/bsd.port.subdir.mk,v
retrieving revision 1.41
diff -u -r1.41 bsd.port.subdir.mk
--- ports/Mk/bsd.port.subdir.mk 23 Dec 2001 11:11:40 -0000 1.41
+++ ports/Mk/bsd.port.subdir.mk 12 Jan 2002 08:44:23 -0000
@@ -47,7 +47,7 @@
.if !defined(NOPRECIOUSMAKEVARS)
.if !defined(ARCH)
-ARCH!= /usr/bin/uname -m
+ARCH!= /usr/bin/uname -p
.endif
.if !defined(OSREL)
OSREL!= /usr/bin/uname -r | sed -e 's/[-(].*//'
@@ -112,8 +112,8 @@
${ECHO_MSG} "===> ${DIRPRFX}$$sub skipped"; \
fi; \
done; \
- if test -d ${.CURDIR}/${.TARGET:R}.${MACHINE}; then \
- edir=$${sub}.${MACHINE}; \
+ if test -d ${.CURDIR}/${.TARGET:R}.${MACHINE_ARCH}; then \
+ edir=$${sub}.${MACHINE_ARCH}; \
elif test -d ${.CURDIR}/$${sub}; then \
edir=$${sub}; \
else \
>Release-Note:
>Audit-Trail:
>Unformatted:
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200203031139.g23Bd9X24342>