Backport dl_iterate_phdr from FreeBSD-7 so that future gcc's dont pull in libgcc_s.so.1

Package-Manager: portage-2.1.3.7

5 files changed, 353 insertions, 5 deletions

diff --git a/sys-freebsd/freebsd-lib/ChangeLog b/sys-freebsd/freebsd-lib/ChangeLog
index 83ccbd9e08af..e5ee27e1f503 100644
--- a/sys-freebsd/freebsd-lib/ChangeLog
+++ b/sys-freebsd/freebsd-lib/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-freebsd/freebsd-lib
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog,v 1.53 2007/08/06 14:27:31 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog,v 1.54 2007/09/12 00:10:29 uberlord Exp $
+
+*freebsd-lib-6.2-r2 (12 Sep 2007)
+
+  12 Sep 2007; Roy Marples <uberlord@gentoo.org>
+  +files/freebsd-lib-6.2-dl_iterate_phdr.patch, +freebsd-lib-6.2-r2.ebuild:
+  Backport dl_iterate_phdr from FreeBSD-7 so that future gcc's don't pull in
+  libgcc_s.so.1
 
   06 Aug 2007; Roy Marples <uberlord@gentoo.org>
   +files/freebsd-lib-6.2-bluetooth.patch, freebsd-lib-6.2-r1.ebuild:
diff --git a/sys-freebsd/freebsd-lib/Manifest b/sys-freebsd/freebsd-lib/Manifest
index d9a1a36a7f4c..3033224e554a 100644
--- a/sys-freebsd/freebsd-lib/Manifest
+++ b/sys-freebsd/freebsd-lib/Manifest
@@ -26,6 +26,10 @@ AUX freebsd-lib-6.2-bluetooth.patch 243 RMD160 eaaeafc3f8305d4755070d9d1354289a1
 MD5 391dd728e59c50a12ee853c6841f7e9f files/freebsd-lib-6.2-bluetooth.patch 243
 RMD160 eaaeafc3f8305d4755070d9d1354289a140bf6a1 files/freebsd-lib-6.2-bluetooth.patch 243
 SHA256 4c90cb6d45fa24a07e21255949f219cc561a94011f645c58bce2a68027db6658 files/freebsd-lib-6.2-bluetooth.patch 243
+AUX freebsd-lib-6.2-dl_iterate_phdr.patch 726 RMD160 a70918ba5660f7f034b1893cdd8f61e991e7e842 SHA1 43bc3308c255a8db22e880113c903c855d06810d SHA256 9b77c8ac298b457ae468ece5d9e74009180afffce208f70240ecaa8188af3037
+MD5 5efe0b6b28304a21ba1351de0ac46972 files/freebsd-lib-6.2-dl_iterate_phdr.patch 726
+RMD160 a70918ba5660f7f034b1893cdd8f61e991e7e842 files/freebsd-lib-6.2-dl_iterate_phdr.patch 726
+SHA256 9b77c8ac298b457ae468ece5d9e74009180afffce208f70240ecaa8188af3037 files/freebsd-lib-6.2-dl_iterate_phdr.patch 726
 AUX freebsd-lib-6.2-gcc41.patch 890 RMD160 231bf22bade53a71364c18a00cecaf702cd8803d SHA1 2f26428988501fc9e6b8d0d493e39366d0cf46f7 SHA256 a5aba66f97f445f7d6c6dbfd2ec15506a922b0a38e1ae9ac951767cdf3777651
 MD5 db42cf2a84a14be272f8afed9b156d0a files/freebsd-lib-6.2-gcc41.patch 890
 RMD160 231bf22bade53a71364c18a00cecaf702cd8803d files/freebsd-lib-6.2-gcc41.patch 890
@@ -58,14 +62,18 @@ EBUILD freebsd-lib-6.2-r1.ebuild 8471 RMD160 bdd29e8f2f836247fb5c8dbbd89965341aa
 MD5 f58c30167377021178a700c9f0682f9d freebsd-lib-6.2-r1.ebuild 8471
 RMD160 bdd29e8f2f836247fb5c8dbbd89965341aa9091a freebsd-lib-6.2-r1.ebuild 8471
 SHA256 93f8be649860b0ee12967306eb22163b9c712e0b95eb1e87d223ebd9f2894a14 freebsd-lib-6.2-r1.ebuild 8471
+EBUILD freebsd-lib-6.2-r2.ebuild 8516 RMD160 6aacfc1d910de6d363c05bbcb54170edd0628d1a SHA1 9b864aa2355e9d1f4a6f19ebe549f6624bc96c6f SHA256 0edc6a682f1a762044f9c0f83d8382e771cd9da8019ee6fe45d3da0c7f68b289
+MD5 42a1b3190d141c2bbb17e405ae06edb0 freebsd-lib-6.2-r2.ebuild 8516
+RMD160 6aacfc1d910de6d363c05bbcb54170edd0628d1a freebsd-lib-6.2-r2.ebuild 8516
+SHA256 0edc6a682f1a762044f9c0f83d8382e771cd9da8019ee6fe45d3da0c7f68b289 freebsd-lib-6.2-r2.ebuild 8516
 EBUILD freebsd-lib-6.2.ebuild 8023 RMD160 d99dbb3d0ad6db6028e5c528f14e62de29739fe0 SHA1 39994adbc6e6e8e88d76500b12699a941321c181 SHA256 df9157152e8a81299a3bfea4b0f0a47f5e2dd027f72dcebc94b1c60440b7b1d6
 MD5 5f57ebed318903df6e957f7e3231b4ea freebsd-lib-6.2.ebuild 8023
 RMD160 d99dbb3d0ad6db6028e5c528f14e62de29739fe0 freebsd-lib-6.2.ebuild 8023
 SHA256 df9157152e8a81299a3bfea4b0f0a47f5e2dd027f72dcebc94b1c60440b7b1d6 freebsd-lib-6.2.ebuild 8023
-MISC ChangeLog 14252 RMD160 17c3ef7f61f80dc1dc1ca6a08ba5f6e1da174c09 SHA1 aca69d9888dfd0cf43c8b21328369788f8554a4d SHA256 0136cc8b23a3115f8d1fb4ba69df5339c98f67a838007a106309e5f5bdd44a7f
-MD5 d4d2d06c830f93f5b5d8c29eed24ef73 ChangeLog 14252
-RMD160 17c3ef7f61f80dc1dc1ca6a08ba5f6e1da174c09 ChangeLog 14252
-SHA256 0136cc8b23a3115f8d1fb4ba69df5339c98f67a838007a106309e5f5bdd44a7f ChangeLog 14252
+MISC ChangeLog 14506 RMD160 b0a554f9296b1e7b08bdc872d9f1033c7dd78a1c SHA1 cf2438a1f6e4a6cb8b4c6c82c1f56b23cb95f0aa SHA256 7d2606e94beb47ac3927c25ce9a7d76eb3a7552d09a620300f4939e633e9c47a
+MD5 e84d89cefda9d1922e3cdefb8520a49e ChangeLog 14506
+RMD160 b0a554f9296b1e7b08bdc872d9f1033c7dd78a1c ChangeLog 14506
+SHA256 7d2606e94beb47ac3927c25ce9a7d76eb3a7552d09a620300f4939e633e9c47a ChangeLog 14506
 MISC metadata.xml 156 RMD160 60b5820a08275f307e5bd936d78f5afd1f141086 SHA1 d9d9d4f2b5afc58339ea3e562fca490156935f1f SHA256 30ab515d6ac492d3d6c36ac3c675511742c2149e56a6b3228c8d22ab8edb3ff7
 MD5 2bd48a5ae413433cbb36110b219ce97c metadata.xml 156
 RMD160 60b5820a08275f307e5bd936d78f5afd1f141086 metadata.xml 156
@@ -76,3 +84,6 @@ SHA256 49a9a54f56f7cde19e38914f3425617cb36cce9a59cf7dfe81f36c61b7ade919 files/di
 MD5 cfbe490047e77331e6fd3aa1acef40ae files/digest-freebsd-lib-6.2-r1 2072
 RMD160 2b0cd4020a9cb5b7c25aba4badc9b0d0622d3ef3 files/digest-freebsd-lib-6.2-r1 2072
 SHA256 49a9a54f56f7cde19e38914f3425617cb36cce9a59cf7dfe81f36c61b7ade919 files/digest-freebsd-lib-6.2-r1 2072
+MD5 cfbe490047e77331e6fd3aa1acef40ae files/digest-freebsd-lib-6.2-r2 2072
+RMD160 2b0cd4020a9cb5b7c25aba4badc9b0d0622d3ef3 files/digest-freebsd-lib-6.2-r2 2072
+SHA256 49a9a54f56f7cde19e38914f3425617cb36cce9a59cf7dfe81f36c61b7ade919 files/digest-freebsd-lib-6.2-r2 2072
diff --git a/sys-freebsd/freebsd-lib/files/digest-freebsd-lib-6.2-r2 b/sys-freebsd/freebsd-lib/files/digest-freebsd-lib-6.2-r2
new file mode 100644
index 000000000000..1e945af4f78e
--- /dev/null
+++ b/sys-freebsd/freebsd-lib/files/digest-freebsd-lib-6.2-r2
@@ -0,0 +1,24 @@
+MD5 da39228784512bd5bb4fba41f84d70d5 freebsd-contrib-6.2.tar.bz2 36594160
+RMD160 8b89f1ac72ba0054efe1aec2d747ecd33789fde3 freebsd-contrib-6.2.tar.bz2 36594160
+SHA256 dbbd9198597e176242806329242d0e12181820a921e5da42aadefaacda1b6277 freebsd-contrib-6.2.tar.bz2 36594160
+MD5 786c7276c50360828af797537382e383 freebsd-crypto-6.2.tar.bz2 4004897
+RMD160 dd1f9005ad44bde627b1364906d229f06627f394 freebsd-crypto-6.2.tar.bz2 4004897
+SHA256 3086794bcf87827ab9e6b6a4d794c90dfc90cdaebd7d2e6bee934496d7fcc353 freebsd-crypto-6.2.tar.bz2 4004897
+MD5 a25ab389e5f4ebef301abe071b4c196e freebsd-etc-6.2.tar.bz2 190297
+RMD160 1540601566ece689b3fc2935329a2eca62a24314 freebsd-etc-6.2.tar.bz2 190297
+SHA256 ff5970db1d7842d2933589203ae0c3907dee427b2ea99de68fce678582bf1804 freebsd-etc-6.2.tar.bz2 190297
+MD5 35378351a7ff00643f6149fe2a2d5998 freebsd-include-6.2.tar.bz2 131651
+RMD160 9264ba0661bbdceba85c4bef19a2ebd788ec6957 freebsd-include-6.2.tar.bz2 131651
+SHA256 38928510c34efd735a977896a9f96e71b48c22cf4727677ee954a23aff871d53 freebsd-include-6.2.tar.bz2 131651
+MD5 63b8b5552e729be41b98a73665bcd422 freebsd-lib-6.2.tar.bz2 2670374
+RMD160 95bbce7862fc7a406b8629914f281d5e01e5ea71 freebsd-lib-6.2.tar.bz2 2670374
+SHA256 8e0c909a79a9ed18841f8a5a6e25fc770f76de1a5dc20cbd6bc591bed52d1033 freebsd-lib-6.2.tar.bz2 2670374
+MD5 5cad9ad0ed76a85bf9188020ed9be879 freebsd-libexec-6.2.tar.bz2 277231
+RMD160 423490cb7c888bfce7edcf473d77868c65c21fe2 freebsd-libexec-6.2.tar.bz2 277231
+SHA256 546821f50ff3e69cebd59e1415798233050259de33a4b37acfcbd56b8d92782b freebsd-libexec-6.2.tar.bz2 277231
+MD5 79c16213744e76d3bf13a9ac21ede56d freebsd-sys-6.2.tar.bz2 18344936
+RMD160 784230e22ccaf09933ef3f053ff29cc3e579786a freebsd-sys-6.2.tar.bz2 18344936
+SHA256 a754371d88601aaab7152bb3d127bd3777db912e13a26a866e13ba34934c5e5b freebsd-sys-6.2.tar.bz2 18344936
+MD5 a1596f3407f95b33f927afc0e3eff428 freebsd-usbin-6.2.tar.bz2 2695872
+RMD160 ea6104fcfbf6c0be511a80d0475e5a8f716292be freebsd-usbin-6.2.tar.bz2 2695872
+SHA256 6195301d39e7bc7fa00f6dec71479b1800ea5c3dc9d3ea375dafe4e71e6485f0 freebsd-usbin-6.2.tar.bz2 2695872
diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-6.2-dl_iterate_phdr.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-6.2-dl_iterate_phdr.patch
new file mode 100644
index 000000000000..43abb5f2641b
--- /dev/null
+++ b/sys-freebsd/freebsd-lib/files/freebsd-lib-6.2-dl_iterate_phdr.patch
@@ -0,0 +1,29 @@
+Backport dl_iterate_phdr from FreeBSD-7 so that we can use gcc-4
+and not pull in libgcc_s.so.1 into every binary we build.
+
+diff -ur lib/libc/gen/dlfcn.c lib/libc/gen/dlfcn.c
+--- lib/libc/gen/dlfcn.c	2004-03-05 08:10:17 +0000
++++ lib/libc/gen/dlfcn.c	2007-09-10 14:11:12 +0100
+@@ -31,6 +31,7 @@
+  * Linkage to services provided by the dynamic linker.
+  */
+ #include <dlfcn.h>
++#include <link.h>
+ #include <stddef.h>
+ 
+ static const char sorry[] = "Service unavailable";
+@@ -118,3 +119,14 @@
+ {
+ 	_rtld_error(sorry);
+ }
++
++#ifdef _GENTOO_DL_ITERATE_PHDR
++#pragma weak dl_iterate_phdr
++int
++dl_iterate_phdr(int (*callback)(struct dl_phdr_info *, size_t, void *),
++    void *data)
++{
++	_rtld_error(sorry);
++	return 0;
++}
++#endif
diff --git a/sys-freebsd/freebsd-lib/freebsd-lib-6.2-r2.ebuild b/sys-freebsd/freebsd-lib/freebsd-lib-6.2-r2.ebuild
new file mode 100644
index 000000000000..adee3dad804d
--- /dev/null
+++ b/sys-freebsd/freebsd-lib/freebsd-lib-6.2-r2.ebuild
@@ -0,0 +1,277 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-6.2-r2.ebuild,v 1.1 2007/09/12 00:10:29 uberlord Exp $
+
+inherit bsdmk freebsd flag-o-matic toolchain-funcs
+
+DESCRIPTION="FreeBSD's base system libraries"
+SLOT="6.0"
+KEYWORDS="~sparc-fbsd ~x86-fbsd"
+
+IUSE="atm bluetooth ssl ipv6 kerberos nis gpib build bootstrap"
+
+# 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
+		nis? ( mirror://gentoo/${USBIN}.tar.bz2 )
+		build? (
+			mirror://gentoo/${SYS}.tar.bz2 )"
+
+if [[ ${CATEGORY/cross-} == ${CATEGORY} ]]; then
+	RDEPEND="ssl? ( dev-libs/openssl )
+		kerberos? ( virtual/krb5 )
+		!sys-freebsd/freebsd-headers"
+	DEPEND="${RDEPEND}
+		>=sys-devel/flex-2.5.31-r2
+		=sys-freebsd/freebsd-sources-${RV}*
+		!bootstrap? ( app-arch/bzip2 )"
+
+	PROVIDE="virtual/libc
+		virtual/os-headers"
+
+else
+	SRC_URI="${SRC_URI}
+			mirror://gentoo/${SYS}.tar.bz2"
+fi
+
+DEPEND="${DEPEND}
+		=sys-freebsd/freebsd-mk-defs-${RV}*"
+
+S="${WORKDIR}/lib"
+
+export CTARGET=${CTARGET:-${CHOST}}
+if [[ ${CTARGET} == ${CHOST} && ${CATEGORY/cross-} != ${CATEGORY} ]]; then
+	export CTARGET=${CATEGORY/cross-}
+fi
+
+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} NO_ATM= "
+	use bluetooth || mymakeopts="${mymakeopts} NO_BLUETOOTH= "
+	use ssl || mymakeopts="${mymakeopts} NO_OPENSSL= NO_CRYPT= "
+	use ipv6 || mymakeopts="${mymakeopts} NO_INET6= "
+	use kerberos || mymakeopts="${mymakeopts} NO_KERBEROS= "
+	use nis || mymakeopts="${mymakeopts} NO_NIS= "
+	use gpib || mymakeopts="${mymakeopts} NO_GPIB= "
+
+	mymakeopts="${mymakeopts} NO_OPENSSH= NO_BIND= NO_SENDMAIL= "
+
+	if [[ ${CTARGET} != ${CHOST} ]]; then
+		mymakeopts="${mymakeopts} MACHINE=$(tc-arch-kernel ${CTARGET})"
+		mymakeopts="${mymakeopts} MACHINE_ARCH=$(tc-arch-kernel ${CTARGET})"
+	fi
+}
+
+PATCHES="${FILESDIR}/${PN}-bsdxml.patch
+	${FILESDIR}/${PN}-6.0-pmc.patch
+	${FILESDIR}/${PN}-6.0-gccfloat.patch
+	${FILESDIR}/${PN}-6.0-flex-2.5.31.patch
+	${FILESDIR}/${PN}-6.0-binutils-asm.patch
+	${FILESDIR}/${PN}-6.0-ssp.patch
+	${FILESDIR}/${PN}-6.1-csu.patch
+	${FILESDIR}/${PN}-6.2-bluetooth.patch
+	${FILESDIR}/${PN}-6.2-gcc41.patch
+	${FILESDIR}/${PN}-6.2-dl_iterate_phdr.patch
+	${FILESDIR}/${PN}-6.2-sparc64.patch"
+
+# Here we disable and remove source which we don't need or want
+# In order:
+# - ncurses stuff
+# - 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="libncurses libform libmenu libpanel libedit \
+	libz libbz2 libarchive \
+	libsm libsmdb libsmutil \
+	libbegemot libbsnmp \
+	libpam libpcap bind libwrap libmagic \
+	libcom_err libtelnet"
+
+src_unpack() {
+	freebsd_src_unpack
+
+	sed -i -e 's:-o/dev/stdout:-t:' "${S}/libc/net/Makefile.inc"
+	sed -i -e 's:histedit.h::' "${WORKDIR}/include/Makefile"
+
+	# 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 \
+			-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}"
+
+	done
+
+	# Apply this patch for Gentoo/FreeBSD/SPARC64 to build correctly
+	# from catalyst, then don't do anything else
+	if use build; then
+		cd "${WORKDIR}"
+		epatch "${FILESDIR}/freebsd-sources-6.2-sparc64.patch"
+		return 0
+	fi
+
+	if [[ ${CTARGET} == ${CHOST} ]]; then
+		ln -s "/usr/src/sys-${RV}" "${WORKDIR}/sys"
+	else
+		sed -i -e "s:/usr/include:/usr/${CTARGET}/usr/include:g" \
+			"${S}/libc/"{yp,rpc}"/Makefile.inc"
+	fi
+
+	[[ -n $(install --version 2> /dev/null | grep GNU) ]] && \
+		sed -i -e 's:${INSTALL} -C:${INSTALL}:' "${WORKDIR}/include/Makefile"
+
+	# Let arch-specific includes to be found
+	local machine
+	machine=$(tc-arch-kernel ${CTARGET})
+	ln -s "${WORKDIR}/sys/${machine}/include" "${WORKDIR}/include/machine"
+
+	use bootstrap && dummy_mk libstand
+}
+
+src_compile() {
+	cd "${WORKDIR}/include"
+	$(freebsd_get_bmake) CC=$(tc-getCC) || die "make include failed"
+
+	use crosscompile_opts_headers-only && return 0
+
+	# Don't use ssp until properly fixed
+	append-flags $(test-flags -fno-stack-protector -fno-stack-protector-all)
+
+	strip-flags
+	if [[ ${CTARGET} != ${CHOST} ]]; then
+		export YACC='yacc -by'
+		CHOST=${CTARGET} tc-export CC LD CXX
+
+		local machine
+		machine=$(tc-arch-kernel ${CTARGET})
+
+		local csudir
+		if [[ -d "${S}/csu/${machine}-elf" ]]; then
+			csudir="${S}/csu/${machine}-elf"
+		else
+			csudir="${S}/csu/${machine}"
+		fi
+		cd "${csudir}"
+		$(freebsd_get_bmake) ${mymakeopts} || die "make csu failed"
+
+		append-flags "-isystem /usr/${CTARGET}/usr/include"
+		append-flags "-B ${csudir}"
+		append-ldflags "-B ${csudir}"
+		cd "${S}/libc"
+		$(freebsd_get_bmake) ${mymakeopts} || die "make libc failed"
+
+		append-flags "-isystem ${WORKDIR}/lib/msun/${machine/i386/i387}"
+		cd "${S}/msun"
+		$(freebsd_get_bmake) ${mymakeopts} || die "make libc failed"
+	else
+		# Forces to use the local copy of headers as they might be outdated in
+		# the system
+		append-flags "-isystem '${WORKDIR}/sys' -isystem '${WORKDIR}/include'"
+
+		cd "${S}"
+		NOFLAGSTRIP=yes freebsd_src_compile
+	fi
+}
+
+src_install() {
+	cd "${WORKDIR}/include"
+
+	[[ ${CTARGET} == ${CHOST} ]] \
+		&& INCLUDEDIR="/usr/include" \
+		|| INCLUDEDIR="/usr/${CTARGET}/usr/include"
+
+	einfo "Installing for ${CTARGET} in ${CHOST}.."
+
+	dodir "${INCLUDEDIR}"
+	$(freebsd_get_bmake) installincludes \
+		MACHINE=$(tc-arch-kernel) \
+		DESTDIR="${D}" INCLUDEDIR="${INCLUDEDIR}" || die "Install failed"
+
+	# Install math.h when crosscompiling, at this point
+	if [[ ${CHOST} != ${CTARGET} ]]; then
+		insinto "/usr/${CTARGET}/usr/include"
+		doins "${S}/msun/src/math.h"
+	fi
+
+	use crosscompile_opts_headers-only && return 0
+
+	if [[ ${CTARGET} != ${CHOST} ]]; then
+		local csudir
+		if [[ -d "${S}/csu/$(tc-arch-kernel ${CTARGET})-elf" ]]; then
+			csudir="${S}/csu/$(tc-arch-kernel ${CTARGET})-elf"
+		else
+			csudir="${S}/csu/$(tc-arch-kernel ${CTARGET})"
+		fi
+		cd "${csudir}"
+		$(freebsd_get_bmake) ${mymakeopts} DESTDIR="${D}" install \
+			FILESDIR="/usr/${CTARGET}/usr/lib" LIBDIR="/usr/${CTARGET}/usr/lib" || die "Install csu failed"
+
+		cd "${S}/libc"
+		$(freebsd_get_bmake) ${mymakeopts} DESTDIR="${D}" install NO_MAN= \
+			SHLIBDIR="/usr/${CTARGET}/lib" LIBDIR="/usr/${CTARGET}/usr/lib" || die "Install failed"
+
+		cd "${S}/msun"
+		$(freebsd_get_bmake) ${mymakeopts} DESTDIR="${D}" install NO_MAN= \
+			INCLUDEDIR="/usr/${CTARGET}/usr/include" \
+			SHLIBDIR="/usr/${CTARGET}/lib" LIBDIR="/usr/${CTARGET}/usr/lib" || die "Install failed"
+
+		dosym "usr/include" "/usr/${CTARGET}/sys-include"
+	else
+		cd "${S}"
+		mkinstall || die "Install failed"
+	fi
+
+	# Don't install the rest of the configuration files if crosscompiling
+	[[ ${CTARGET} != ${CHOST} ]] && return 0
+
+	# Compatibility symlinks to run FreeBSD 5.x binaries (ABI is mostly
+	# identical, remove when problems will actually happen)
+	dosym /lib/libc.so.6 /usr/lib/libc.so.5
+	dosym /lib/libm.so.4 /usr/lib/libm.so.3
+
+	# install libstand files
+	dodir /usr/include/libstand
+	insinto /usr/include/libstand
+	doins "${S}"/libstand/*.h
+
+	cd "${WORKDIR}/etc/"
+	insinto /etc
+	doins auth.conf nls.alias mac.conf netconfig
+
+	# Install ttys file
+	doins "etc.$(tc-arch-kernel)"/*
+
+	# Install a default libmap.conf that uses libthr by default
+	doins "${FILESDIR}"/libmap.conf
+
+	dodir /etc/sandbox.d
+	cat - > "${D}"/etc/sandbox.d/00freebsd <<EOF
+# /dev/crypto is used mostly by OpenSSL on *BSD platforms
+# leave it available as packages might use OpenSSL commands
+# during compile or install phase.
+SANDBOX_PREDICT="/dev/crypto"
+EOF
+}