diff options
| -rw-r--r-- | sys-freebsd/freebsd-lib/ChangeLog | 9 | ||||
| -rw-r--r-- | sys-freebsd/freebsd-lib/Manifest | 14 | ||||
| -rw-r--r-- | sys-freebsd/freebsd-lib/files/freebsd-lib-7.1-strndup_bport.patch | 151 | ||||
| -rw-r--r-- | sys-freebsd/freebsd-lib/freebsd-lib-7.1-r1.ebuild | 360 |
4 files changed, 532 insertions, 2 deletions
diff --git a/sys-freebsd/freebsd-lib/ChangeLog b/sys-freebsd/freebsd-lib/ChangeLog index c261489e64d8..931d29ff0d2d 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-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog,v 1.63 2009/01/22 21:02:31 the_paya Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog,v 1.64 2009/01/29 06:52:45 the_paya Exp $ + +*freebsd-lib-7.1-r1 (29 Jan 2009) + + 29 Jan 2009; Javier Villavicencio <the_paya@gentoo.org> + +files/freebsd-lib-7.1-strndup_bport.patch, +freebsd-lib-7.1-r1.ebuild: + Added strndup(3) backport from -CURRENT. Fixes bug 249731 and partially + bug 249731. *freebsd-lib-7.1 (22 Jan 2009) diff --git a/sys-freebsd/freebsd-lib/Manifest b/sys-freebsd/freebsd-lib/Manifest index ec0c51035979..00eeb4e05336 100644 --- a/sys-freebsd/freebsd-lib/Manifest +++ b/sys-freebsd/freebsd-lib/Manifest @@ -1,3 +1,6 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + AUX freebsd-lib-6.0-binutils-asm.patch 1096 RMD160 1d2c2e60f2c8ca49fb8b01c65aca65b5cd59ea23 SHA1 1533aef95476da5b631d2ffb9b4892773ee5b2ae SHA256 5794228b1754d0b0a9a46fbae7e117ca91ca7da1d842339b279a4185014cbfd9 AUX freebsd-lib-6.0-flex-2.5.31.patch 421 RMD160 6ef83c6b09e31a81ba3c25772b02aef34540dbe8 SHA1 1408a36a967b0ff5ba94e23921357f4296e31bc2 SHA256 1d46cf13e1059ae3731ba5555764e020fcf4de7db5abf039fac83423e05d53c4 AUX freebsd-lib-6.0-gccfloat.patch 542 RMD160 564f5a1b1aba59479c22f91570635de717e8b7bf SHA1 94f463f123fdc3009d4ca1d5ab351aa76d768c6b SHA256 d549125f174c86c2d5e7e1f1c99cf1303b84e91ce8ee51db8c962be48b7a7951 @@ -12,6 +15,7 @@ AUX freebsd-lib-6.2-libc.patch 654 RMD160 daef5893b1459364ec74aa66230834fe96971a AUX freebsd-lib-6.2-libthr.patch 421 RMD160 8f85cbea02252425c624f0d3d7720dca53e1cbe4 SHA1 dd0d8a2ba63c6951380a5f277ba3b2add5ee5433 SHA256 ba4a3e4bce8a1add38275451eb4ab80df8e415f78fc8eb235ec94f60b28da558 AUX freebsd-lib-6.2-pty6.patch 2633 RMD160 7519e6c12ac385f91f8b09d6eb2bdcb428b51b59 SHA1 444100331a1890ea6491015d42e11b4824025edc SHA256 acddf6cfd103267d94e267688a1e3c4d0546c84a2c30e4edd7c8f35dfac5c639 AUX freebsd-lib-7.0-CVE-2008-1391.patch 344 RMD160 44e20da80ab544895d8dd65b5c6bcdf693c2dd7a SHA1 50105f89d3296793857230a27f909f9c0d713293 SHA256 662a6f26d99257221fa686423fd9fe22862b827cd9ae146c2add5e5ac85290cc +AUX freebsd-lib-7.1-strndup_bport.patch 4698 RMD160 1c4fdaa6963a9f8e2e759aca6a3dacacfb0a3c79 SHA1 24b686900366e35627d02a44e51a1e24615c55d3 SHA256 f178ca73722643536300cd26c6a8f678a08556da3261b7c6bd712b65abde1c16 AUX freebsd-lib-7.1-types.h-fix.patch 371 RMD160 d514196ccf1ba246a158b5f421f009d96d2dd8c4 SHA1 b04bec25903446c20bdfd144796fe9924f9ba39f SHA256 9e745fcfe046c405a365d8d0db8763867f0a618952f7d6bab4c76a8c82273473 AUX freebsd-lib-bsdxml.patch 339 RMD160 27b501cda2ac76230a72dfc3ee6593cb50f8d4b0 SHA1 3b456d272de5d0c56bc650fe60f38524857f8b31 SHA256 c1ac47d6c7176475f0f4b86bb17288a980b44a799fb6f4e7b1920f69e0447dc9 AUX freebsd-lib-new_as.patch 1494 RMD160 36ac871434f9994d5a0d7e1b73765c055d49948a SHA1 10e2e6b7b27459548a17809ada287520e3ffeeea SHA256 6021f34246dcf768a94ffe7273ea2f5590adf6d82ce7fb555234f8012bdbd982 @@ -33,6 +37,14 @@ DIST freebsd-sys-7.1.tar.bz2 22471627 RMD160 2e09c51d3ffaaf62bd2fbeed8dd949a1463 DIST freebsd-usbin-6.2.tar.bz2 2695872 RMD160 ea6104fcfbf6c0be511a80d0475e5a8f716292be SHA1 4772ed5fdc591273887fc7a2e97bddf7a1669b5d SHA256 6195301d39e7bc7fa00f6dec71479b1800ea5c3dc9d3ea375dafe4e71e6485f0 DIST freebsd-usbin-7.1.tar.bz2 2584691 RMD160 cf6adf2f1cc60e667417f647cb99bbc3107c85f6 SHA1 7120dd7e7abed78954889ad4e18e5f8775411621 SHA256 e14cd80187a161153ea5eb6e5441171bf1ca1a8b8e8bdeea7306187c77c52af8 EBUILD freebsd-lib-6.2-r4.ebuild 9534 RMD160 70d7d2e65c8aa287a0c34ef4bf2be11c2c6d3a6b SHA1 cac825220b60e07e82c509894a7c1de60b591810 SHA256 1da8e2e12b023bf035ddca90222b842b867fb51b0d5c509ed7e7e6654bd8ec1e +EBUILD freebsd-lib-7.1-r1.ebuild 11548 RMD160 0ddf21a692cc198a44fabad785f17400e66698a5 SHA1 604daaa4ab4f680abfef83540b79f256a4c745fe SHA256 77a9bcdc5454485ab3bf36667042ab228fe2f159860446cbf9e1415186b86ef3 EBUILD freebsd-lib-7.1.ebuild 11397 RMD160 aebc0adb9b15756bad30f735c5be9387269b0588 SHA1 38f899896b420ee2c519e6afde6f2ec0ec8f4ec2 SHA256 7e5e7933ae52a1ebf7e58dce7cf8ea4b7b9671f9b27e78131e0152d466c64b90 -MISC ChangeLog 16488 RMD160 33c6f40bbf17e83ed5013ad8786cf5b9cd62f18b SHA1 842c6f66854c08de9d7d27d1d923d9af1db37eab SHA256 e842614db3a9d4b49d11b5f0d2c7e53155e49283f355326744a6fe5b422772ad +MISC ChangeLog 16744 RMD160 3081accb04afdd6814c3cbd092083f88a87eab4d SHA1 bf278cd7833aabfdbac19583d7911705bb2223dd SHA256 190e449aeee822034e10ae2f2dadd146836176793135a76ac6bab983e7fc6787 MISC metadata.xml 308 RMD160 5221096ed0702ea4d028ec3d50563f26efb3a5d1 SHA1 b9a5499213f716b87953f225ba9d135cd6d51938 SHA256 740a533b21eefc9b8cd133e22b82e25a24415aafb53d78c4c5fa3d696fa099cf +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.9 (FreeBSD) + +iEYEARECAAYFAkmBUkoACgkQoAP6MIsfg8JU+QCaAmxGNsSvRMJaor7N2bFvQH+R +DakAn0bsUtSdgI38oe4PrpUMb9sKjaRh +=ifuX +-----END PGP SIGNATURE----- diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-7.1-strndup_bport.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-7.1-strndup_bport.patch new file mode 100644 index 000000000000..b4eab1e7ff49 --- /dev/null +++ b/sys-freebsd/freebsd-lib/files/freebsd-lib-7.1-strndup_bport.patch @@ -0,0 +1,151 @@ +Backport of strndup from -CURRENT. + +Fixes bugs 249731 and 256741. + +According to the manpage this will appear on 8.0, +so try to keep it around. +--- lib.orig/libc/string/Makefile.inc ++++ lib/libc/string/Makefile.inc +@@ -9,9 +9,9 @@ + MISRCS+=bcmp.c bcopy.c bzero.c ffs.c ffsl.c ffsll.c fls.c flsl.c flsll.c \ + index.c memccpy.c memchr.c memrchr.c memcmp.c \ + memcpy.c memmem.c memmove.c memset.c rindex.c stpcpy.c strcasecmp.c \ +- strcat.c strchr.c strcmp.c strcoll.c strcpy.c strcspn.c strdup.c \ +- strerror.c strlcat.c strlcpy.c strlen.c strmode.c strncat.c strncmp.c \ +- strncpy.c strcasestr.c strnstr.c \ ++ strcat.c strcasestr.c strchr.c strcmp.c strcoll.c strcpy.c strcspn.c \ ++ strdup.c strerror.c strlcat.c strlcpy.c strlen.c strmode.c strncat.c \ ++ strncmp.c strncpy.c strndup.c strnstr.c \ + strpbrk.c strrchr.c strsep.c strsignal.c strspn.c strstr.c strtok.c \ + strxfrm.c swab.c wcscat.c wcschr.c wcscmp.c wcscoll.c wcscpy.c \ + wcscspn.c wcsdup.c \ +@@ -47,6 +47,7 @@ + MLINKS+=strchr.3 strrchr.3 + MLINKS+=strcmp.3 strncmp.3 + MLINKS+=strcpy.3 stpcpy.3 ++MLINKS+=strdup.3 strndup.3 + MLINKS+=strcpy.3 strncpy.3 + MLINKS+=strerror.3 perror.3 strerror.3 sys_errlist.3 strerror.3 sys_nerr.3 + MLINKS+=strerror.3 strerror_r.3 +--- lib.orig/libc/string/Symbol.map ++++ lib/libc/string/Symbol.map +@@ -81,6 +81,7 @@ + ffsll; + flsll; + memrchr; ++ strndup; + }; + + FBSDprivate_1.0 { +--- lib.orig/libc/string/strdup.3 ++++ lib/libc/string/strdup.3 +@@ -32,7 +32,8 @@ + .Dt STRDUP 3 + .Os + .Sh NAME +-.Nm strdup ++.Nm strdup , ++.Nm strndup + .Nd save a copy of a string + .Sh LIBRARY + .Lb libc +@@ -40,6 +41,8 @@ + .In string.h + .Ft char * + .Fn strdup "const char *str" ++.Ft char * ++.Fn strndup "const char *str" "size_t len" + .Sh DESCRIPTION + The + .Fn strdup +@@ -56,6 +59,16 @@ + .Va errno + is set to + .Er ENOMEM . ++.Pp ++The ++.Fn strndup ++function copies at most ++.Fa len ++characters from the string ++.Fa str ++always ++.Dv NUL ++terminating the copied string. + .Sh SEE ALSO + .Xr free 3 , + .Xr malloc 3 +@@ -64,3 +77,7 @@ + .Fn strdup + function first appeared in + .Bx 4.4 . ++The ++.Fn strndup ++function was added in ++.Fx 8.0 . +--- lib.orig/libc/string/strndup.c ++++ lib/libc/string/strndup.c +@@ -0,0 +1,53 @@ ++/* $NetBSD: strndup.c,v 1.3 2007/01/14 23:41:24 cbiere Exp $ */ ++ ++/* ++ * Copyright (c) 1988, 1993 ++ * The Regents of the University of California. All rights reserved. ++ * ++ * Redistribution and use in source and binary forms, with or without ++ * modification, are permitted provided that the following conditions ++ * are met: ++ * 1. Redistributions of source code must retain the above copyright ++ * notice, this list of conditions and the following disclaimer. ++ * 2. Redistributions in binary form must reproduce the above copyright ++ * notice, this list of conditions and the following disclaimer in the ++ * documentation and/or other materials provided with the distribution. ++ * 4. Neither the name of the University nor the names of its contributors ++ * may be used to endorse or promote products derived from this software ++ * without specific prior written permission. ++ * ++ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND ++ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE ++ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ++ * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE ++ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL ++ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS ++ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) ++ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT ++ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY ++ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF ++ * SUCH DAMAGE. ++ */ ++ ++#include <sys/cdefs.h> ++__FBSDID("$FreeBSD: src/lib/libc/string/strndup.c,v 1.1.2.1 2009/01/08 09:50:20 kib Exp $"); ++ ++#include <stddef.h> ++#include <stdlib.h> ++#include <string.h> ++ ++char * ++strndup(const char *str, size_t n) ++{ ++ size_t len; ++ char *copy; ++ ++ for (len = 0; len < n && str[len]; len++) ++ continue; ++ ++ if ((copy = malloc(len + 1)) == NULL) ++ return (NULL); ++ memcpy(copy, str, len); ++ copy[len] = '\0'; ++ return (copy); ++} +--- include.orig/string.h ++++ include/string.h +@@ -96,6 +96,7 @@ + int strncmp(const char *, const char *, size_t) __pure; + char *strncpy(char * __restrict, const char * __restrict, size_t); + #if __BSD_VISIBLE ++char *strndup(const char *, size_t); + char *strnstr(const char *, const char *, size_t) __pure; + #endif + char *strpbrk(const char *, const char *) __pure; diff --git a/sys-freebsd/freebsd-lib/freebsd-lib-7.1-r1.ebuild b/sys-freebsd/freebsd-lib/freebsd-lib-7.1-r1.ebuild new file mode 100644 index 000000000000..442e08d776f7 --- /dev/null +++ b/sys-freebsd/freebsd-lib/freebsd-lib-7.1-r1.ebuild @@ -0,0 +1,360 @@ +# Copyright 1999-2009 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-7.1-r1.ebuild,v 1.1 2009/01/29 06:52:45 the_paya Exp $ + +inherit bsdmk freebsd flag-o-matic toolchain-funcs + +DESCRIPTION="FreeBSD's base system libraries" +SLOT="7.0" +KEYWORDS="~sparc-fbsd ~x86-fbsd" + +IUSE="atm bluetooth ssl hesiod ipv6 kerberos nis gpib build bootstrap crosscompile_opts_headers-only" + +# 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 ) + hesiod? ( net-dns/hesiod ) + 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}" -a "${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 hesiod || mymakeopts="${mymakeopts} NO_HESIOD_LIBC= " + 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= NO_LIBC_R=" + + 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.1-csu.patch + ${FILESDIR}/${PN}-6.2-bluetooth.patch + ${FILESDIR}/${PN}-new_as.patch + ${FILESDIR}/${PN}-7.0-CVE-2008-1391.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="ncurses + libz libbz2 libarchive \ + libsm libsmdb libsmutil \ + libbegemot libbsnmp \ + libpam libpcap bind libwrap libmagic \ + libcom_err libtelnet + libedit" + +src_unpack() { + freebsd_src_unpack + + sed -i.bak -e 's:-o/dev/stdout:-t:' "${S}/libc/net/Makefile.inc" + sed -i.bak -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.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}-7.1-strndup_bport.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 + + # Apply this patch for Gentoo/FreeBSD/SPARC64 to build correctly + # from catalyst, then don't do anything else + 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 + # Preinstall includes so we don't use the system's ones. + mkdir "${WORKDIR}/include_proper" || die "Couldn't create ${WORKDIR}/include_proper" + install_includes "/include_proper" + return 0 + fi + + if [ "${CTARGET}" = "${CHOST}" ]; 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 + + # Preinstall includes so we don't use the system's ones. + mkdir "${WORKDIR}/include_proper" || die "Couldn't create ${WORKDIR}/include_proper" + install_includes "/include_proper" + + # 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 +} + +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 "-isystem ${WORKDIR}/lib/libutil" + append-flags "-isystem ${WORKDIR}/lib/msun/${machine/i386/i387}" + append-flags "-B ${csudir}" + append-ldflags "-B ${csudir}" + + cd "${S}/libc" + $(freebsd_get_bmake) ${mymakeopts} || die "make libc failed" + 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}/include_proper'" + + cd "${S}" + NOFLAGSTRIP=yes freebsd_src_compile + fi +} + +src_install() { + [ "${CTARGET}" = "${CHOST}" ] \ + && INCLUDEDIR="/usr/include" \ + || INCLUDEDIR="/usr/${CTARGET}/usr/include" + dodir ${INCLUDEDIR} + einfo "Installing for ${CTARGET} in ${CHOST}.." + install_includes ${INCLUDEDIR} + + # 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 + if [ "${CTARGET}" != "${CHOST}" ] ; then + # This is to get it stripped with the correct tools, otherwise it gets + # stripped with the host strip. + export CHOST=${CTARGET} + return 0 + fi + + # Add symlinks (-> libthr) for legacy threading libraries, since these are + # not built by us (they are disabled in FreeBSD-7 anyway). + dosym libthr.a /usr/lib/libpthread.a + dosym libthr.so /usr/lib/libpthread.so + dosym libthr.a /usr/lib/libc_r.a + dosym libthr.so /usr/lib/libc_r.so + + # Add symlink (-> libthr) so previously built binaries still work. + dosym libthr.so.3 /lib/libpthread.so.2 + dosym libthr.so.3 /lib/libc_r.so.6 + + # Compatibility symlinks to run FreeBSD 5.x binaries (ABI is mostly + # identical, remove when problems will actually happen) + dosym /lib/libc.so.7 /usr/lib/libc.so.6 + dosym /lib/libc.so.6 /usr/lib/libc.so.5 + dosym /lib/libm.so.4 /usr/lib/libm.so.3 + dosym /lib/libm.so.5 /usr/lib/libm.so.4 + + # 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.${MACHINE}"/* + + dodir /etc/sandbox.d + + # Generate ldscripts, otherwise bad thigs are supposed to happen + gen_usr_ldscript libalias_cuseeme.so libalias_dummy.so libalias_ftp.so \ + libalias_irc.so libalias_nbt.so libalias_pptp.so libalias_skinny.so \ + libalias_smedia.so + # These show on QA warnings too, however they're pretty much bsd only, + # aka, no autotools for them. + # libbsdxml.so libcam.so libcrypt.so libdevstat.so libgeom.so \ + # libipsec.so libipx.so libkiconv.so libkvm.so libmd.so libsbuf.so libufs.so \ + # libutil.so + + 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 +} + +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" + + if [[ $(tc-arch-kernel) == "x86_64" ]]; then + local MACHINE="amd64" + else + local MACHINE="$(tc-arch-kernel)" + fi + + einfo "Installing includes into ${INCLUDEDIR} as ${BINOWN}:${BINGRP}..." + $(freebsd_get_bmake) installincludes \ + MACHINE=${MACHINE} DESTDIR="${DESTDIR}" \ + INCLUDEDIR="${INCLUDEDIR}" BINOWN="${BINOWN}" \ + BINGRP="${BINGRP}" || die "install_includes() failed" + einfo "includes installed ok." +} |