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

When knocking out a MULTI_PACKAGE on some arch, keep listing it in

Browse Source 
MULTI_PACKAGES, and add an (ONLY|NOT)_FOR_ARCHS-subpkg=somearch, rather
than changing contents of the MULTI_PACKAGES variable.

Fixes dpb builds on !amd64/i386, because the bsddb package was
knocked out on other arch.

'please unfuck the fucking mess people only testing on i386 and
amd64 did' landry@
This commit is contained in:
sthen 2010-09-03 19:20:06 +00:00
parent aa9bdb6a6a
commit 9a433e21ca
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lang/python/Makefile.inc
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile.inc,v 1.64 2010/02/25 11:02:39 phessler Exp $
# $OpenBSD: Makefile.inc,v 1.65 2010/09/03 19:20:06 sthen Exp $
# IMPORTANT! If you make any changes to the Python ports, be sure
# to also update files/CHANGES.OpenBSD for your change. This is a
@ -34,13 +34,12 @@ PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
MULTI_PACKAGES= -main -tests -tools -gdbm -idle -tkinter
MULTI_PACKAGES= -main -tests -tools -gdbm -idle -tkinter -bsddb
# Python 2.6 lists BSD db 4.6.x as unstable on most architectures (see
# setup.py:allow_db_version). XXX revisit if databases/db/v4 is updated to 4.7
.if ${VERSION} != "2.6" || \
${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386"
MULTI_PACKAGES+=-bsddb
.if ${VERSION} == "2.6"
ONLY_FOR_ARCHS-bsddb= amd64 i386
.endif
# All subpackages depend on the main python package.