diff options
Diffstat (limited to 'sys-freebsd/freebsd-lib')
| -rw-r--r-- | sys-freebsd/freebsd-lib/ChangeLog | 9 | ||||
| -rw-r--r-- | sys-freebsd/freebsd-lib/files/digest-freebsd-lib-6.2-r2 | 24 | ||||
| -rw-r--r-- | sys-freebsd/freebsd-lib/files/freebsd-lib-6.2-dl_iterate_phdr.patch | 29 | ||||
| -rw-r--r-- | sys-freebsd/freebsd-lib/freebsd-lib-6.2-r2.ebuild | 277 |
4 files changed, 338 insertions, 1 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/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 +} |