diff options
| author |   Alexis Ballier <aballier@gentoo.org> | 2013-06-18 23:18:11 +0000 |
|---|---|---|
| committer | Alexis Ballier <aballier@gentoo.org> | 2013-06-18 23:18:11 +0000 |
| commit | d6cd072341f4788ef5061651a692364926508ab1 (patch) | |
| tree | f96ff6f6f1a4a211b38f5c9ab7a5ea4cfbd6999d /sys-freebsd | |
| parent | Build libstand here so that we can drop it from freebsd-lib. (diff) | |
| download | gentoo-2-d6cd072341f4788ef5061651a692364926508ab1.tar.gz gentoo-2-d6cd072341f4788ef5061651a692364926508ab1.tar.bz2 gentoo-2-d6cd072341f4788ef5061651a692364926508ab1.zip | |
Do not built libstand anymore and remove the now useless bootstrap useflag
(Portage version: 2.2.0_alpha180/cvs/Linux x86_64, signed Manifest commit with key 160F534A)
Diffstat (limited to 'sys-freebsd')
| -rw-r--r-- | sys-freebsd/freebsd-lib/ChangeLog | 5 | ||||
| -rw-r--r-- | sys-freebsd/freebsd-lib/freebsd-lib-9.1-r8.ebuild | 15 |
2 files changed, 12 insertions, 8 deletions
diff --git a/sys-freebsd/freebsd-lib/ChangeLog b/sys-freebsd/freebsd-lib/ChangeLog index 2c2c21192d35..d1e51535c376 100644 --- a/sys-freebsd/freebsd-lib/ChangeLog +++ b/sys-freebsd/freebsd-lib/ChangeLog @@ -1,6 +1,9 @@ # 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.181 2013/06/18 22:26:23 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog,v 1.182 2013/06/18 23:18:11 aballier Exp $ + + 18 Jun 2013; Alexis Ballier <aballier@gentoo.org> freebsd-lib-9.1-r8.ebuild: + Do not built libstand anymore and remove the now useless bootstrap useflag 18 Jun 2013; Alexis Ballier <aballier@gentoo.org> freebsd-lib-9.1-r8.ebuild: Simplify a bit get_subdirs and do not treat differently USE=build/-build for diff --git a/sys-freebsd/freebsd-lib/freebsd-lib-9.1-r8.ebuild b/sys-freebsd/freebsd-lib/freebsd-lib-9.1-r8.ebuild index 9eb7a6aa773c..ccd7d2e33949 100644 --- a/sys-freebsd/freebsd-lib/freebsd-lib-9.1-r8.ebuild +++ b/sys-freebsd/freebsd-lib/freebsd-lib-9.1-r8.ebuild @@ -1,6 +1,6 @@ # 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.3 2013/06/18 22:26:23 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.1-r8.ebuild,v 1.4 2013/06/18 23:18:11 aballier Exp $ EAPI=5 @@ -37,8 +37,7 @@ if [ "${CATEGORY#*cross-}" = "${CATEGORY}" ]; then !sys-freebsd/freebsd-headers" DEPEND="${RDEPEND} >=sys-devel/flex-2.5.31-r2 - =sys-freebsd/freebsd-sources-${RV}* - !bootstrap? ( app-arch/bzip2 )" + =sys-freebsd/freebsd-sources-${RV}*" else SRC_URI="${SRC_URI} mirror://gentoo/${SYS}.tar.bz2" @@ -56,7 +55,7 @@ if [ "${CTARGET}" = "${CHOST}" -a "${CATEGORY#*cross-}" != "${CATEGORY}" ]; then fi IUSE="atm bluetooth ssl hesiod ipv6 kerberos usb netware - build bootstrap crosscompile_opts_headers-only zfs + build crosscompile_opts_headers-only zfs userland_GNU userland_BSD multilib" pkg_setup() { @@ -106,6 +105,8 @@ PATCHES=( # - archiving libraries (have their own ebuild) # - sendmail libraries (they are installed by sendmail) # - SNMP library and dependency (have their own ebuilds) +# - libstand: static library, 32bits on amd64 used for boot0, we build it from +# boot0 instead. # # The rest are libraries we already have somewhere else because # they are contribution. @@ -119,7 +120,8 @@ REMOVE_SUBDIRS="ncurses \ libbegemot libbsnmp \ libpam libpcap bind libwrap libmagic \ libcom_err libtelnet - libelf libedit" + libelf libedit + libstand" # For doing multilib over multibuild.eclass MULTIBUILD_VARIANTS=( $(get_all_abis) ) @@ -191,10 +193,9 @@ src_prepare() { sed -i.bak -e 's:${INSTALL} -C:${INSTALL}:' "${WORKDIR}/include/Makefile" fi - 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. + cd "${S}" if use userland_GNU; then find . -name Makefile -exec sed -ibak 's/sed -i /sed -i/' {} \; fi |