From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 19AFB158021 for ; Sat, 19 Nov 2022 01:44:33 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 42D3FE0826; Sat, 19 Nov 2022 01:44:32 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 27174E0826 for ; Sat, 19 Nov 2022 01:44:32 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id EA696341230 for ; Sat, 19 Nov 2022 01:44:30 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 54D6174E for ; Sat, 19 Nov 2022 01:44:29 +0000 (UTC) From: "Matt Turner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matt Turner" Message-ID: <1668822259.d2f4f02f49acb86e7281e5569db0a0922d5da1b4.mattst88@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: gnome-extra/libgda/ X-VCS-Repository: repo/gentoo X-VCS-Files: gnome-extra/libgda/libgda-5.2.9-r1.ebuild X-VCS-Directories: gnome-extra/libgda/ X-VCS-Committer: mattst88 X-VCS-Committer-Name: Matt Turner X-VCS-Revision: d2f4f02f49acb86e7281e5569db0a0922d5da1b4 X-VCS-Branch: master Date: Sat, 19 Nov 2022 01:44:29 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: f4dcb730-d3b6-47af-b060-ea317ca0d839 X-Archives-Hash: fc8a1c9a5b715040923412e50b0e4112 commit: d2f4f02f49acb86e7281e5569db0a0922d5da1b4 Author: James Le Cuirot gentoo org> AuthorDate: Sun Nov 13 14:10:39 2022 +0000 Commit: Matt Turner gentoo org> CommitDate: Sat Nov 19 01:44:19 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d2f4f02f gnome-extra/libgda: Detect BerkDB in the right way with configure flags Upstream has a proper way to do this without appending to CPPFLAGS. This method will even work when cross-compiling after db-use.eclass has been fixed. Signed-off-by: James Le Cuirot gentoo.org> Signed-off-by: Matt Turner gentoo.org> gnome-extra/libgda/libgda-5.2.9-r1.ebuild | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/gnome-extra/libgda/libgda-5.2.9-r1.ebuild b/gnome-extra/libgda/libgda-5.2.9-r1.ebuild index 3cb270db2bec..1aca92fcec07 100644 --- a/gnome-extra/libgda/libgda-5.2.9-r1.ebuild +++ b/gnome-extra/libgda/libgda-5.2.9-r1.ebuild @@ -4,7 +4,7 @@ EAPI=8 GNOME2_EAUTORECONF="yes" -inherit db-use flag-o-matic gnome2 java-pkg-opt-2 vala +inherit db-use gnome2 java-pkg-opt-2 vala DESCRIPTION="GNOME database access library" HOMEPAGE="https://www.gnome-db.org/" @@ -78,8 +78,6 @@ pkg_setup() { } src_prepare() { - use berkdb && append-cppflags "-I$(db_includedir)" - # They need python2 sed -e '/SUBDIRS =/ s/trml2html//' \ -e '/SUBDIRS =/ s/trml2pdf//' \ @@ -114,6 +112,15 @@ src_prepare() { } src_configure() { + local bdbroot bdbinc bdblib + + if use berkdb; then + bdbinc=$(db_includedir) + bdbroot=${bdbinc%/include/*} + bdbinc=${bdbinc#${bdbroot}/} + bdblib=$(get_libdir) + fi + use vala && vala_setup # Upstream broken configure handling for UI library introspection and vala bindings if passing a choice with use_enable - https://gitlab.gnome.org/GNOME/libgda/issues/158 @@ -123,7 +130,9 @@ src_configure() { --disable-default-binary \ --disable-static \ --enable-system-sqlite \ - $(use_with berkdb bdb /usr) \ + $(use_with berkdb bdb "${bdbroot}") \ + $(use_with berkdb bdb-includedir-name "${bdbinc}") \ + $(use_with berkdb bdb-libdir-name "${bdblib}") \ $(use_with canvas goocanvas) \ $(use_enable debug) \ $(use_with firebird firebird /usr) \