Generate the libc ldscript when doing multilib too.

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

3 files changed, 618 insertions, 5 deletions

diff --git a/sys-freebsd/freebsd-lib/ChangeLog b/sys-freebsd/freebsd-lib/ChangeLog
index 1ed1e092be1f..81ac126110f9 100644
--- a/sys-freebsd/freebsd-lib/ChangeLog
+++ b/sys-freebsd/freebsd-lib/ChangeLog
@@ -1,6 +1,11 @@
 # 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.178 2013/06/18 18:09:22 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog,v 1.179 2013/06/18 19:15:46 aballier Exp $
+
+*freebsd-lib-9.1-r8 (18 Jun 2013)
+
+  18 Jun 2013; Alexis Ballier <aballier@gentoo.org> +freebsd-lib-9.1-r8.ebuild:
+  Generate the libc ldscript when doing multilib too.
 
 *freebsd-lib-9.1-r7 (18 Jun 2013)
 
diff --git a/sys-freebsd/freebsd-lib/Manifest b/sys-freebsd/freebsd-lib/Manifest
index 2c62a3a1d746..8b7ff6037dd5 100644
--- a/sys-freebsd/freebsd-lib/Manifest
+++ b/sys-freebsd/freebsd-lib/Manifest
@@ -87,13 +87,14 @@ EBUILD freebsd-lib-9.1-r4.ebuild 18204 SHA256 2e9a27abe55de661e47c08996d77f00fff
 EBUILD freebsd-lib-9.1-r5.ebuild 17118 SHA256 e721a639a5fb82f213ce40bad39f02a520596463dccbb20e4abe53bd229d8445 SHA512 97caafda63a51f0c3ad35471b404ac5cea9de730ead9b8bac4042107ed0ddea3d956732435746e8f268e73ad9e24e1b8abd55a322f0c69fa7c7d62a7dc88bfa5 WHIRLPOOL d8b54d9d6d27b200ee7b3b4de3b2c2889ac9b49827ffb54fd37d3f234db10e24e4765fa9e5ebad846e87e01df79517495ce85a7cb6f86ee1e8f9b9b51f0d79a9
 EBUILD freebsd-lib-9.1-r6.ebuild 18624 SHA256 43186c9a26fe3f168eba9a526ee5a69021c40093c814431076d79ff1d25a2391 SHA512 28f56883c0fe2b20ab18108b2829a69960878867f1eca9d81f3dc6f159fb41ba2814751876a729e9ed894edabcb6922602e3c07e60502c70baf99288412d4162 WHIRLPOOL 47754469cd1b9ff711f89b881429223c2330ecd6f5320d20287e294286203a6a197c93c657ea0e8d78f2f828901f0974cff59bf251a3ba344f0730d9acc2ad0f
 EBUILD freebsd-lib-9.1-r7.ebuild 18634 SHA256 c587fa2a4ad95f8534e04188bc8fc9d7430b4a872cd1dd53a12e760be23e3ff3 SHA512 207c4d6f3c4d30c8c6d6c086cb757431de01fa11239bf3f76169fe15261cee6b4233c052013539dc02570f8a2d7c1b75052f4acf272abd909428c4c4176c4ddd WHIRLPOOL ae0af97d61dde7968cfb9c4df664a502acdbf4638b97d1c1384ad461ffea7eba82f58380eaeabc5c83a13a0148f6e9258ef9d40527fdb8662c75f0fbe2878ef9
+EBUILD freebsd-lib-9.1-r8.ebuild 18704 SHA256 03a6f1f0a2d03811c4deb6039a6bacd81a230b77a537bf304df9155705b81b21 SHA512 14b8329c68567c7f0abcd2ae7f8832a3a5390f225d85ae753ded5a3c97480c3ed843636e1f30cc3bad3d28fac95ebc24115728372924e47455fa85aad4f862ed WHIRLPOOL c887d77b432cf84ac6b1c752efa1573b610bfdac6afc15e1fb8499674f0e10380f1733cf515e4c0578ec19128886b41993e5fb69768cd16ae7ca8a2c7884648d
 EBUILD freebsd-lib-9.1.ebuild 17157 SHA256 b1a74967940cb0eb70c6965b3f2add374bc2155afd975c44a90cf65c744ea632 SHA512 ecfb6745880c47dc965363744869cb491f05d60c03463779eb250b3c71d443436dbdc03ae4ce741d8c99d57897a84561e09412d0f825cc9e552c4d17e5253c2d WHIRLPOOL a17b3b88765e62d1f415c41bd5f4e1f9c8349b29eac65e2e064d282ac3af33b5eea532c613fe25d1e6ad2e56ad82263be15128ba5eada42d95023869491c40da
-MISC ChangeLog 36998 SHA256 38358c636e835ee9984c03451da8e3936338a0c7c0408ac5f2cdf8bd141f8a72 SHA512 e86842f3b5550646247dc2ad660a081af4cf33c40b13cd863b04a0ad95f662b1933e04436d8e999c67593ba39312597dcd440ac7892586ba7180c73e2660cb6c WHIRLPOOL df0109b8df8c74dd1da832a8f7c1347c8e51455c54e4212afeacce91a98343b47bf5eed4d9691aaa6d579d1b9e1a3f22e9ee18a456028d077aafc6f2dcf77a03
+MISC ChangeLog 37168 SHA256 d92adb6c7ac706463c4c3b939bbbc335f258fe8db71a786e702c68176ac5c1ae SHA512 68b15d1b18bb6e23bab60da0994abe73d6fa2e279ea2e02acc3e16a18dc185ae7bd1db60f42db46a9f5299b0da0854900bc7432d5c78cbeae59d77e1b9b41296 WHIRLPOOL c28e7f4ff9ee82cf0d6f94087ee077230fd2550e71c4c97a4b2ff150f0378cfe97eb0195c28f65e834af2b40bc1f63926f3260e8ea76a50341c99328a7879a1c
 MISC metadata.xml 410 SHA256 0ea0a391db3018afdf230e293ffedbc313b4a20db703c8c83fdf144a28c6c246 SHA512 de2a427cd8fcc2c0d7c0a1821f4cc916a280d9c0e21d83fdb7c35d110b48e96854baffc7d469e3461c2a6ee81eaec14d105c45cafbd3aaa37100a525bc60b7af WHIRLPOOL 3b2f587e647dafdb68bdb147bb0d5fecea0e728b52eabb61deb2623641117be6ac0871405666d7616ae1d60eaacf0b621cba8175dca463e9344ad83a4daf5865
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iEYEAREIAAYFAlHAolQACgkQvFcC4BYPU0qCkwCgv3rtM0+rGda+UKRHRa1jaBQU
-33wAoIarIud9mjiaKY6Qs1E40ZL2ibYW
-=y5hL
+iEYEAREIAAYFAlHAseQACgkQvFcC4BYPU0pTTQCgr04UPrYmfuiN2VHl1s3gQlkE
+s+IAnA8/nHP4GI4KwsWraHS4w7pZo08S
+=QXQ9
 -----END PGP SIGNATURE-----
diff --git a/sys-freebsd/freebsd-lib/freebsd-lib-9.1-r8.ebuild b/sys-freebsd/freebsd-lib/freebsd-lib-9.1-r8.ebuild
new file mode 100644
index 000000000000..41d3ff20dc14
--- /dev/null
+++ b/sys-freebsd/freebsd-lib/freebsd-lib-9.1-r8.ebuild
@@ -0,0 +1,607 @@
+# 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-r8.ebuild,v 1.1 2013/06/18 19:15:46 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? ( virtual/krb5 )
+		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}*
+		!bootstrap? ( app-arch/bzip2 )"
+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 bootstrap 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= "
+	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-gccfloat.patch"
+	"${FILESDIR}/${PN}-6.0-flex-2.5.31.patch"
+	"${FILESDIR}/${PN}-6.1-csu.patch"
+	"${FILESDIR}/${PN}-8.0-rpcsec_gss.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)
+#
+# 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"
+
+# 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"
+
+	# 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
+
+	# Let arch-specific includes to be found
+	local machine
+	machine=$(tc-arch-kernel ${CTARGET})
+	ln -s "${WORKDIR}/sys/${machine}/include" "${WORKDIR}/include/machine" || \
+		die "Couldn't make ${machine}/include symlink."
+
+	cd "${S}"
+	use bootstrap && dummy_mk libstand
+	# Try to fix sed calls for GNU sed. Do it only with GNU userland and force
+	# BSD's sed on BSD.
+	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_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"
+
+	cd "${WORKDIR}/lib/libc" || die
+	freebsd_src_compile
+	append-ldflags "-L${MAKEOBJDIRPREFIX}/${WORKDIR}/lib/libc"
+
+	cd "${WORKDIR}/gnu/lib/libgcc" || die
+	freebsd_src_compile
+	append-ldflags "-L${MAKEOBJDIRPREFIX}/${WORKDIR}/gnu/lib/libgcc"
+}
+
+# What to build for a non-native build: cross-compiler, non-native abi in
+# multilib. We also need the csu but this has to be handled separately.
+NON_NATIVE_SUBDIRS="lib/libc lib/msun gnu/lib/libssp/libssp_nonshared lib/libthr lib/libutil"
+
+# 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 "<${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="${NON_NATIVE_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
+	elif use build ; then
+		# For the non-native ABIs we only build the csu parts and very core
+		# libraries for now.
+		ret="gnu/lib/libssp/libssp_nonshared gnu/lib/csu"
+		if [ "${EBUILD_PHASE}" = "install" ]; then
+			ret="$(get_csudir $(tc-arch-kernel ${CHOST})) ${ret}"
+		fi
+	else
+		# Finally, with a non-native ABI without USE=build, we build the most
+		# important libraries.
+		ret="${NON_NATIVE_SUBDIRS} gnu/lib/csu lib/libcompiler_rt gnu/lib/libgcc lib/libmd lib/libcrypt"
+
+		if [ "${EBUILD_PHASE}" = "install" ]; then
+			ret="$(get_csudir $(tc-arch-kernel ${CHOST})) ${ret}"
+		fi
+	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} -I ${WORKDIR}/include_proper_${ABI}"
+	fi
+	bootstrap_csu
+	bootstrap_libssp_nonshared
+	if ! is_crosscompile && ! is_native_abi ; then
+		# Bootstrap the compiler libs
+		bootstrap_libgcc
+	fi
+}
+
+# Compile it. Assume we have the toolchain setup correctly.
+do_compile() {
+	# Bootstrap if needed, otherwise assume the system headers are in
+	# /usr/include.
+	need_bootstrap && do_bootstrap
+
+	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() {
+	INCLUDEDIR="/usr/include"
+	dodir ${INCLUDEDIR}
+	CTARGET="${CHOST}" \
+		install_includes ${INCLUDEDIR}
+
+	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}.."
+		INCLUDEDIR="/usr/${CTARGET}/usr/include"
+		dodir ${INCLUDEDIR}
+		install_includes ${INCLUDEDIR}
+
+		use crosscompile_opts_headers-only && return 0
+
+		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
+
+		# This is to get it stripped with the correct tools, otherwise it gets
+		# stripped with the host strip.
+		export CHOST=${CTARGET}
+		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
+}