pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/mk Add core of the infrastructure support for cross-co...
details: https://anonhg.NetBSD.org/pkgsrc/rev/509d2a543f3a
branches: trunk
changeset: 531603:509d2a543f3a
user: joerg <joerg%pkgsrc.org@localhost>
date: Thu Aug 02 18:19:31 2007 +0000
description:
Add core of the infrastructure support for cross-compilation.
- USE_CROSS_COMPILATION activates it, CROSS_DESTDIR specifies root of
the target filesystem
- derive _CROSS_DESTDIR from CROSS_DESTDIR or MAKEOBJDIR
- buildlink3.mk prefixes the files to symlink with _CROSS_DESTDIR
- compiler/gcc.mk knows about the target prefix (e.g. i386--netbsdelf)
- PKG_DBDIR is prefixed with _CROSS_DESTDIR
- package-install and bin-install are not called with su
- install and strip are redirected to the tool version
- links for the target specific ar, as, ld, nm, objdump, ranlib and
strip are added
- compiler wrapper detect if linking is requested or not
- special command sinks for CPP and CC/CXX add the cross-compile magic:
- modify include dirs to get the target /usr/include
- modify linker dirs and runpath to use target /usr/lib at link time,
but keep correct rpath entries
Supported-by: Google SoC 2007
Basic tests by he@ on Sparc. Review from jlam@.
diffstat:
mk/bsd.prefs.mk | 24 +++++++++-
mk/buildlink3/bsd.buildlink3.mk | 4 +-
mk/compiler/gcc.mk | 31 +++++++-----
mk/flavor/pkg/flavor-vars.mk | 6 +-
mk/flavor/pkg/package.mk | 14 +++++-
mk/install/bin-install.mk | 6 ++-
mk/tools/tools.NetBSD.mk | 23 +++++++++-
mk/wrapper/arg-source | 10 +++-
mk/wrapper/bsd.wrapper.mk | 23 +++++++++-
mk/wrapper/cmd-sink-cross-cpp | 50 +++++++++++++++++++++
mk/wrapper/cmd-sink-cross-gcc | 96 +++++++++++++++++++++++++++++++++++++++++
11 files changed, 262 insertions(+), 25 deletions(-)
diffs (truncated from 463 to 300 lines):
diff -r 1b8935ec670f -r 509d2a543f3a mk/bsd.prefs.mk
--- a/mk/bsd.prefs.mk Thu Aug 02 18:04:48 2007 +0000
+++ b/mk/bsd.prefs.mk Thu Aug 02 18:19:31 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.prefs.mk,v 1.260 2007/08/01 16:14:17 joerg Exp $
+# $NetBSD: bsd.prefs.mk,v 1.261 2007/08/02 18:19:31 joerg Exp $
#
# Make file, included to get the site preferences, if any. Should
# only be included by package Makefiles before any .if defined()
@@ -399,6 +399,28 @@
_MAKE_PACKAGE_AS_ROOT?= yes
# Whether to run the package target as root.
+# When cross-compilation support is requested, the following options
+# must be specified as well or guessable:
+# - MACHINE_ARCH is set to TARGET_ARCH if set.
+# - CROSS_DESTDIR is guessed from MAKEOBJDIR and MACHINE_ARCH.
+# - PKG_DBDIR is expanded and prefixed with CROSS_DESTDIR
+# - DESTDIR support is required
+#
+# _CROSS_DESTDIR is set for internal use to avoid conditionalising
+# the use.
+
+.if !empty(USE_CROSS_COMPILE:M[yY][eE][sS])
+. if defined(TARGET_ARCH)
+MACHINE_ARCH= ${TARGET_ARCH}
+. endif
+CROSS_DESTDIR?= ${MAKEOBJDIR}/destdir.${MACHINE_ARCH}
+. if !exists(${CROSS_DESTDIR}/usr/include/stddef.h)
+PKG_FAIL_REASON+= "The cross-compiling root ${CROSS_DESTDIR:Q} is incomplete"
+. else
+_CROSS_DESTDIR= ${CROSS_DESTDIR}
+. endif
+.endif
+
PKG_INSTALLATION_TYPES?= overwrite
# This is a whitespace-separated list of installation types supported
# by the package.
diff -r 1b8935ec670f -r 509d2a543f3a mk/buildlink3/bsd.buildlink3.mk
--- a/mk/buildlink3/bsd.buildlink3.mk Thu Aug 02 18:04:48 2007 +0000
+++ b/mk/buildlink3/bsd.buildlink3.mk Thu Aug 02 18:19:31 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.buildlink3.mk,v 1.196 2007/07/27 13:15:41 joerg Exp $
+# $NetBSD: bsd.buildlink3.mk,v 1.197 2007/08/02 18:19:31 joerg Exp $
#
# Copyright (c) 2004 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -600,7 +600,7 @@
cd ${BUILDLINK_PREFIX.${_pkg_}}; \
${_BLNK_FILES_CMD.${_pkg_}} | \
while read file; do \
- src="${BUILDLINK_PREFIX.${_pkg_}}/$$file"; \
+ src="${_CROSS_DESTDIR}${BUILDLINK_PREFIX.${_pkg_}}/$$file"; \
if [ ! -f "$$src" ]; then \
msg="$$src: not found"; \
else \
diff -r 1b8935ec670f -r 509d2a543f3a mk/compiler/gcc.mk
--- a/mk/compiler/gcc.mk Thu Aug 02 18:04:48 2007 +0000
+++ b/mk/compiler/gcc.mk Thu Aug 02 18:19:31 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: gcc.mk,v 1.90 2007/02/10 08:59:07 rillig Exp $
+# $NetBSD: gcc.mk,v 1.91 2007/08/02 18:19:32 joerg Exp $
#
# This is the compiler definition for the GNU Compiler Collection.
#
@@ -353,33 +353,36 @@
.elif !empty(_IS_BUILTIN_GCC:M[yY][eE][sS])
_GCCBINDIR= ${_CC:H}
.endif
-.if exists(${_GCCBINDIR}/gcc)
+.if !empty(USE_CROSS_COMPILE:M[yY][eE][sS])
+_GCC_BIN_PREFIX= ${MACHINE_GNU_PLATFORM}-
+.endif
+.if exists(${_GCCBINDIR}/${_GCC_BIN_PREFIX}gcc)
_GCC_VARS+= CC
-_GCC_CC= ${_GCC_DIR}/bin/gcc
+_GCC_CC= ${_GCC_DIR}/bin/${_GCC_BIN_PREFIX}gcc
_ALIASES.CC= cc gcc
-CCPATH= ${_GCCBINDIR}/gcc
+CCPATH= ${_GCCBINDIR}/${_GCC_BIN_PREFIX}gcc
PKG_CC:= ${_GCC_CC}
.endif
-.if exists(${_GCCBINDIR}/cpp)
+.if exists(${_GCCBINDIR}/${_GCC_BIN_PREFIX}cpp)
_GCC_VARS+= CPP
-_GCC_CPP= ${_GCC_DIR}/bin/cpp
+_GCC_CPP= ${_GCC_DIR}/bin/${_GCC_BIN_PREFIX}cpp
_ALIASES.CPP= cpp
-CPPPATH= ${_GCCBINDIR}/cpp
+CPPPATH= ${_GCCBINDIR}/${_GCC_BIN_PREFIX}cpp
PKG_CPP:= ${_GCC_CPP}
.endif
-.if exists(${_GCCBINDIR}/g++)
+.if exists(${_GCCBINDIR}/${_GCC_BIN_PREFIX}g++)
_GCC_VARS+= CXX
-_GCC_CXX= ${_GCC_DIR}/bin/g++
+_GCC_CXX= ${_GCC_DIR}/bin/${_GCC_BIN_PREFIX}g++
_ALIASES.CXX= c++ g++
-CXXPATH= ${_GCCBINDIR}/g++
+CXXPATH= ${_GCCBINDIR}/${_GCC_BIN_PREFIX}g++
PKG_CXX:= ${_GCC_CXX}
.endif
-.if exists(${_GCCBINDIR}/g77)
+.if exists(${_GCCBINDIR}/${_GCC_BIN_PREFIX}g77)
_GCC_VARS+= FC
-_GCC_FC= ${_GCC_DIR}/bin/g77
+_GCC_FC= ${_GCC_DIR}/bin/${_GCC_BIN_PREFIX}g77
_ALIASES.FC= f77 g77
-FCPATH= ${_GCCBINDIR}/g77
-F77PATH= ${_GCCBINDIR}/g77
+FCPATH= ${_GCCBINDIR}/${_GCC_BIN_PREFIX}g77
+F77PATH= ${_GCCBINDIR}/${_GCC_BIN_PREFIX}g77
PKG_FC:= ${_GCC_FC}
.endif
_COMPILER_STRIP_VARS+= ${_GCC_VARS}
diff -r 1b8935ec670f -r 509d2a543f3a mk/flavor/pkg/flavor-vars.mk
--- a/mk/flavor/pkg/flavor-vars.mk Thu Aug 02 18:04:48 2007 +0000
+++ b/mk/flavor/pkg/flavor-vars.mk Thu Aug 02 18:19:31 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: flavor-vars.mk,v 1.3 2007/01/05 17:54:02 rillig Exp $
+# $NetBSD: flavor-vars.mk,v 1.4 2007/08/02 18:19:32 joerg Exp $
#
# This Makefile fragment is included indirectly by bsd.prefs.mk and
# defines some variables which must be defined earlier than where
@@ -22,9 +22,9 @@
# packages.
#
.if ${PKG_INSTALLATION_TYPE} == "overwrite"
-_PKG_DBDIR= ${PKG_DBDIR}
+_PKG_DBDIR= ${_CROSS_DESTDIR}${PKG_DBDIR}
.elif ${PKG_INSTALLATION_TYPE} == "pkgviews"
-_PKG_DBDIR= ${DEPOTBASE}
+_PKG_DBDIR= ${_CROSS_DESTDIR}${DEPOTBASE}
.endif
PKG_ADD_CMD?= ${PKG_TOOLS_BIN}/pkg_add
diff -r 1b8935ec670f -r 509d2a543f3a mk/flavor/pkg/package.mk
--- a/mk/flavor/pkg/package.mk Thu Aug 02 18:04:48 2007 +0000
+++ b/mk/flavor/pkg/package.mk Thu Aug 02 18:19:31 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: package.mk,v 1.7 2007/07/13 14:42:53 joerg Exp $
+# $NetBSD: package.mk,v 1.8 2007/08/02 18:19:32 joerg Exp $
PKG_SUFX?= .tgz
PKGFILE?= ${PKGREPOSITORY}/${PKGNAME}${PKG_SUFX}
@@ -128,7 +128,11 @@
.endif
.if ${_USE_DESTDIR} != "no"
+. if !empty(USE_CROSS_COMPILE:M[yY][eE][sS])
+real-package-install: su-real-package-install
+. else
real-package-install: su-target
+. endif
.else
real-package-install:
@${DO_NADA}
@@ -136,4 +140,12 @@
su-real-package-install:
@${PHASE_MSG} "Install binary package of "${PKGNAME:Q}
+.if !empty(USE_CROSS_COMPILE:M[yY][eE][sS])
+ @${MKDIR} ${_CROSS_DESTDIR}${PREFIX}
+ ${PKG_ADD} -f -I -p ${_CROSS_DESTDIR}${PREFIX} ${PKGFILE}
+ @${ECHO} "Fixing recorded cwd..."
+ @${SED} -e 's|@cwd ${_CROSS_DESTDIR}|@cwd |' ${_PKG_DBDIR}/${PKGNAME:Q}/+CONTENTS > ${_PKG_DBDIR}/${PKGNAME:Q}/+CONTENTS.tmp
+ @${MV} ${_PKG_DBDIR}/${PKGNAME:Q}/+CONTENTS.tmp ${_PKG_DBDIR}/${PKGNAME:Q}/+CONTENTS
+.else
${PKG_ADD} ${PKGFILE}
+.endif
diff -r 1b8935ec670f -r 509d2a543f3a mk/install/bin-install.mk
--- a/mk/install/bin-install.mk Thu Aug 02 18:04:48 2007 +0000
+++ b/mk/install/bin-install.mk Thu Aug 02 18:19:31 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bin-install.mk,v 1.9 2007/03/09 03:28:58 rillig Exp $
+# $NetBSD: bin-install.mk,v 1.10 2007/08/02 18:19:32 joerg Exp $
#
# This file provides the following targets:
@@ -36,7 +36,11 @@
do-bin-install \
do-bin-install-from-source
+. if !empty(USE_CROSS_COMPILE:M[yY][eE][sS])
+do-bin-install: su-do-bin-install
+. else
do-bin-install: su-target
+. endif
@${PHASE_MSG} "Binary install for "${PKGNAME_REQD:U${PKGNAME}:Q}
su-do-bin-install: \
diff -r 1b8935ec670f -r 509d2a543f3a mk/tools/tools.NetBSD.mk
--- a/mk/tools/tools.NetBSD.mk Thu Aug 02 18:04:48 2007 +0000
+++ b/mk/tools/tools.NetBSD.mk Thu Aug 02 18:19:31 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: tools.NetBSD.mk,v 1.35 2007/06/19 17:01:13 joerg Exp $
+# $NetBSD: tools.NetBSD.mk,v 1.36 2007/08/02 18:19:32 joerg Exp $
#
# System-supplied tools for the NetBSD operating system.
@@ -45,7 +45,11 @@
TOOLS_PLATFORM.hostname?= /bin/hostname
TOOLS_PLATFORM.id?= /usr/bin/id
TOOLS_PLATFORM.ident?= /usr/bin/ident
+.if empty(USE_CROSS_COMPILE:M[yY][eE][sS])
TOOLS_PLATFORM.install?= /usr/bin/install
+.else
+TOOLS_PLATFORM.install?= ${TOOLDIR}/bin/${MACHINE_GNU_PLATFORM}-install
+.endif
.if exists(/usr/bin/install-info)
TOOLS_PLATFORM.install-info?= /usr/bin/install-info
.endif
@@ -84,7 +88,12 @@
TOOLS_PLATFORM.sleep?= /bin/sleep
TOOLS_PLATFORM.soelim?= /usr/bin/soelim
TOOLS_PLATFORM.sort?= /usr/bin/sort
+.if empty(USE_CROSS_COMPILE:M[yY][eE][sS])
TOOLS_PLATFORM.strip?= /usr/bin/strip
+.else
+TOOLS_PLATFORM.strip?= ${TOOLDIR}/bin/${MACHINE_GNU_PLATFORM}-strip
+.endif
+
TOOLS_PLATFORM.tail?= /usr/bin/tail
.if exists(/bin/tar)
TOOLS_PLATFORM.tar?= /bin/tar
@@ -104,3 +113,15 @@
TOOLS_PLATFORM.xgettext?= /usr/bin/xgettext
.endif
TOOLS_PLATFORM.yacc?= /usr/bin/yacc
+
+.if !empty(USE_CROSS_COMPILE:M[yY][eE][sS])
+.for _t_ in ar as ld nm objdump ranlib strip
+TOOLS_PATH.${MACHINE_GNU_PLATFORM}-${_t_}?= \
+ ${TOOLDIR}/bin/${MACHINE_GNU_PLATFORM}-${_t_}
+TOOLS_CREATE+= ${MACHINE_GNU_PLATFORM}-${_t_}
+.endfor
+
+NATIVE_CC:= /usr/bin/cc
+CC= ${TOOLDIR}/bin/${MACHINE_GNU_PLATFORM}-gcc
+
+.endif
diff -r 1b8935ec670f -r 509d2a543f3a mk/wrapper/arg-source
--- a/mk/wrapper/arg-source Thu Aug 02 18:04:48 2007 +0000
+++ b/mk/wrapper/arg-source Thu Aug 02 18:19:31 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: arg-source,v 1.12 2007/02/23 00:31:29 rillig Exp $
+# $NetBSD: arg-source,v 1.13 2007/08/02 18:19:32 joerg Exp $
#
# Copyright (c) 2004 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -160,6 +160,14 @@
esac
;;
##############################################################
+ # Remember whether running the linker is desired.
+ ##############################################################
+ -c|-S|-E)
+ dont_link=yes
+ append_queue argbuf "$arg"
+ $debug_log $wrapperlog " (arg-source) push: $arg"
+ ;;
+ ##############################################################
# For everything else, just queue it up.
##############################################################
*)
diff -r 1b8935ec670f -r 509d2a543f3a mk/wrapper/bsd.wrapper.mk
--- a/mk/wrapper/bsd.wrapper.mk Thu Aug 02 18:04:48 2007 +0000
+++ b/mk/wrapper/bsd.wrapper.mk Thu Aug 02 18:19:31 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.wrapper.mk,v 1.70 2007/06/18 07:33:34 rillig Exp $
+# $NetBSD: bsd.wrapper.mk,v 1.71 2007/08/02 18:19:32 joerg Exp $
#
# Copyright (c) 2005 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -349,6 +349,12 @@
_WRAP_TRANSFORM.CXX= ${_WRAP_TRANSFORM.CC}
.endif
+.if !empty(USE_CROSS_COMPILE:M[yY][eE][sS])
+_WRAP_CMD_SINK.CC= ${WRAPPER_TMPDIR}/cmd-sink-cross-gcc
+_WRAP_CMD_SINK.CPP= ${WRAPPER_TMPDIR}/cmd-sink-cross-cpp
+_WRAP_CMD_SINK.CXX= ${_WRAP_CMD_SINK.CC}
+.endif
+
.if ${OPSYS} == "SunOS" && !empty(PKGSRC_COMPILER:Mgcc)
_WRAP_CMD_SINK.IMAKE= ${WRAPPER_TMPDIR}/cmd-sink-solaris-imake
_WRAP_CACHE_BODY.IMAKE= ${WRAPPER_TMPDIR}/cache-body-solaris-imake
@@ -512,6 +518,21 @@
${RUN} ${CAT} ${.ALLSRC} | ${_WRAP_SH_CRUNCH_FILTER} > ${.TARGET}
.endfor
+.if !empty(USE_CROSS_COMPILE:M[yY][eE][sS])
+_WRAP_CROSS_GCC_FILTER+= ${SED} \
+ -e "s|@CROSS_DESTDIR@|${_CROSS_DESTDIR:Q}|g" \
+ -e "s|@PREFIX@|${PREFIX:Q}|g"
+${WRAPPER_TMPDIR}/cmd-sink-cross-gcc: ${WRAPPER_SRCDIR}/cmd-sink-cross-gcc
+ ${RUN} ${MKDIR} ${.TARGET:H}
+ ${RUN} ${CAT} ${.ALLSRC} | ${_WRAP_CROSS_GCC_FILTER} | \
+ ${_WRAP_SH_CRUNCH_FILTER} > ${.TARGET}
+
Home |
Main Index |
Thread Index |
Old Index