public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Sergey Popov" <pinkbyte@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: net-proxy/squidguard/
Date: Tue,  8 Dec 2020 12:49:06 +0000 (UTC)	[thread overview]
Message-ID: <1607431743.8135845b8bc6721e7537e46f7033537cf9ac30f6.pinkbyte@gentoo> (raw)

commit:     8135845b8bc6721e7537e46f7033537cf9ac30f6
Author:     Sergey Popov <pinkbyte <AT> gentoo <DOT> org>
AuthorDate: Tue Dec  8 12:45:34 2020 +0000
Commit:     Sergey Popov <pinkbyte <AT> gentoo <DOT> 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 <ago <AT> gentoo.org>
Closes: https://bugs.gentoo.org/731680
Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Sergey Popov <pinkbyte <AT> 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


             reply	other threads:[~2020-12-08 12:49 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-12-08 12:49 Sergey Popov [this message]
  -- strict thread matches above, loose matches on Subject: below --
2020-03-09 12:48 [gentoo-commits] repo/gentoo:master commit in: net-proxy/squidguard/ Agostino Sarubbo
2020-03-09 12:42 Agostino Sarubbo
2020-03-09 12:39 Agostino Sarubbo
2020-03-09 11:17 Agostino Sarubbo
2020-03-08 16:58 Sergey Popov
2020-01-22 11:57 Sergey Popov
2017-05-12  9:20 Sergey Popov
2016-07-05 15:27 Jeroen Roovers
2015-11-13  9:42 Agostino Sarubbo
2015-10-12 13:31 Sergey Popov
2015-10-12 13:31 Sergey Popov

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1607431743.8135845b8bc6721e7537e46f7033537cf9ac30f6.pinkbyte@gentoo \
    --to=pinkbyte@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox