From 9c2bc3d3efbf109de0eb1cbd3870bfda25563e8b Mon Sep 17 00:00:00 2001 From: Matthew Garrett Date: Tue, 5 Apr 2016 15:12:52 -0700 Subject: [PATCH] sys-libs/ldb: Build without Python We don't want Python in the production images, so hack the ldb build to avoid pulling it in. --- .../sys-libs/ldb/ldb-1.1.26.ebuild | 23 +++++-------------- 1 file changed, 6 insertions(+), 17 deletions(-) diff --git a/sdk_container/src/third_party/coreos-overlay/sys-libs/ldb/ldb-1.1.26.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-libs/ldb/ldb-1.1.26.ebuild index d22ca5e822..f1cd4a9326 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-libs/ldb/ldb-1.1.26.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/sys-libs/ldb/ldb-1.1.26.ebuild @@ -3,10 +3,8 @@ # $Id$ EAPI=6 -PYTHON_COMPAT=( python2_7 ) -PYTHON_REQ_USE="threads" -inherit python-single-r1 waf-utils multilib-minimal eutils +inherit waf-utils multilib-minimal eutils DESCRIPTION="An LDAP-like embedded database" HOMEPAGE="http://ldb.samba.org" @@ -19,13 +17,12 @@ IUSE="doc" RDEPEND="!elibc_FreeBSD? ( dev-libs/libbsd[${MULTILIB_USEDEP}] ) dev-libs/popt[${MULTILIB_USEDEP}] - >=sys-libs/talloc-2.1.5[python,${MULTILIB_USEDEP}] - >=sys-libs/tevent-0.9.27[python(+),${MULTILIB_USEDEP}] - >=sys-libs/tdb-1.3.8[python,${MULTILIB_USEDEP}] + >=sys-libs/talloc-2.1.5[${MULTILIB_USEDEP}] + >=sys-libs/tevent-0.9.27[${MULTILIB_USEDEP}] + >=sys-libs/tdb-1.3.8[${MULTILIB_USEDEP}] net-nds/openldap !!=net-fs/samba-4.0.0[ldb] - ${PYTHON_DEPS} " DEPEND="dev-libs/libxslt @@ -33,8 +30,6 @@ DEPEND="dev-libs/libxslt virtual/pkgconfig ${RDEPEND}" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - WAF_BINARY="${S}/buildtools/bin/waf" MULTILIB_WRAPPED_HEADERS=( /usr/include/pyldb.h ) @@ -43,10 +38,6 @@ PATCHES=( "${FILESDIR}"/${PN}-1.1.24-optional-python.patch ) -pkg_setup() { - python-single-r1_pkg_setup -} - src_prepare() { default multilib_copy_sources @@ -57,11 +48,9 @@ multilib_src_configure() { --disable-rpath \ --disable-rpath-install --bundled-libraries=NONE \ --with-modulesdir="${EPREFIX}"/usr/$(get_libdir)/samba \ - --builtin-libraries=NONE + --builtin-libraries=NONE \ + --disable-python ) - if ! multilib_is_native_abi; then - myconf+=( --disable-python ) - fi waf-utils_src_configure "${myconf[@]}" }