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

some recursive scenarios would break, let _ARCH_OK be undefined, catch it

Browse Source 
later.
This commit is contained in:
espie 2010-07-10 15:17:40 +00:00
parent b0858295bb
commit 11d3fea7e4
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
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.1020 2010/07/10 13:29:48 espie Exp $
# $OpenBSD: bsd.port.mk,v 1.1021 2010/07/10 15:17:40 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 $
#
@ -434,8 +434,6 @@ _ARCH_OK${_s} = 0
. endif
. endfor
. endif
# XXX
_ARCH_OK${SUBPACKAGE} ?= 0
# allow subpackages to vanish on architectures that don't
# support them
@ -1304,7 +1302,7 @@ IGNORE += "is not an interactive port"
.if ${USE_X11:L} == "yes" && !exists(${X11BASE})
IGNORE += "uses X11, but ${X11BASE} not found"
.endif
.if ${_ARCH_OK${SUBPACKAGE}} == 0
.if !defined(${_ARCH_OK${SUBPACKAGE}}) || ${_ARCH_OK${SUBPACKAGE}} == 0
. if defined(ONLY_FOR_ARCHS${SUBPACKAGE})
. if ${MACHINE_ARCH} == "${ARCH}"
IGNORE += "is only for ${ONLY_FOR_ARCHS${SUBPACKAGE}}, not ${MACHINE_ARCH}"