From owner-svn-ports-all@FreeBSD.ORG  Wed Jun 11 21:00:51 2014
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 8A81E232;
 Wed, 11 Jun 2014 21:00:51 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::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 782042564;
 Wed, 11 Jun 2014 21:00:51 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s5BL0pvm097620;
 Wed, 11 Jun 2014 21:00:51 GMT (envelope-from bapt@svn.freebsd.org)
Received: (from bapt@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s5BL0pE4097619;
 Wed, 11 Jun 2014 21:00:51 GMT (envelope-from bapt@svn.freebsd.org)
Message-Id: <201406112100.s5BL0pE4097619@svn.freebsd.org>
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Wed, 11 Jun 2014 21:00:51 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r357539 - 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.18
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 11 Jun 2014 21:00:51 -0000

Author: bapt
Date: Wed Jun 11 21:00:50 2014
New Revision: 357539
URL: http://svnweb.freebsd.org/changeset/ports/357539
QAT: https://qat.redports.org/buildarchive/r357539/

Log:
  Define X_SYSROOT to avoid duplicating code too much
  Define PKG_CONFIG_SYSROOT_DIR for cross building pkgconf files

Modified:
  head/Mk/bsd.port.mk

Modified: head/Mk/bsd.port.mk
==============================================================================
--- head/Mk/bsd.port.mk	Wed Jun 11 21:00:24 2014	(r357538)
+++ head/Mk/bsd.port.mk	Wed Jun 11 21:00:50 2014	(r357539)
@@ -1143,17 +1143,17 @@ HCC:=	${CC}
 HCXX:=	${CXX}
 .endif
 .if !exists(/usr/${X_BUILD_FOR}/usr/bin/cc)
-CC=		${LOCALBASE}/${X_BUILD_FOR}/usr/bin/cc
-CXX=		${LOCALBASE}/${X_BUILD_FOR}/usr/bin/c++
-PKG_ENV+=	ABI_FILE=${LOCALBASE}/${X_BUILD_FOR}/usr/lib/crt1.o
-.else
-CC=		/usr/${X_BUILD_FOR}/usr/bin/cc
-CXX=	/usr/${X_BUILD_FOR}/usr/bin/c++
-PKG_ENV+=	ABI_FILE=/usr/${X_BUILD_FOR}/usr/lib/crt1.o
+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++
+PKG_ENV+=	ABI_FILE=${X_SYSROOT}/usr/lib/crt1.o
 NM=		${X_BUILD_FOR}-nm
 STRIP_CMD=	${X_BUILD_FOR}-strip
-MAKE_ENV+=	NM=${NM} STRIPBIN=${X_BUILD_FOR}-strip
+MAKE_ENV+=	NM=${NM} STRIPBIN=${X_BUILD_FOR}-strip PKG_CONFIG_SYSROOT_DIR="${X_SYSROOT}"
+CONFIGURE_ENV+=	PKG_CONFIG_SYSROOT_DIR="${X_SYSROOT}"
 # only bmake support the below
 STRIPBIN=	${STRIP_CMD}
 .export.env STRIPBIN