Author: gjb
Date: Fri Oct 25 21:27:35 2013
New Revision: 257136
URL: http://svnweb.freebsd.org/changeset/base/257136
Log:
MFC r257079:
Fix build host pollution by avoiding calling 'uname -srp' to
determine values for 'VERSION'.
Approved by: re (glebius)
Modified:
stable/10/Makefile.inc1 (contents, props changed)
Modified: stable/10/Makefile.inc1
==============================================================================
--- stable/10/Makefile.inc1 Fri Oct 25 19:49:03 2013 (r257135)
+++ stable/10/Makefile.inc1 Fri Oct 25 21:27:35 2013 (r257136)
@@ -58,6 +58,7 @@
# use that new version. And the new (dynamically-linked) /bin/sh
# will expect to find appropriate libraries in /lib and /libexec.
#
+SRCDIR?= ${.CURDIR}
.if defined(SUBDIR_OVERRIDE)
SUBDIR= ${SUBDIR_OVERRIDE}
.else
@@ -128,8 +129,11 @@ OSRELDATE= 0
.endif
.if !defined(VERSION)
-VERSION!= uname -srp
-VERSION+= ${OSRELDATE}
+REVISION!= make -C ${SRCDIR}/release -V REVISION
+BRANCH!= make -C ${SRCDIR}/release -V BRANCH
+SRCRELDATE!= awk '/^\#define[[:space:]]*__FreeBSD_version/ { print $$3 }' \
+ ${SRCDIR}/sys/sys/param.h
+VERSION= FreeBSD ${REVISION}-${BRANCH} ${TARGET_ARCH} ${SRCRELDATE}
.endif
KNOWN_ARCHES?= amd64 arm armeb/arm armv6/arm i386 i386/pc98 ia64 mips
mipsel/mips mips64el/mips mips64/mips mipsn32el/mips mipsn32/mips powerpc
powerpc64/powerpc sparc64
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
