From owner-svn-ports-all@freebsd.org Thu Sep 8 21:34:49 2016 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id E6ACEBD266E; Thu, 8 Sep 2016 21:34:49 +0000 (UTC) (envelope-from bapt@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 mx1.freebsd.org (Postfix) with ESMTPS id AAA3CE9; Thu, 8 Sep 2016 21:34:49 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u88LYmos036198; Thu, 8 Sep 2016 21:34:48 GMT (envelope-from bapt@FreeBSD.org) Received: (from bapt@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u88LYmL9036197; Thu, 8 Sep 2016 21:34:48 GMT (envelope-from bapt@FreeBSD.org) Message-Id: <201609082134.u88LYmL9036197@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bapt set sender to bapt@FreeBSD.org using -f From: Baptiste Daroussin Date: Thu, 8 Sep 2016 21:34:48 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r421583 - head/Mk X-SVN-Group: ports-head 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.23 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: Thu, 08 Sep 2016 21:34:50 -0000 Author: bapt Date: Thu Sep 8 21:34:48 2016 New Revision: 421583 URL: https://svnweb.freebsd.org/changeset/ports/421583 Log: Rework the cross build framework so that it uses the external toolchain It allows to cross build everything wich is not expecting target dependencies Modified: head/Mk/bsd.port.mk Modified: head/Mk/bsd.port.mk ============================================================================== --- head/Mk/bsd.port.mk Thu Sep 8 21:04:00 2016 (r421582) +++ head/Mk/bsd.port.mk Thu Sep 8 21:34:48 2016 (r421583) @@ -1052,24 +1052,28 @@ MINIMAL_PKG_VERSION= 1.6.0 .include "${PORTSDIR}/Mk/bsd.commands.mk" -.if defined(X_BUILD_FOR) +.if defined(CROSS_TOOLCHAIN) .if !defined(.PARSEDIR) IGNORE= Cross building can only be done when using bmake(1) as make(1) .endif +.if !defined(CROSS_SYSROOT) +IGNORE= CROSS_SYSROOT should be defined +.endif +.include "${LOCALBASE}/share/toolchains/${CROSS_TOOLCHAIN}.mk" # Do not define CPP on purpose .if !defined(HOSTCC) HOSTCC:= ${CC} HOSTCXX:= ${CXX} .endif -.if !exists(/usr/${X_BUILD_FOR}/usr/bin/cc) -X_SYSROOT= ${LOCALBASE}/${X_BUILD_FOR} -.else -X_SYSROOT= /usr/${X_BUILD_FOR} -.endif -CC= ${X_SYSROOT}/usr/bin/cc -CXX= ${X_SYSROOT}/usr/bin/c++ -NM= ${X_BUILD_FOR}-nm -STRIP_CMD= ${X_BUILD_FOR}-strip +CC= ${XCC} +CXX= ${XCXX} +CFLAGS+= --sysroot=${CROSS_SYSROOT} -isystem ${CROSS_SYSROOT}/usr/include +CXXFLAGS+= --sysroot=${CROSS_SYSROOT} -isystem ${CROSS_SYSROOT}/usr/include/c++/v1 -nostdinc++ +LDFLAGS+= --sysroot=${CROSS_SYSROOT} +.for _tool in AS AR LD NM OBJCOPY RANLIB SIZE STRINGS +${_tool}= ${CROSS_BINUTILS_PREFIX}${tool:tl} +.endfor +STRIP_CMD= ${CROSS_BINUTILS_PREFIX}strip # only bmake support the below STRIPBIN= ${STRIP_CMD} .export.env STRIPBIN @@ -1517,13 +1521,12 @@ CO_ENV+= STAGEDIR=${STAGEDIR} \ PORT_OPTIONS="${PORT_OPTIONS}" \ PORTSDIR="${PORTSDIR}" -.if defined(X_BUILD_FOR) -BUILD_DEPENDS+= ${X_BUILD_FOR}-cc:devel/${X_BUILD_FOR}-xdev -PKG_ENV+= ABI_FILE=${X_SYSROOT}/usr/lib/crt1.o +.if defined(CROSS_SYSROOT) +PKG_ENV+= ABI_FILE=${CROSS_SYSROOT}/bin/sh MAKE_ENV+= NM=${NM} \ - STRIPBIN=${X_BUILD_FOR}-strip \ - PKG_CONFIG_SYSROOT_DIR="${X_SYSROOT}" -CONFIGURE_ENV+= PKG_CONFIG_SYSROOT_DIR="${X_SYSROOT}" + STRIPBIN=${STRIPBIN} \ + PKG_CONFIG_SYSROOT_DIR="${CROSS_SYSROOT}" +CONFIGURE_ENV+= PKG_CONFIG_SYSROOT_DIR="${CROSS_SYSROOT}" .endif WRKDIR?= ${WRKDIRPREFIX}${.CURDIR}/work @@ -2488,8 +2491,9 @@ GNU_CONFIGURE_PREFIX?= ${PREFIX} GNU_CONFIGURE_MANPREFIX?= ${MANPREFIX} CONFIG_SITE?= ${PORTSDIR}/Templates/config.site CONFIGURE_ARGS+= --prefix=${GNU_CONFIGURE_PREFIX} $${_LATE_CONFIGURE_ARGS} -.if defined(X_BUILD_FOR) -CONFIGURE_ARGS+= --host=${X_BUILD_FOR} +.if defined(CROSS_TOOLCHAIN) +CROSS_HOST= ${CROSS_TOOLCHAIN:C,-.*$,,}-${OPSYS:tl} +CONFIGURE_ARGS+= --host=${CROSS_HOST} .endif CONFIGURE_ENV+= CONFIG_SITE=${CONFIG_SITE} lt_cv_sys_max_cmd_len=${CONFIGURE_MAX_CMD_LEN} HAS_CONFIGURE= yes