Build librt for multilib and the cross compiler too. Part of bug #475294.

Package-Manager: portage-2.2.0_alpha186/cvs/Linux x86_64
Manifest-Sign-Key: 0x160F534A

3 files changed, 623 insertions, 5 deletions

diff --git a/sys-freebsd/freebsd-lib/ChangeLog b/sys-freebsd/freebsd-lib/ChangeLog
index a49645ce0062..2655d1e29804 100644
--- a/sys-freebsd/freebsd-lib/ChangeLog
+++ b/sys-freebsd/freebsd-lib/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-freebsd/freebsd-lib
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog,v 1.189 2013/06/28 12:08:11 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog,v 1.190 2013/07/03 22:21:54 aballier Exp $
+
+*freebsd-lib-9.1-r10 (03 Jul 2013)
+
+  03 Jul 2013; Alexis Ballier <aballier@gentoo.org>
+  +freebsd-lib-9.1-r10.ebuild:
+  Build librt for multilib and the cross compiler too. Part of bug #475294.
 
   28 Jun 2013; Alexis Ballier <aballier@gentoo.org> freebsd-lib-9.1-r9.ebuild:
   fix cross compilation
diff --git a/sys-freebsd/freebsd-lib/Manifest b/sys-freebsd/freebsd-lib/Manifest
index 63b347994b57..8c03007cd482 100644
--- a/sys-freebsd/freebsd-lib/Manifest
+++ b/sys-freebsd/freebsd-lib/Manifest
@@ -61,6 +61,7 @@ DIST freebsd-usbin-9.1.tar.bz2 2670916 SHA256 b938c20b8c09aa9a610e13b69b9afeea72
 EBUILD freebsd-lib-8.2-r1.ebuild 15816 SHA256 0d7ffdafe52db8b8c0c13741d15cf5ef32d808179bcfd05915afc4b5557a618a SHA512 2623c08ceb9f09d655d742860ca66f26669fb4ac5674e2b36fbe5a737580a16f404ff5abacaa42dd61a5b104805b29cc83f5c37b17f6c94865772cae169dea3a WHIRLPOOL 9b5780f01ca7980b456449fd8bec36e681ee6fb491839d6b7d7655efe31b57c000214e031c389b58e465349a845846860a1d24e8104ea9692bea37a080d7f8af
 EBUILD freebsd-lib-9.0-r4.ebuild 17066 SHA256 3ee6dd5b4496d557c539778b65686da8bbcf88c34c7725227639254cbfc7152f SHA512 df5b7a8c1c344c4ef4eda924351659b98673bd11d18c33ecacacc467c42278abd88a1226c95b36775a1eb1136d69e4a89d906e9f5a4dd5c528c19cd248ccd35e WHIRLPOOL f5751e23801ac805b14d1f533e58b97711e83b0e18dd73feca2f028a5473d0c3a6161b7f04fb74c858761db44c68c2d9c3ff32688b6407cfd678c69bd3d0e121
 EBUILD freebsd-lib-9.1-r1.ebuild 17335 SHA256 396e2853987e3aa39f8801af12e6de67dfd217062d31cb60fd47819de9f77996 SHA512 7730158f90f200f69fca1d9d264aa0fdb46b5a2bea213d0874354119e5d73d68440952f835b378dc5f51c9d73b822fe2750bb985f8cb3d0e101b233b8aaf8596 WHIRLPOOL 188e4f88dbeaf5efec3f9e2a3eca5f2b05578aa2a850a37186cdc30fdf292135eded14c4388ae2241e1a698cc865756a5405ef0e3f85f5bb42e9ae63ac18e8a5
+EBUILD freebsd-lib-9.1-r10.ebuild 18641 SHA256 23697e71a1941c1cefc83bccc340c22f89c7bd0698cd3f3c1b090eba2be50d1b SHA512 dccba964413a5b1469434c88eb3598a789f31617a79990e6be8d4157093bf931a95305dbe4556d469e1a4afe20c225d006435057efc0c01011268e53898eaf3a WHIRLPOOL e15c1a7f65222b404027e9426f33951ae832420df22d2403f99508f7e6997a0ec5cbc3bf8a53bf061f65b6325b108d83c5f27df417421b195510960eabac3cf6
 EBUILD freebsd-lib-9.1-r2.ebuild 17387 SHA256 6661357f06fbd8215bc62a4420a2b60da5ed8066c8676f1a14c779fdf6ca25d6 SHA512 9ce63e97e40d329650a169c24aee82ee859e61156ddc71c4fbf0d2aac5c27282aab0ed40c29eab5dc2c8d2699281699c84a0bda35330e5379f464e396584a18d WHIRLPOOL 32e411dd4650824c2f6c1c9a46ee52493060329c78ea824bcfb755d9c9c005d1b96251bf68b0f6523e82cfa3828c281d3eaa373a61e972cbff1d34cfeed2cac8
 EBUILD freebsd-lib-9.1-r3.ebuild 17423 SHA256 9a98a6ef321f9bda23c0d44aa13a7cacd279efb8ae2a7555c4ba28a52c117385 SHA512 a50aec3cf5216e3379c2b80583a31e7d7d34b42c1e4cf10394a95356babf3690c2e197fff25ab952d8e7bfb2685d62aafaef204c3ba0c7109f866fdbf27bc58c WHIRLPOOL bd348807f8374e93af722aa2033cd9885c9019b311be1d1985a80bd8bfe82a26c779fe9a98d53569d9916347b5f2450740ba46cb5920bc8bda001422d5a35acb
 EBUILD freebsd-lib-9.1-r4.ebuild 18204 SHA256 2e9a27abe55de661e47c08996d77f00fff2a22e8e5fca52c45b2c0ddc210d97e SHA512 84b72cbb8731a955918600db96811b114d72ada2cae76f24982eda4ff2c25b50a55ebcad8460e16e2f2209f58f148e9b793e7c745816f196aa9df510a1a872fd WHIRLPOOL ee4c6c6925504b0b4e823faead07f0a95c939cda6874d2c9c5af02df1e1d997662c099901aa8991b1dc995dd15c87f1eae6e279ece0ac746621929180b80d19d
@@ -70,12 +71,12 @@ EBUILD freebsd-lib-9.1-r7.ebuild 18634 SHA256 c587fa2a4ad95f8534e04188bc8fc9d743
 EBUILD freebsd-lib-9.1-r8.ebuild 18279 SHA256 b5d2a8ed519e4b7fc89494796530e74e37250bef9b8bdd34ea5b04ef0942c917 SHA512 0155df73a36c8745f2fc153fcd94dc8a4a912f935b1df44e9392e9a30079cddc3ea6107ccf52fc36d84dddbc5a705b55972dbf44e0fff2098b46ba5d226ba587 WHIRLPOOL 8c26dc3b07ab3faacc4f9781a16c6f26a2647dfa9e2ba7b9b83933a2281d97df54ead875fc030b1a93e93f8c9476d5faa61cc336f766912158bc6cbecb209031
 EBUILD freebsd-lib-9.1-r9.ebuild 18365 SHA256 cc035d29bce7da4a7d8eb3eda56a8eb5f8327d8d2da5b963244975e070e3a677 SHA512 456beec1aad6e0045cc3f83b9f9d2f7aede22fdd6d494aad8c876b619307f84b2e4810a9ed5dc46fe598d8fa8b85b68e0a3531c88f5d0d671ee69a02a0f10739 WHIRLPOOL df116156a0fc3c47e7a49cdab73b2a94db1a7e329a5edf6511156e60c488c2cdded4b05bbf1fc59fa499b190cc94b46e1346c7b456af418d7a4a15608d290b1c
 EBUILD freebsd-lib-9.1.ebuild 17157 SHA256 b1a74967940cb0eb70c6965b3f2add374bc2155afd975c44a90cf65c744ea632 SHA512 ecfb6745880c47dc965363744869cb491f05d60c03463779eb250b3c71d443436dbdc03ae4ce741d8c99d57897a84561e09412d0f825cc9e552c4d17e5253c2d WHIRLPOOL a17b3b88765e62d1f415c41bd5f4e1f9c8349b29eac65e2e064d282ac3af33b5eea532c613fe25d1e6ad2e56ad82263be15128ba5eada42d95023869491c40da
-MISC ChangeLog 38915 SHA256 32df991d5690287eef0efabdcdd265f51e352c4498d86923c813a7cdd5150736 SHA512 2c520263f5c04dca17dac4b1a08b9ac0b1b1d4de62ee84cdb5b4b1317c633ae5f4bda9282aaf14f601bcd2a1dec0a642d0dd474e257b09b98ec318cfc768eea8 WHIRLPOOL 2f019570312dc06a7bac944e34ece8460e4c94e96a12545e253b4e2efc51ecd2241c0663b6027502185913d963b135594c7556fc4ec958573bb7636d999de879
+MISC ChangeLog 39111 SHA256 685615cae2811dd9fe432450a569534ae17664ea17355da1009832253970e9e7 SHA512 eebb3a5e1c10742019d217012e9608a9d4be0c5c35035bcb3fb143ef44a9b7afda3425fd83413023c215e77ed97d7a1ef077f3934becd887241db73495f789c1 WHIRLPOOL 1da508d6faf4f05e32e1d76edfcd2f2f821bae80a5d3aedfa19586d86035ef2b636e153f8878ccf7493cdb6a528d8be94b19c00672346bf8924b71e9fb14976f
 MISC metadata.xml 410 SHA256 0ea0a391db3018afdf230e293ffedbc313b4a20db703c8c83fdf144a28c6c246 SHA512 de2a427cd8fcc2c0d7c0a1821f4cc916a280d9c0e21d83fdb7c35d110b48e96854baffc7d469e3461c2a6ee81eaec14d105c45cafbd3aaa37100a525bc60b7af WHIRLPOOL 3b2f587e647dafdb68bdb147bb0d5fecea0e728b52eabb61deb2623641117be6ac0871405666d7616ae1d60eaacf0b621cba8175dca463e9344ad83a4daf5865
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iEYEAREIAAYFAlHNfKwACgkQvFcC4BYPU0qVJwCeNDRDn7NNQ8KOzMsDsbvh/Oac
-8+sAoM4RwtxC0r4noNh1VM0w/7Bpd1iL
-=2WWM
+iEYEAREIAAYFAlHUpAQACgkQvFcC4BYPU0qRSQCfZRQB06OHA104mxU94xhqSb5/
+aQIAn0Aa3brfOg7Te3T4OWLDpIs6layc
+=1XWr
 -----END PGP SIGNATURE-----
diff --git a/sys-freebsd/freebsd-lib/freebsd-lib-9.1-r10.ebuild b/sys-freebsd/freebsd-lib/freebsd-lib-9.1-r10.ebuild
new file mode 100644
index 000000000000..427fbe8fd8b2
--- /dev/null
+++ b/sys-freebsd/freebsd-lib/freebsd-lib-9.1-r10.ebuild
@@ -0,0 +1,611 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.1-r10.ebuild,v 1.1 2013/07/03 22:21:54 aballier Exp $
+
+EAPI=5
+
+inherit bsdmk freebsd flag-o-matic multilib toolchain-funcs eutils multibuild
+
+DESCRIPTION="FreeBSD's base system libraries"
+SLOT="0"
+KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+
+# Crypto is needed to have an internal OpenSSL header
+# sys is needed for libalias, probably we can just extract that instead of
+# extracting the whole tarball
+SRC_URI="mirror://gentoo/${LIB}.tar.bz2
+		mirror://gentoo/${CONTRIB}.tar.bz2
+		mirror://gentoo/${CRYPTO}.tar.bz2
+		mirror://gentoo/${LIBEXEC}.tar.bz2
+		mirror://gentoo/${ETC}.tar.bz2
+		mirror://gentoo/${INCLUDE}.tar.bz2
+		mirror://gentoo/${USBIN}.tar.bz2
+		mirror://gentoo/${GNU}.tar.bz2
+		build? (
+			mirror://gentoo/${SYS}.tar.bz2 )
+		zfs? (
+			mirror://gentoo/${CDDL}.tar.bz2 )"
+
+if [ "${CATEGORY#*cross-}" = "${CATEGORY}" ]; then
+	RDEPEND="ssl? ( dev-libs/openssl )
+		hesiod? ( net-dns/hesiod )
+		kerberos? ( app-crypt/heimdal )
+		usb? ( !dev-libs/libusb !dev-libs/libusbx )
+		zfs? ( =sys-freebsd/freebsd-cddl-${RV}* )
+		>=dev-libs/expat-2.0.1
+		!sys-libs/libutempter
+		!sys-freebsd/freebsd-headers"
+	DEPEND="${RDEPEND}
+		>=sys-devel/flex-2.5.31-r2
+		=sys-freebsd/freebsd-sources-${RV}*"
+else
+	SRC_URI="${SRC_URI}
+			mirror://gentoo/${SYS}.tar.bz2"
+fi
+
+DEPEND="${DEPEND}
+		userland_GNU? ( sys-apps/mtree )
+		=sys-freebsd/freebsd-mk-defs-${RV}*"
+
+S="${WORKDIR}/lib"
+
+export CTARGET=${CTARGET:-${CHOST}}
+if [ "${CTARGET}" = "${CHOST}" -a "${CATEGORY#*cross-}" != "${CATEGORY}" ]; then
+	export CTARGET=${CATEGORY/cross-}
+fi
+
+IUSE="atm bluetooth ssl hesiod ipv6 kerberos usb netware
+	build crosscompile_opts_headers-only zfs
+	userland_GNU userland_BSD multilib"
+
+pkg_setup() {
+	[ -c /dev/zero ] || \
+		die "You forgot to mount /dev; the compiled libc would break."
+
+	if ! use ssl && use kerberos; then
+		eerror "If you want kerberos support you need to enable ssl support, too."
+	fi
+
+	use atm || mymakeopts="${mymakeopts} WITHOUT_ATM= "
+	use bluetooth || mymakeopts="${mymakeopts} WITHOUT_BLUETOOTH= "
+	use hesiod || mymakeopts="${mymakeopts} WITHOUT_HESIOD= "
+	use ipv6 || mymakeopts="${mymakeopts} WITHOUT_INET6_SUPPORT= "
+	use kerberos || mymakeopts="${mymakeopts} WITHOUT_KERBEROS_SUPPORT= WITHOUT_GSSAPI= "
+	use netware || mymakeopts="${mymakeopts} WITHOUT_IPX= WITHOUT_IPX_SUPPORT= WITHOUT_NCP= "
+	use ssl || mymakeopts="${mymakeopts} WITHOUT_OPENSSL= "
+	use usb || mymakeopts="${mymakeopts} WITHOUT_USB= "
+	use zfs || mymakeopts="${mymakeopts} WITHOUT_CDDL= "
+
+	mymakeopts="${mymakeopts} WITHOUT_BIND= WITHOUT_BIND_LIBS= WITHOUT_SENDMAIL= WITHOUT_CLANG= "
+
+	if [ "${CTARGET}" != "${CHOST}" ]; then
+		mymakeopts="${mymakeopts} MACHINE=$(tc-arch-kernel ${CTARGET})"
+		mymakeopts="${mymakeopts} MACHINE_ARCH=$(tc-arch-kernel ${CTARGET})"
+	fi
+}
+
+PATCHES=(
+	"${FILESDIR}/${PN}-6.0-pmc.patch"
+	"${FILESDIR}/${PN}-6.0-flex-2.5.31.patch"
+	"${FILESDIR}/${PN}-6.1-csu.patch"
+	"${FILESDIR}/${PN}-9.0-liblink.patch"
+	"${FILESDIR}/${PN}-bsdxml2expat.patch"
+	"${FILESDIR}/${PN}-9.0-netware.patch"
+	"${FILESDIR}/${PN}-9.0-cve-2010-2632.patch"
+	"${FILESDIR}/${PN}-9.0-bluetooth.patch"
+	"${FILESDIR}/${PN}-9.1-.eh_frame_hdr-fix.patch"
+	)
+
+# Here we disable and remove source which we don't need or want
+# In order:
+# - ncurses stuff
+# - libexpat creates a bsdxml library which is the same as expat
+# - archiving libraries (have their own ebuild)
+# - sendmail libraries (they are installed by sendmail)
+# - SNMP library and dependency (have their own ebuilds)
+# - libstand: static library, 32bits on amd64 used for boot0, we build it from
+# boot0 instead.
+#
+# The rest are libraries we already have somewhere else because
+# they are contribution.
+# Note: libtelnet is an internal lib used by telnet and telnetd programs
+# as it's not used in freebsd-lib package itself, it's pointless building
+# it here.
+REMOVE_SUBDIRS="ncurses \
+	libexpat \
+	libz libbz2 libarchive liblzma \
+	libsm libsmdb libsmutil \
+	libbegemot libbsnmp \
+	libpam libpcap bind libwrap libmagic \
+	libcom_err libtelnet
+	libelf libedit
+	libstand
+	libgssapi"
+
+# For doing multilib over multibuild.eclass
+MULTIBUILD_VARIANTS=( $(get_all_abis) )
+
+# Are we building a cross-compiler?
+is_crosscompile() {
+	[ "${CATEGORY#*cross-}" != "${CATEGORY}" ]
+}
+
+src_prepare() {
+	sed -i.bak -e 's:-o/dev/stdout:-t:' "${S}/libc/net/Makefile.inc"
+
+	# Upstream Display Managers default to using VT7
+	# We should make FreeBSD allow this by default
+	local x=
+	for x in "${WORKDIR}"/etc/etc.*/ttys ; do
+		sed -i.bak \
+			-e '/ttyv5[[:space:]]/ a\
+# Display Managers default to VT7.\
+# If you use the xdm init script, keep ttyv6 commented out\
+# unless you force a different VT for the DM being used.' \
+			-e '/^ttyv[678][[:space:]]/ s/^/# /' "${x}" \
+			|| die "Failed to sed ${x}"
+		rm "${x}".bak
+	done
+
+	# This one is here because it also
+	# patches "${WORKDIR}/include"
+	cd "${WORKDIR}"
+	epatch "${FILESDIR}/${PN}-includes.patch"
+	epatch "${FILESDIR}/${PN}-8.0-gcc45.patch"
+	epatch "${FILESDIR}/${PN}-9.0-opieincludes.patch"
+	epatch "${FILESDIR}/${PN}-9.1-aligned_alloc.patch"
+	epatch "${FILESDIR}/${PN}-9.1-rmgssapi.patch"
+
+	# Don't install the hesiod man page or header
+	rm "${WORKDIR}"/include/hesiod.h || die
+	sed -i.bak -e 's:hesiod.h::' "${WORKDIR}"/include/Makefile || die
+	sed -i.bak -e 's:hesiod.c::' -e 's:hesiod.3::' \
+	"${WORKDIR}"/lib/libc/net/Makefile.inc || die
+
+	# Fix the Makefiles of these few libraries that will overwrite our LDADD.
+	cd "${S}"
+	for dir in libradius libtacplus libcam libdevstat libfetch libgeom libmemstat libopie \
+		libsmb libprocstat libulog; do sed -i.bak -e 's:LDADD=:LDADD+=:g' "${dir}/Makefile" || \
+		die "Problem fixing \"${dir}/Makefile"
+	done
+	# Call LD with LDFLAGS, rename them to RAW_LDFLAGS
+	sed -e 's/LDFLAGS/RAW_LDFLAGS/g' \
+		-i "${S}/csu/i386-elf/Makefile" \
+		-i "${S}/csu/ia64/Makefile" || die
+	if use build; then
+		cd "${WORKDIR}"
+		# This patch has to be applied on ${WORKDIR}/sys, so we do it here since it
+		# shouldn't be a symlink to /usr/src/sys (which should be already patched)
+		epatch "${FILESDIR}"/${PN}-7.1-types.h-fix.patch
+		epatch "${FILESDIR}"/freebsd-sources-9.0-sysctluint.patch
+		return 0
+	fi
+
+	if ! is_crosscompile ; then
+		ln -s "/usr/src/sys-${RV}" "${WORKDIR}/sys" || die "Couldn't make sys symlink!"
+	else
+		sed -i.bak -e "s:/usr/include:/usr/${CTARGET}/usr/include:g" \
+			"${S}/libc/rpc/Makefile.inc" \
+			"${S}/libc/yp/Makefile.inc"
+	fi
+
+	if install --version 2> /dev/null | grep -q GNU; then
+		sed -i.bak -e 's:${INSTALL} -C:${INSTALL}:' "${WORKDIR}/include/Makefile"
+	fi
+
+	# Try to fix sed calls for GNU sed. Do it only with GNU userland and force
+	# BSD's sed on BSD.
+	cd "${S}"
+	if use userland_GNU; then
+		find . -name Makefile -exec sed -ibak 's/sed -i /sed -i/' {} \;
+	fi
+}
+
+get_csudir() {
+	if [ -d "${WORKDIR}/lib/csu/$1-elf" ]; then
+		echo "lib/csu/$1-elf"
+	else
+		echo "lib/csu/$1"
+	fi
+}
+
+bootstrap_csu() {
+	local csudir="$(get_csudir $(tc-arch-kernel ${CTARGET}))"
+	export RAW_LDFLAGS=$(raw-ldflags)
+	cd "${WORKDIR}/${csudir}" || die "Missing ${csudir}."
+	freebsd_src_compile
+
+	CFLAGS="${CFLAGS} -B ${MAKEOBJDIRPREFIX}/${WORKDIR}/${csudir}"
+	append-ldflags "-B ${MAKEOBJDIRPREFIX}/${WORKDIR}/${csudir}"
+
+	cd "${WORKDIR}/gnu/lib/csu" || die
+	freebsd_src_compile
+	cd "${MAKEOBJDIRPREFIX}/${WORKDIR}/gnu/lib/csu"
+	for i in *.So ; do
+		ln -s $i ${i%.So}S.o
+	done
+	CFLAGS="${CFLAGS} -B ${MAKEOBJDIRPREFIX}/${WORKDIR}/gnu/lib/csu"
+	append-ldflags "-B ${MAKEOBJDIRPREFIX}/${WORKDIR}/gnu/lib/csu"
+}
+
+# Compile libssp_nonshared.a and add it's path to LDFLAGS.
+bootstrap_libssp_nonshared() {
+	cd "${WORKDIR}/gnu/lib/libssp/libssp_nonshared/" || die "missing libssp."
+	freebsd_src_compile
+	append-ldflags "-L${MAKEOBJDIRPREFIX}/${WORKDIR}/gnu/lib/libssp/libssp_nonshared/"
+	export LDADD="-lssp_nonshared"
+}
+
+bootstrap_libc() {
+	cd "${WORKDIR}/lib/libc" || die
+	freebsd_src_compile
+	append-ldflags "-L${MAKEOBJDIRPREFIX}/${WORKDIR}/lib/libc"
+}
+
+bootstrap_libgcc() {
+	cd "${WORKDIR}/lib/libcompiler_rt" || die
+	freebsd_src_compile
+	cd "${MAKEOBJDIRPREFIX}/${WORKDIR}/lib/libcompiler_rt" || die
+	ln -s libcompiler_rt.a libgcc.a || die
+	append-ldflags "-L${MAKEOBJDIRPREFIX}/${WORKDIR}/lib/libcompiler_rt"
+
+	bootstrap_libc
+
+	cd "${WORKDIR}/gnu/lib/libgcc" || die
+	freebsd_src_compile
+	append-ldflags "-L${MAKEOBJDIRPREFIX}/${WORKDIR}/gnu/lib/libgcc"
+}
+
+bootstrap_libthr() {
+	cd "${WORKDIR}/lib/libthr" || die
+	freebsd_src_compile
+	append-ldflags "-L${MAKEOBJDIRPREFIX}/${WORKDIR}/lib/libthr"
+	cd "${MAKEOBJDIRPREFIX}/${WORKDIR}/lib/libthr" || die
+	ln -s libthr.so libpthread.so
+}
+
+# What to build for a cross-compiler.
+# We also need the csu but this has to be handled separately.
+CROSS_SUBDIRS="lib/libc lib/msun gnu/lib/libssp/libssp_nonshared lib/libthr lib/libutil lib/librt"
+
+# What to build for non-default ABIs.
+NON_NATIVE_SUBDIRS="${CROSS_SUBDIRS} gnu/lib/csu lib/libcompiler_rt gnu/lib/libgcc lib/libmd lib/libcrypt"
+
+# Subdirs for a native build:
+NATIVE_SUBDIRS="lib gnu/lib/libssp/libssp_nonshared gnu/lib/libregex gnu/lib/csu gnu/lib/libgcc"
+
+# Is my $ABI native ?
+is_native_abi() {
+	is_crosscompile && return 1
+	use multilib || return 0
+	[ "${ABI}" = "${DEFAULT_ABI}" ]
+}
+
+# Do we need to bootstrap the csu and libssp_nonshared?
+need_bootstrap() {
+	is_crosscompile || use build || { ! is_native_abi && ! has_version '>=sys-freebsd/freebsd-lib-9.1-r8[multilib]' ; } || has_version "<${CATEGORY}/${P}"
+}
+
+# Get the subdirs we are building.
+get_subdirs() {
+	local ret=""
+	if is_native_abi ; then
+		# If we are building for the native ABI, build everything
+		ret="${NATIVE_SUBDIRS}"
+	elif is_crosscompile ; then
+		# With a cross-compiler we only build the very core parts.
+		ret="${CROSS_SUBDIRS}"
+		if [ "${EBUILD_PHASE}" = "install" ]; then
+			# Add the csu dir first when installing. We treat it separately for
+			# compiling.
+			ret="$(get_csudir $(tc-arch-kernel ${CTARGET})) ${ret}"
+		fi
+	else
+		# For the non-native ABIs we only build the csu parts and very core
+		# libraries for now.
+		ret="${NON_NATIVE_SUBDIRS} $(get_csudir $(tc-arch-kernel ${CHOST}))"
+	fi
+	echo "${ret}"
+}
+
+# Bootstrap the core libraries and setup the flags so that the other parts can
+# build against it.
+do_bootstrap() {
+	einfo "Bootstrapping on ${CHOST} for ${CTARGET}"
+	if ! is_crosscompile ; then
+		# Pre-install headers, but not when building a cross-compiler since we
+		# assume they have been installed in the previous pass.
+		einfo "Pre-installing includes in include_proper_${ABI}"
+		mkdir "${WORKDIR}/include_proper_${ABI}" || die
+		CTARGET="${CHOST}" install_includes "/include_proper_${ABI}"
+		CFLAGS="${CFLAGS} -isystem ${WORKDIR}/include_proper_${ABI}"
+	fi
+	bootstrap_csu
+	bootstrap_libssp_nonshared
+	is_crosscompile && bootstrap_libc
+	is_crosscompile || is_native_abi || bootstrap_libgcc
+	is_native_abi   || bootstrap_libthr
+}
+
+# Compile it. Assume we have the toolchain setup correctly.
+do_compile() {
+	# Bootstrap if needed, otherwise assume the system headers are in
+	# /usr/include.
+	if need_bootstrap ; then
+		do_bootstrap
+	else
+		CFLAGS="${CFLAGS} -isystem /usr/include"
+	fi
+
+	export RAW_LDFLAGS=$(raw-ldflags)
+
+	# Everything is now setup, build it!
+	for i in $(get_subdirs) ; do
+		einfo "Building in ${i}... with CC=${CC} and CFLAGS=${CFLAGS}"
+		cd "${WORKDIR}/${i}/" || die "missing ${i}."
+		freebsd_src_compile || die "make ${i} failed"
+	done
+}
+
+src_compile() {
+	# Does not work with GNU sed
+	# Force BSD's sed on BSD.
+	if use userland_BSD ; then
+		export ESED=/usr/bin/sed
+		unalias sed
+	fi
+
+	cd "${WORKDIR}/include"
+	$(freebsd_get_bmake) CC="$(tc-getCC)" || die "make include failed"
+
+	use crosscompile_opts_headers-only && return 0
+
+	# Bug #270098
+	append-flags $(test-flags -fno-strict-aliasing)
+
+	# Bug #324445
+	append-flags $(test-flags -fno-strict-overflow)
+
+	# strip flags and do not do it later, we only add safe, and in fact
+	# needed flags after all
+	strip-flags
+	export NOFLAGSTRIP=yes
+	if is_crosscompile ; then
+		export YACC='yacc -by'
+		CHOST=${CTARGET} tc-export CC LD CXX RANLIB
+		mymakeopts="${mymakeopts} NLS="
+		CFLAGS="${CFLAGS} -isystem /usr/${CTARGET}/usr/include"
+		append-ldflags "-L${WORKDIR}/${CHOST}/${WORKDIR}/lib/libc"
+	fi
+
+	if is_crosscompile ; then
+		do_compile
+	else
+		multibuild_foreach_variant freebsd_multilib_multibuild_wrapper do_compile
+	fi
+}
+
+gen_libc_ldscript() {
+	# Parameters:
+	#   $1 = target libdir
+	#   $2 = source libc dir
+	#   $3 = source libssp_nonshared dir
+
+	# Clear the symlink.
+	rm -f "${D}/$2/libc.so" || die
+
+	# Move the library if needed
+	if [ "$1" != "$2" ] ; then
+		mv "${D}/$2/libc.so.7" "${D}/$1/" || die
+	fi
+
+	# Generate libc.so ldscript for inclusion of libssp_nonshared.a when linking
+	# this is done to avoid having to touch gcc spec file as it is currently
+	# done on FreeBSD upstream, mostly because their binutils aren't able to
+	# cope with linker scripts yet.
+	# Taken from toolchain-funcs.eclass:
+	local output_format
+	output_format=$($(tc-getCC) ${CFLAGS} ${LDFLAGS} -Wl,--verbose 2>&1 | sed -n 's/^OUTPUT_FORMAT("\([^"]*\)",.*/\1/p')
+	[[ -n ${output_format} ]] && output_format="OUTPUT_FORMAT ( ${output_format} )"
+
+	cat > "${D}/$2/libc.so" <<-END_LDSCRIPT
+/* GNU ld script
+   SSP (-fstack-protector) requires __stack_chk_fail_local to be local.
+   GCC invokes this symbol in a non-PIC way, which results in TEXTRELs if
+   this symbol was provided by a shared libc. So we link in
+   libssp_nonshared.a from here.
+ */
+${output_format}
+GROUP ( /$1/libc.so.7 /$3/libssp_nonshared.a )
+END_LDSCRIPT
+}
+
+header_list=""
+
+move_header() {
+	local dirname=$(dirname ${1})
+	local filename=$(basename ${1})
+
+	if [ ! -d "${dirname}/${ABI}" ] ; then
+		mkdir "${dirname}/${ABI}" || die
+	fi
+
+	mv "${1}" "${dirname}/${ABI}/" || die
+
+	export header_list="${header_list} ${1}"
+}
+
+make_header_template() {
+	cat <<-END_HEADER
+/*
+ * Wrapped header for multilib support.
+ * See the real headers included below.
+ */
+
+#if defined(__x86_64__)
+  @ABI_amd64_fbsd@
+#elif defined(__i386__)
+  @ABI_x86_fbsd@
+#else
+  @ABI_${DEFAULT_ABI}@
+#endif
+END_HEADER
+}
+
+wrap_header() {
+	local dirname=$(dirname ${1})
+	local filename=$(basename ${1})
+
+	if [ -n "${dirname#.}" ] ; then
+		dirname="${dirname}/${2}"
+	else
+		dirname="${2}"
+	fi
+
+	if [ -f "${dirname}/${filename}" ] ; then
+		sed -e "s:@ABI_${2}@:#include <${dirname}/${filename}>:" ${1}
+	else
+		cat ${1}
+	fi
+}
+
+wrap_header_end() {
+	sed -e "s:@ABI_.*@:#error \"Sorry, no support for your ABI.\":" ${1}
+}
+
+do_install() {
+	if is_crosscompile ; then
+		INCLUDEDIR="/usr/${CTARGET}/usr/include"
+	else
+		INCLUDEDIR="/usr/include"
+	fi
+
+	dodir ${INCLUDEDIR}
+	CTARGET="${CHOST}" \
+		install_includes ${INCLUDEDIR}
+
+	is_crosscompile && use crosscompile_opts_headers-only && return 0
+
+	for i in $(get_subdirs) ; do
+		einfo "Installing in ${i}..."
+		cd "${WORKDIR}/${i}/" || die "missing ${i}."
+		freebsd_src_install || die "Install ${i} failed"
+	done
+
+	if ! is_crosscompile ; then
+		if use multilib && [ "${ABI}" != "${DEFAULT_ABI}" ] ; then
+			gen_libc_ldscript "usr/$(get_libdir)" "usr/$(get_libdir)" "usr/$(get_libdir)"
+		else
+			dodir "$(get_libdir)"
+			gen_libc_ldscript "$(get_libdir)" "usr/$(get_libdir)" "usr/$(get_libdir)"
+		fi
+	else
+		CHOST=${CTARGET} gen_libc_ldscript "usr/${CTARGET}/usr/lib" "usr/${CTARGET}/usr/lib" "usr/${CTARGET}/usr/lib"
+	fi
+
+	if use multilib ; then
+		cd "${D}/usr/include"
+		for i in machine/*.h fenv.h ; do
+			move_header ${i}
+		done
+		if [ "${ABI}" = "${DEFAULT_ABI}" ] ; then
+			# Supposedly the last one!
+			local uniq_headers="$(echo ${header_list} | tr ' ' '\n' | sort | uniq | tr '\n' ' ')"
+			for j in ${uniq_headers} ; do
+				make_header_template > ${j}
+				for i in $(get_all_abis) ; do
+					wrap_header ${j} ${i} > ${j}.new
+					cp ${j}.new ${j}
+					rm -f ${j}.new
+				done
+				wrap_header_end ${j} > ${j}.new
+				cp ${j}.new ${j}
+				rm -f ${j}.new
+			done
+		fi
+	fi
+}
+
+src_install() {
+	if is_crosscompile ; then
+		einfo "Installing for ${CTARGET} in ${CHOST}.."
+		# From this point we need to force: get stripped with the correct tools,
+		# get tc-arch-kernel to return the right value, etc.
+		export CHOST=${CTARGET}
+
+		mymakeopts="${mymakeopts} NO_MAN= \
+			INCLUDEDIR=/usr/${CTARGET}/usr/include \
+			SHLIBDIR=/usr/${CTARGET}/usr/lib \
+			LIBDIR=/usr/${CTARGET}/usr/lib"
+
+		dosym "usr/include" "/usr/${CTARGET}/sys-include"
+		do_install
+
+		return 0
+	else
+		export STRIP_MASK="*/usr/lib*/*crt*.o"
+		multibuild_foreach_variant freebsd_multilib_multibuild_wrapper do_install
+	fi
+
+	cd "${WORKDIR}/etc/"
+	insinto /etc
+	doins nls.alias mac.conf netconfig
+
+	# Install ttys file
+	local MACHINE="$(tc-arch-kernel)"
+	doins "etc.${MACHINE}"/*
+
+	# Generate ldscripts for core libraries that will go in /
+	gen_usr_ldscript -a alias cam geom ipsec jail kiconv \
+		kvm m md procstat sbuf thr ufs util
+
+	# Install a libusb.pc for better compat with Linux's libusb
+	if use usb ; then
+		dodir /usr/$(get_libdir)/pkgconfig
+		sed -e "s:@LIBDIR@:/usr/$(get_libdir):" "${FILESDIR}/libusb.pc.in" > "${D}/usr/$(get_libdir)/pkgconfig/libusb.pc" || die
+		sed -e "s:@LIBDIR@:/usr/$(get_libdir):" "${FILESDIR}/libusb-1.0.pc.in" > "${D}/usr/$(get_libdir)/pkgconfig/libusb1.0.pc" || die
+	fi
+}
+
+install_includes()
+{
+	local INCLUDEDIR="$1"
+
+	# The idea is to be called from either install or unpack.
+	# During unpack it's required to install them as portage's user.
+	if [[ "${EBUILD_PHASE}" == "install" ]]; then
+		local DESTDIR="${D}"
+		BINOWN="root"
+		BINGRP="wheel"
+	else
+		local DESTDIR="${WORKDIR}"
+		[[ -z "${USER}" ]] && USER="portage"
+		BINOWN="${USER}"
+		[[ -z "${GROUPS}" ]] && GROUPS="portage"
+		BINGRP="${GROUPS}"
+	fi
+
+	# Must exist before we use it.
+	[[ -d "${DESTDIR}${INCLUDEDIR}" ]] || die "dodir or mkdir ${INCLUDEDIR} before using install_includes."
+	cd "${WORKDIR}/include"
+
+	local MACHINE="$(tc-arch-kernel)"
+
+	einfo "Installing includes into ${INCLUDEDIR} as ${BINOWN}:${BINGRP}..."
+	$(freebsd_get_bmake) installincludes \
+		MACHINE=${MACHINE} MACHINE_ARCH=${MACHINE} \
+		DESTDIR="${DESTDIR}" \
+		INCLUDEDIR="${INCLUDEDIR}" BINOWN="${BINOWN}" \
+		BINGRP="${BINGRP}" || die "install_includes() failed"
+	einfo "includes installed ok."
+	EXTRA_INCLUDES="lib/librtld_db lib/libutil lib/msun gnu/lib/libregex"
+	for i in $EXTRA_INCLUDES; do
+		einfo "Installing $i includes into ${INCLUDEDIR} as ${BINOWN}:${BINGRP}..."
+		cd "${WORKDIR}/$i" || die
+		$(freebsd_get_bmake) installincludes DESTDIR="${DESTDIR}" \
+			MACHINE=${MACHINE} MACHINE_ARCH=${MACHINE} \
+			INCLUDEDIR="${INCLUDEDIR}" BINOWN="${BINOWN}" \
+			BINGRP="${BINGRP}" || die "problem installing $i includes."
+		einfo "$i includes installed ok."
+	done
+}