cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

avoid recomputing ARCH all the time.

Browse Source
This commit is contained in:
espie 2007-07-08 17:57:56 +00:00
parent 7dbb038927
commit 43c841c254
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
infrastructure/mk/bsd.port.mk
View File

@ -1,6 +1,6 @@
#-*- mode: Makefile; tab-width: 4; -*-
# ex:ts=4 sw=4 filetype=make:
# $OpenBSD: bsd.port.mk,v 1.909 2007/06/30 14:48:04 espie Exp $
# $OpenBSD: bsd.port.mk,v 1.910 2007/07/08 17:57:56 espie Exp $
# $FreeBSD: bsd.port.mk,v 1.264 1996/12/25 02:27:44 imp Exp $
# $NetBSD: bsd.port.mk,v 1.62 1998/04/09 12:47:02 hubertf Exp $
#
@ -98,7 +98,7 @@ PATCH_CHECK_ONLY ?= No
REFETCH ?= false
# Constants used by the ports tree
ARCH != uname -m
#ARCH ?!= uname -m
OPSYS = OpenBSD
OPSYS_VER = ${OSREV}

3
infrastructure/mk/bsd.port.subdir.mk
View File

@ -1,7 +1,7 @@
#-*- mode: Makefile; tab-width: 4; -*-
# ex:ts=4 sw=4 filetype=make:
# from: @(#)bsd.subdir.mk 5.9 (Berkeley) 2/1/91
# $OpenBSD: bsd.port.subdir.mk,v 1.87 2007/06/30 14:31:00 espie Exp $
# $OpenBSD: bsd.port.subdir.mk,v 1.88 2007/07/08 17:57:56 espie Exp $
# FreeBSD Id: bsd.port.subdir.mk,v 1.20 1997/08/22 11:16:15 asami Exp
#
# The include file <bsd.port.subdir.mk> contains the default targets
@ -58,6 +58,7 @@ STRIP ?= -s
.if !defined(OPSYS) # XXX !!
OPSYS = OpenBSD
.endif
ARCH ?!= uname -m
.include "${PORTSDIR}/infrastructure/mk/pkgpath.mk"

4
infrastructure/mk/pkgpath.mk
View File

@ -1,4 +1,4 @@
# $OpenBSD: pkgpath.mk,v 1.14 2007/06/28 21:05:48 espie Exp $
# $OpenBSD: pkgpath.mk,v 1.15 2007/07/08 17:57:56 espie Exp $
# ex:ts=4 sw=4 filetype=make:
# pkgpath.mk - 2003 Marc Espie
# This file is in the public domain.
@ -53,7 +53,7 @@ _flavor_fragment = \
*) \
dir=$$subdir;; \
esac; \
toset="PKGPATH=$$dir"; \
toset="PKGPATH=$$dir ARCH=${ARCH}"; \
case X$$multi in "X");; *) \
toset="$$toset SUBPACKAGE=\"$$multi\"";; \
esac; \