From owner-svn-ports-all@freebsd.org Wed Jun 20 17:42:36 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id E89221000503; Wed, 20 Jun 2018 17:42:35 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 983EB87494; Wed, 20 Jun 2018 17:42:35 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 7986B25811; Wed, 20 Jun 2018 17:42:35 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w5KHgZNq000352; Wed, 20 Jun 2018 17:42:35 GMT (envelope-from jhb@FreeBSD.org) Received: (from jhb@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w5KHgZiD000351; Wed, 20 Jun 2018 17:42:35 GMT (envelope-from jhb@FreeBSD.org) Message-Id: <201806201742.w5KHgZiD000351@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jhb set sender to jhb@FreeBSD.org using -f From: John Baldwin Date: Wed, 20 Jun 2018 17:42:35 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r472890 - head/Mk X-SVN-Group: ports-head X-SVN-Commit-Author: jhb X-SVN-Commit-Paths: head/Mk X-SVN-Commit-Revision: 472890 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 20 Jun 2018 17:42:36 -0000 Author: jhb (src,doc committer) Date: Wed Jun 20 17:42:35 2018 New Revision: 472890 URL: https://svnweb.freebsd.org/changeset/ports/472890 Log: Set OS versions to target system versions for CROSS_SYSROOT. When cross-building a package via a CROSS_SYSROOT, set OSVERSION, _OSRELEASE, and OSREL to the target OS version. OSVERSION is derived from the header in the sysroot. _OSRELEASE cannot be easily derived from a sysroot as it is a property of a kernel, so instead generate a "fake" _OSRELEASE from the OSVERSION, but use a "-CROSS" branch name that will hopefully fail in any places that make assumptions about branch names. Approved by: portmgr (bapt) Differential Revision: https://reviews.freebsd.org/D15812 Modified: head/Mk/bsd.port.mk Modified: head/Mk/bsd.port.mk ============================================================================== --- head/Mk/bsd.port.mk Wed Jun 20 17:31:27 2018 (r472889) +++ head/Mk/bsd.port.mk Wed Jun 20 17:42:35 2018 (r472890) @@ -1148,6 +1148,15 @@ ARCH= ${CROSS_TOOLCHAIN:C,-.*$,,} .endif _EXPORTED_VARS+= ARCH +# Get operating system versions for a cross build +.if defined(CROSS_SYSROOT) +.if !exists(${CROSS_SYSROOT}/usr/include/sys/param.h) +.error CROSS_SYSROOT does not include /usr/include/sys/param.h. +.endif +OSVERSION!= ${AWK} '/^\#define[[:blank:]]__FreeBSD_version/ {print $$3}' < ${CROSS_SYSROOT}/usr/include/sys/param.h +_OSRELEASE!= ${AWK} -v version=${OSVERSION} 'END { printf("%d.%d-CROSS", version / 100000, version / 1000 % 100) }' < /dev/null +.endif + # Get the operating system type .if !defined(OPSYS) OPSYS!= ${UNAME} -s