From 890ad7549f47f22f3673a8565a4c7b263d86b7f9 Mon Sep 17 00:00:00 2001 From: Javier Villavicencio Date: Thu, 5 Feb 2009 07:51:24 +0000 Subject: Do not build libelf. Fix /etc/ttys install. Package-Manager: portage-2.2_rc23/cvs/FreeBSD i386 --- sys-freebsd/freebsd-lib/ChangeLog | 8 +- sys-freebsd/freebsd-lib/Manifest | 13 +- sys-freebsd/freebsd-lib/freebsd-lib-7.1-r2.ebuild | 363 ++++++++++++++++++++++ 3 files changed, 382 insertions(+), 2 deletions(-) create mode 100644 sys-freebsd/freebsd-lib/freebsd-lib-7.1-r2.ebuild (limited to 'sys-freebsd') diff --git a/sys-freebsd/freebsd-lib/ChangeLog b/sys-freebsd/freebsd-lib/ChangeLog index 931d29ff0d2d..5c0df64e60d5 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-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog,v 1.64 2009/01/29 06:52:45 the_paya Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog,v 1.65 2009/02/05 07:51:24 the_paya Exp $ + +*freebsd-lib-7.1-r2 (05 Feb 2009) + + 05 Feb 2009; Javier Villavicencio + +freebsd-lib-7.1-r2.ebuild: + Do not build libelf. Also fixed the problem of not installing /etc/ttys. *freebsd-lib-7.1-r1 (29 Jan 2009) diff --git a/sys-freebsd/freebsd-lib/Manifest b/sys-freebsd/freebsd-lib/Manifest index f9d83670aff8..16ca1ab396f5 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 @@ -35,6 +38,14 @@ DIST freebsd-usbin-6.2.tar.bz2 2695872 RMD160 ea6104fcfbf6c0be511a80d0475e5a8f71 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 11547 RMD160 06c4fc87804cff8258afa8a0665d880c3101ad78 SHA1 2f32c62eaabd3bff6e3dcca0d402993a747e16e9 SHA256 ecddf1da2b0633899159bf6b1447ad5bb13b8d4ae2e652bda8b6922f14b7d45a +EBUILD freebsd-lib-7.1-r2.ebuild 11670 RMD160 f994ead0b7c0698ffdc63a410ea989245ce8f4e1 SHA1 264f589ed357b889778e27ddd012b9e2dab5448e SHA256 fbc26333b27a58c481e972446ea5bf5476690bc9f6cf69eca59289e7cc82f215 EBUILD freebsd-lib-7.1.ebuild 11397 RMD160 aebc0adb9b15756bad30f735c5be9387269b0588 SHA1 38f899896b420ee2c519e6afde6f2ec0ec8f4ec2 SHA256 7e5e7933ae52a1ebf7e58dce7cf8ea4b7b9671f9b27e78131e0152d466c64b90 -MISC ChangeLog 16744 RMD160 3081accb04afdd6814c3cbd092083f88a87eab4d SHA1 bf278cd7833aabfdbac19583d7911705bb2223dd SHA256 190e449aeee822034e10ae2f2dadd146836176793135a76ac6bab983e7fc6787 +MISC ChangeLog 16943 RMD160 13b9b9bb1f87deebe721bc89c9d61634dafc77f0 SHA1 889131f234a6e4e549b3a6c3eab7d48ee7cbbff3 SHA256 157b9b2f2da9fc3a633d46bc627896c59cab39933a79f8f5f7b5ac3ea9aa2e7b MISC metadata.xml 308 RMD160 5221096ed0702ea4d028ec3d50563f26efb3a5d1 SHA1 b9a5499213f716b87953f225ba9d135cd6d51938 SHA256 740a533b21eefc9b8cd133e22b82e25a24415aafb53d78c4c5fa3d696fa099cf +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.9 (FreeBSD) + +iEYEARECAAYFAkmKmosACgkQoAP6MIsfg8LcawCaA08G7znosWOEUOMWu3WSuhum +yvsAn2273b6Uz8SxI3lYL9Cnc+fGdMws +=VVxH +-----END PGP SIGNATURE----- diff --git a/sys-freebsd/freebsd-lib/freebsd-lib-7.1-r2.ebuild b/sys-freebsd/freebsd-lib/freebsd-lib-7.1-r2.ebuild new file mode 100644 index 000000000000..ee375fb26eb8 --- /dev/null +++ b/sys-freebsd/freebsd-lib/freebsd-lib-7.1-r2.ebuild @@ -0,0 +1,363 @@ +# 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-r2.ebuild,v 1.1 2009/02/05 07:51:24 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 libelf" + +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 + if [[ $(tc-arch-kernel) == "x86_64" ]]; then + local MACHINE="amd64" + else + local MACHINE="$(tc-arch-kernel)" + fi + 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 <