mgorny 14/05/25 11:29:04 Modified: libnl-3.2.9999.ebuild ChangeLog Added: libnl-3.2.24-r1.ebuild Log: Enable multilib support. (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key EFB4464E!)
Revision Changes Path 1.6 dev-libs/libnl/libnl-3.2.9999.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libnl/libnl-3.2.9999.ebuild?rev=1.6&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libnl/libnl-3.2.9999.ebuild?rev=1.6&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libnl/libnl-3.2.9999.ebuild?r1=1.5&r2=1.6 Index: libnl-3.2.9999.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/dev-libs/libnl/libnl-3.2.9999.ebuild,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- libnl-3.2.9999.ebuild 3 May 2014 21:00:23 -0000 1.5 +++ libnl-3.2.9999.ebuild 25 May 2014 11:29:04 -0000 1.6 @@ -1,11 +1,11 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/libnl/libnl-3.2.9999.ebuild,v 1.5 2014/05/03 21:00:23 floppym Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/libnl/libnl-3.2.9999.ebuild,v 1.6 2014/05/25 11:29:04 mgorny Exp $ EAPI=5 PYTHON_COMPAT=( python2_{6,7} python3_{2,3,4} ) DISTUTILS_OPTIONAL=1 -inherit autotools distutils-r1 eutils git-r3 libtool multilib +inherit autotools distutils-r1 eutils git-r3 libtool multilib multilib-minimal DESCRIPTION="A collection of libraries providing APIs to netlink protocol based Linux kernel interfaces" HOMEPAGE="http://www.infradead.org/~tgr/libnl/"; @@ -17,7 +17,11 @@ KEYWORDS="" IUSE="static-libs python utils" -RDEPEND="python? ( ${PYTHON_DEPS} )" +RDEPEND="python? ( ${PYTHON_DEPS} ) + abi_x86_32? ( + !<=app-emulation/emul-linux-x86-baselibs-20140508-r5 + !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] + )" DEPEND="${RDEPEND} python? ( dev-lang/swig ) sys-devel/flex @@ -28,39 +32,67 @@ DOCS=( ChangeLog ) +MULTILIB_WRAPPED_HEADERS=( + # we do not install CLI stuff for non-native + /usr/include/libnl3/netlink/cli/addr.h + /usr/include/libnl3/netlink/cli/class.h + /usr/include/libnl3/netlink/cli/cls.h + /usr/include/libnl3/netlink/cli/ct.h + /usr/include/libnl3/netlink/cli/exp.h + /usr/include/libnl3/netlink/cli/link.h + /usr/include/libnl3/netlink/cli/neigh.h + /usr/include/libnl3/netlink/cli/qdisc.h + /usr/include/libnl3/netlink/cli/route.h + /usr/include/libnl3/netlink/cli/rule.h + /usr/include/libnl3/netlink/cli/tc.h + /usr/include/libnl3/netlink/cli/utils.h +) + src_prepare() { epatch "${FILESDIR}"/${PN}-1.1-vlan-header.patch epatch "${FILESDIR}"/${PN}-3.2.20-rtnl_tc_get_ops.patch epatch "${FILESDIR}"/${PN}-3.2.20-cache-api.patch eautoreconf + + if use python; then + cd "${S}"/python || die + distutils-r1_src_prepare + fi + + # out-of-source build broken + # https://github.com/thom311/libnl/pull/58 + multilib_copy_sources } -src_configure() { +multilib_src_configure() { econf \ --disable-silent-rules \ $(use_enable static-libs static) \ - $(use_enable utils cli) + $(multilib_native_use_enable utils cli) } -src_compile() { +multilib_src_compile() { default - if use python; then - cd "${S}"/python || die + if multilib_is_native_abi && use python; then + cd python || die distutils-r1_src_compile fi } -src_install() { - default +multilib_src_install() { + emake DESTDIR="${D}" install - if use python; then + if multilib_is_native_abi && use python; then # Unset DOCS= since distutils-r1.eclass interferes - DOCS='' - cd "${S}"/python || die + local DOCS=() + cd python || die distutils-r1_src_install fi +} - prune_libtool_files $(usex static-libs --modules --all) +multilib_src_install_all() { + einstalldocs + prune_libtool_files --modules } 1.209 dev-libs/libnl/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libnl/ChangeLog?rev=1.209&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libnl/ChangeLog?rev=1.209&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libnl/ChangeLog?r1=1.208&r2=1.209 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/dev-libs/libnl/ChangeLog,v retrieving revision 1.208 retrieving revision 1.209 diff -u -r1.208 -r1.209 --- ChangeLog 3 May 2014 21:00:23 -0000 1.208 +++ ChangeLog 25 May 2014 11:29:04 -0000 1.209 @@ -1,6 +1,12 @@ # ChangeLog for dev-libs/libnl # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/libnl/ChangeLog,v 1.208 2014/05/03 21:00:23 floppym Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/libnl/ChangeLog,v 1.209 2014/05/25 11:29:04 mgorny Exp $ + +*libnl-3.2.24-r1 (25 May 2014) + + 25 May 2014; Michał Górny <mgo...@gentoo.org> +libnl-3.2.24-r1.ebuild, + libnl-3.2.9999.ebuild: + Enable multilib support. 03 May 2014; Mike Gilbert <flop...@gentoo.org> libnl-3.2.24.ebuild, libnl-3.2.9999.ebuild: 1.1 dev-libs/libnl/libnl-3.2.24-r1.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libnl/libnl-3.2.24-r1.ebuild?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libnl/libnl-3.2.24-r1.ebuild?rev=1.1&content-type=text/plain Index: libnl-3.2.24-r1.ebuild =================================================================== # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-x86/dev-libs/libnl/libnl-3.2.24-r1.ebuild,v 1.1 2014/05/25 11:29:04 mgorny Exp $ EAPI=5 PYTHON_COMPAT=( python2_{6,7} python3_{2,3,4} ) DISTUTILS_OPTIONAL=1 inherit distutils-r1 eutils libtool multilib multilib-minimal NL_P=${P/_/-} DESCRIPTION="A collection of libraries providing APIs to netlink protocol based Linux kernel interfaces" HOMEPAGE="http://www.infradead.org/~tgr/libnl/"; SRC_URI=" http://www.infradead.org/~tgr/${PN}/files/${NL_P}.tar.gz " LICENSE="LGPL-2.1 utils? ( GPL-2 )" SLOT="3" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~ia64-linux ~x86-linux" IUSE="static-libs python utils" RDEPEND="python? ( ${PYTHON_DEPS} ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20140508-r5 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )" DEPEND="${RDEPEND} python? ( dev-lang/swig ) sys-devel/flex sys-devel/bison " REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" DOCS=( ChangeLog ) S=${WORKDIR}/${NL_P} MULTILIB_WRAPPED_HEADERS=( # we do not install CLI stuff for non-native /usr/include/libnl3/netlink/cli/addr.h /usr/include/libnl3/netlink/cli/class.h /usr/include/libnl3/netlink/cli/cls.h /usr/include/libnl3/netlink/cli/ct.h /usr/include/libnl3/netlink/cli/exp.h /usr/include/libnl3/netlink/cli/link.h /usr/include/libnl3/netlink/cli/neigh.h /usr/include/libnl3/netlink/cli/qdisc.h /usr/include/libnl3/netlink/cli/route.h /usr/include/libnl3/netlink/cli/rule.h /usr/include/libnl3/netlink/cli/tc.h /usr/include/libnl3/netlink/cli/utils.h ) src_prepare() { epatch "${FILESDIR}"/${PN}-1.1-vlan-header.patch epatch "${FILESDIR}"/${PN}-3.2.20-rtnl_tc_get_ops.patch epatch "${FILESDIR}"/${PN}-3.2.20-cache-api.patch elibtoolize if use python; then cd "${S}"/python || die distutils-r1_src_prepare fi # out-of-source build broken # https://github.com/thom311/libnl/pull/58 multilib_copy_sources } multilib_src_configure() { econf \ --disable-silent-rules \ $(use_enable static-libs static) \ $(multilib_native_use_enable utils cli) } multilib_src_compile() { default if multilib_is_native_abi && use python; then cd python || die distutils-r1_src_compile fi } multilib_src_install() { emake DESTDIR="${D}" install if multilib_is_native_abi && use python; then # Unset DOCS= since distutils-r1.eclass interferes local DOCS=() cd python || die distutils-r1_src_install fi } multilib_src_install_all() { einstalldocs prune_libtool_files --modules }
