diff options
| author | bdrewery <bdrewery@FreeBSD.org> | 2015-10-13 06:44:19 +0800 |
|---|---|---|
| committer | bdrewery <bdrewery@FreeBSD.org> | 2015-10-13 06:44:19 +0800 |
| commit | 705e67da5faecb26d4e247c0b2155c8cd017d564 (patch) | |
| tree | a297183dfe4e2a74de4703d0bca86644f19f4e74 /Mk | |
| parent | 0d5d070e4a6baa88e30a7f7c161303304e529d05 (diff) | |
| download | freebsd-ports-gnome-705e67da5faecb26d4e247c0b2155c8cd017d564.tar.gz freebsd-ports-gnome-705e67da5faecb26d4e247c0b2155c8cd017d564.tar.zst freebsd-ports-gnome-705e67da5faecb26d4e247c0b2155c8cd017d564.zip | |
Name the 'uname -r' variable the same as the bsd.port.subdir.mk version, _OSRELEASE.
This will allow passing in the environment consistently from calling script
to avoid looking it up if.
With hat: portmgr
Diffstat (limited to 'Mk')
| -rw-r--r-- | Mk/bsd.port.mk | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk index c5eb49438721..0c9ca4d75b9a 100644 --- a/Mk/bsd.port.mk +++ b/Mk/bsd.port.mk @@ -1174,13 +1174,13 @@ OPSYS!= ${UNAME} -s .endif _EXPORTED_VARS+= OPSYS -.if !defined(UNAMER) -UNAMER!= ${UNAME} -r +.if !defined(_OSRELEASE) +_OSRELEASE!= ${UNAME} -r .endif -_EXPORTED_VARS+= UNAMER +_EXPORTED_VARS+= _OSRELEASE # Get the operating system revision -OSREL?= ${UNAMER:C/-.*//} +OSREL?= ${_OSRELEASE:C/-.*//} _EXPORTED_VARS+= OSREL # Get __FreeBSD_version @@ -1200,8 +1200,8 @@ _OSVERSION_MAJOR= ${OSVERSION:C/([0-9]?[0-9])([0-9][0-9])[0-9]{3}/\1/} # Sanity checks for chroot/jail building. # Skip if OSVERSION specified on cmdline for testing. Only works for bmake. .if !defined(.MAKEOVERRIDES) || !${.MAKEOVERRIDES:MOSVERSION} -.if ${_OSVERSION_MAJOR} != ${UNAMER:R} -.error UNAME_r (${UNAMER}) and OSVERSION (${OSVERSION}) do not agree on major version number. +.if ${_OSVERSION_MAJOR} != ${_OSRELEASE:R} +.error UNAME_r (${_OSRELEASE}) and OSVERSION (${OSVERSION}) do not agree on major version number. .elif ${_OSVERSION_MAJOR} != ${OSREL:R} .error OSREL (${OSREL}) and OSVERSION (${OSVERSION}) do not agree on major version number. .endif |