diff options
| author | sbd <sbd@pkgsrc.org> | 2010-04-30 03:29:55 +0000 |
|---|---|---|
| committer | sbd <sbd@pkgsrc.org> | 2010-04-30 03:29:55 +0000 |
| commit | 8930a996f5966ce6af535988c05a07af88731c4c (patch) | |
| tree | 3d0c58777377f39eb261234524d0523615aa681c | |
| parent | 7f5f5ff23e585cf74ba4abfc49d12f20bc3e2b77 (diff) | |
| download | pkgsrc-8930a996f5966ce6af535988c05a07af88731c4c.tar.gz | |
Make all packages that set OSVERSION_SPECIFIC depends on pkgtools/osabi.
Also include a note about changes to OS_VERSION in bsd.prefs.mk
| -rw-r--r-- | mk/bsd.pkg.mk | 3 | ||||
| -rw-r--r-- | mk/bsd.prefs.mk | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index a2aa4940b05..ea6cc10cfea 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.1966 2010/02/23 17:24:55 joerg Exp $ +# $NetBSD: bsd.pkg.mk,v 1.1967 2010/04/30 03:29:55 sbd Exp $ # # This file is in the public domain. # @@ -516,6 +516,7 @@ _BUILD_DEFS+= NO_BIN_ON_FTP NO_BIN_ON_CDROM .if defined(OSVERSION_SPECIFIC) _BUILD_DEFS+= OSVERSION_SPECIFIC +DEPENDS+= osabi-${OPSYS}=${OS_VERSION}:../../pkgtools/osabi .endif # OSVERSION_SPECIFIC .PHONY: all diff --git a/mk/bsd.prefs.mk b/mk/bsd.prefs.mk index 0760ac2d8c7..71eb919a6fb 100644 --- a/mk/bsd.prefs.mk +++ b/mk/bsd.prefs.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.prefs.mk,v 1.308 2010/04/18 21:51:49 sbd Exp $ +# $NetBSD: bsd.prefs.mk,v 1.309 2010/04/30 03:29:55 sbd Exp $ # # This file includes the mk.conf file, which contains the user settings. # @@ -97,6 +97,8 @@ GNU_ARCH.sh3el?= shle NATIVE_MACHINE_GNU_ARCH?= ${GNU_ARCH.${NATIVE_MACHINE_ARCH}:U${NATIVE_MACHINE_ARCH}} MACHINE_GNU_ARCH?= ${GNU_ARCH.${MACHINE_ARCH}:U${MACHINE_ARCH}} +## If changes are made to how OS_VERSION is set below please keep +## "pkgsrc/pkgtools/osabi/INSTALL" in-sync. .if ${OPSYS} == "NetBSD" LOWER_OPSYS?= netbsd |