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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 190B11382C5 for ; Tue, 8 Dec 2020 12:49:10 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4FFCDE0871; Tue, 8 Dec 2020 12:49:09 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 33F34E0871 for ; Tue, 8 Dec 2020 12:49:09 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B483E340D23 for ; Tue, 8 Dec 2020 12:49:07 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6849646C for ; Tue, 8 Dec 2020 12:49:06 +0000 (UTC) From: "Sergey Popov" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sergey Popov" Message-ID: <1607431743.8135845b8bc6721e7537e46f7033537cf9ac30f6.pinkbyte@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-proxy/squidguard/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-proxy/squidguard/squidguard-1.6.0.ebuild X-VCS-Directories: net-proxy/squidguard/ X-VCS-Committer: pinkbyte X-VCS-Committer-Name: Sergey Popov X-VCS-Revision: 8135845b8bc6721e7537e46f7033537cf9ac30f6 X-VCS-Branch: master Date: Tue, 8 Dec 2020 12:49:06 +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: 7bdde0cf-e12d-44fd-8aa9-ca9ca6c2dd68 X-Archives-Hash: ce9a39e5e14e70150ae853be3fb6a038 commit: 8135845b8bc6721e7537e46f7033537cf9ac30f6 Author: Sergey Popov gentoo org> AuthorDate: Tue Dec 8 12:45:34 2020 +0000 Commit: Sergey Popov gentoo org> CommitDate: Tue Dec 8 12:49:03 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8135845b net-proxy/squidguard: fix building with clang Also correct build-time dependencies Reported-by: Agostino Sarubbo gentoo.org> Closes: https://bugs.gentoo.org/731680 Package-Manager: Portage-3.0.9, Repoman-3.0.2 Signed-off-by: Sergey Popov gentoo.org> net-proxy/squidguard/squidguard-1.6.0.ebuild | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/net-proxy/squidguard/squidguard-1.6.0.ebuild b/net-proxy/squidguard/squidguard-1.6.0.ebuild index c4bce1009a7..a811dda736c 100644 --- a/net-proxy/squidguard/squidguard-1.6.0.ebuild +++ b/net-proxy/squidguard/squidguard-1.6.0.ebuild @@ -24,9 +24,12 @@ RDEPEND=" ) ldap? ( net-nds/openldap:0 )" -DEPEND="${RDEPEND} +DEPEND="${RDEPEND}" + +BDEPEND=" sys-devel/bison:0 - sys-devel/flex:0" + sys-devel/flex:0 +" suitable_db_version() { local tested_slots="5.3 4.8" @@ -45,8 +48,12 @@ src_prepare() { "${FILESDIR}/${P}-gcc-10.patch" # Link only with specific BerkDB versions + # Do not inject default paths for library searching db_version="$(suitable_db_version)" - sed -i -e "/\$LIBS -ldb/s/-ldb/-l$(db_libname ${db_version})/" configure.ac || die + sed -i \ + -e "/\$LIBS -ldb/s/-ldb/-l$(db_libname ${db_version})/" \ + -e '/$LDFLAGS $db_lib $ldap_lib/d' \ + configure.ac || die eapply_user eautoreconf