Return-Path: Received: from swift.blarg.de (swift.blarg.de [78.47.110.205]) by mail.openembedded.org (Postfix) with ESMTP id 3ED7379708 for ; Tue, 18 Sep 2018 09:12:54 +0000 (UTC) Received: from heron.blarg.de (p3EE2FF12.dip0.t-ipconnect.de [62.226.255.18]) (Authenticated sender: max) by swift.blarg.de (Postfix) with ESMTPSA id E966A220510; Tue, 18 Sep 2018 11:12:54 +0200 (CEST) From: Max Kellermann To: openembedded-devel@lists.openembedded.org Date: Tue, 18 Sep 2018 11:12:44 +0200 Message-Id: <20180918091244.3569-2-max+openembedded@blarg.de> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180918091244.3569-1-max+openembedded@blarg.de> References: <20180918091244.3569-1-max+openembedded@blarg.de> Cc: Max Kellermann Subject: [PATCH 2/2] [oe-core] libsolv: make rpm optional X-BeenThere: openembedded-devel@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Using the OpenEmbedded metadata to build Distributions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 18 Sep 2018 09:12:54 -0000 From: Max Kellermann Signed-off-by: Max Kellermann --- meta/recipes-extended/libsolv/libsolv_0.6.35.bb | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/meta/recipes-extended/libsolv/libsolv_0.6.35.bb b/meta/recipes-extended/libsolv/libsolv_0.6.35.bb index 0956453022..12dfc5d3a2 100644 --- a/meta/recipes-extended/libsolv/libsolv_0.6.35.bb +++ b/meta/recipes-extended/libsolv/libsolv_0.6.35.bb @@ -5,7 +5,7 @@ SECTION = "devel" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE.BSD;md5=62272bd11c97396d4aaf1c41bc11f7d8" -DEPENDS = "expat zlib rpm" +DEPENDS = "expat zlib" SRC_URI = "git://github.com/openSUSE/libsolv.git" SRC_URI_append_libc-musl = " file://0001-Add-fallback-fopencookie-implementation.patch \ @@ -19,7 +19,10 @@ S = "${WORKDIR}/git" inherit cmake -EXTRA_OECMAKE = "-DLIB=${baselib} -DMULTI_SEMANTICS=ON -DENABLE_RPMMD=ON -DENABLE_RPMDB=ON -DENABLE_COMPLEX_DEPS=ON" +PACKAGECONFIG ??= "rpm" +PACKAGECONFIG[rpm] = "-DENABLE_RPMMD=ON -DENABLE_RPMDB=ON,,rpm" + +EXTRA_OECMAKE = "-DLIB=${baselib} -DMULTI_SEMANTICS=ON -DENABLE_COMPLEX_DEPS=ON" PACKAGES =+ "${PN}-tools ${PN}ext" -- 2.18.0