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 2E5FA13835A for ; Wed, 31 Mar 2021 06:31:54 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 60B19E082B; Wed, 31 Mar 2021 06:31:53 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 3881DE082B for ; Wed, 31 Mar 2021 06:31:53 +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 03814340C79 for ; Wed, 31 Mar 2021 06:31:50 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C693B4A5 for ; Wed, 31 Mar 2021 06:31:47 +0000 (UTC) From: "Joonas Niilola" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Joonas Niilola" Message-ID: <1617172136.c0c542fa48334cdbc3be019d30cb7b26927fe356.juippis@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-analyzer/openvas-scanner/, net-analyzer/openvas-scanner/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-analyzer/openvas-scanner/files/openvas-scanner-7.0.1-fix-linking-with-lld.patch net-analyzer/openvas-scanner/openvas-scanner-20.8.1.ebuild net-analyzer/openvas-scanner/openvas-scanner-7.0.1.ebuild X-VCS-Directories: net-analyzer/openvas-scanner/ net-analyzer/openvas-scanner/files/ X-VCS-Committer: juippis X-VCS-Committer-Name: Joonas Niilola X-VCS-Revision: c0c542fa48334cdbc3be019d30cb7b26927fe356 X-VCS-Branch: master Date: Wed, 31 Mar 2021 06:31:47 +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: 91050c65-8e2c-46bc-8bf8-b873b5938b68 X-Archives-Hash: 7a5003762d82368ff6840a42558b1619 commit: c0c542fa48334cdbc3be019d30cb7b26927fe356 Author: Jonas Licht fem tu-ilmenau de> AuthorDate: Fri Mar 26 11:29:06 2021 +0000 Commit: Joonas Niilola gentoo org> CommitDate: Wed Mar 31 06:28:56 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c0c542fa net-analyzer/openvas-scanner: fix build with lld Closes: https://bugs.gentoo.org/740560 Package-Manager: Portage-3.0.13, Repoman-3.0.2 Signed-off-by: Jonas Licht fem.tu-ilmenau.de> Closes: https://github.com/gentoo/gentoo/pull/20124 Signed-off-by: Joonas Niilola gentoo.org> ...penvas-scanner-7.0.1-fix-linking-with-lld.patch | 33 ++++++++++++++++++++++ .../openvas-scanner/openvas-scanner-20.8.1.ebuild | 1 + .../openvas-scanner/openvas-scanner-7.0.1.ebuild | 1 + 3 files changed, 35 insertions(+) diff --git a/net-analyzer/openvas-scanner/files/openvas-scanner-7.0.1-fix-linking-with-lld.patch b/net-analyzer/openvas-scanner/files/openvas-scanner-7.0.1-fix-linking-with-lld.patch new file mode 100644 index 00000000000..2b31a7c7d22 --- /dev/null +++ b/net-analyzer/openvas-scanner/files/openvas-scanner-7.0.1-fix-linking-with-lld.patch @@ -0,0 +1,33 @@ +diff --git a/nasl/CMakeLists.txt b/nasl/CMakeLists.txt +index b594679c..adf9a221 100644 +--- a/nasl/CMakeLists.txt ++++ b/nasl/CMakeLists.txt +@@ -87,6 +87,28 @@ endif (NOT KSBA) + message (STATUS "Looking for pcap...") + find_library (PCAP pcap) + ++message (STATUS "Looking for pcap... ${PCAP}") ++if (NOT PCAP) ++ message (SEND_ERROR "The pcap library is required.") ++endif (NOT PCAP) ++ ++message (STATUS "Looking for pcap-config...") ++find_program (PCAP_CONFIG pcap-config) ++ ++if (PCAP_CONFIG) ++ message (STATUS "Looking for pcap-config... ${PCAP_CONFIG}") ++ execute_process (COMMAND pcap-config --libs ++ OUTPUT_VARIABLE PCAP_LDFLAGS ++ OUTPUT_STRIP_TRAILING_WHITESPACE) ++ execute_process (COMMAND pcap-config --cflags ++ OUTPUT_VARIABLE PCAP_CFLAGS ++ OUTPUT_STRIP_TRAILING_WHITESPACE) ++else (PCAP_CONFIG) ++ message (STATUS "pcap-config not found, using defaults...") ++ set (PCAP_LDFLAGS "-L/usr/lib -lpcap") ++ set (PCAP_CFLAGS "-I/usr/include") ++endif (PCAP_CONFIG) ++ + find_library (GPGME gpgme) + message (STATUS "Looking for gpgme... ${GPGME}") + if (NOT GPGME) diff --git a/net-analyzer/openvas-scanner/openvas-scanner-20.8.1.ebuild b/net-analyzer/openvas-scanner/openvas-scanner-20.8.1.ebuild index 22bdb9fec93..5d4642e49c5 100644 --- a/net-analyzer/openvas-scanner/openvas-scanner-20.8.1.ebuild +++ b/net-analyzer/openvas-scanner/openvas-scanner-20.8.1.ebuild @@ -51,6 +51,7 @@ BDEPEND=" PATCHES=( "${FILESDIR}"/${PN}-7.0.1-disable-automagic-dep.patch + "${FILESDIR}"/${PN}-7.0.1-fix-linking-with-lld.patch #qa fix for rpath "${FILESDIR}"/${P}-rpath-qa-fix.patch ) diff --git a/net-analyzer/openvas-scanner/openvas-scanner-7.0.1.ebuild b/net-analyzer/openvas-scanner/openvas-scanner-7.0.1.ebuild index 1fc5a911179..6b20b2711f2 100644 --- a/net-analyzer/openvas-scanner/openvas-scanner-7.0.1.ebuild +++ b/net-analyzer/openvas-scanner/openvas-scanner-7.0.1.ebuild @@ -50,6 +50,7 @@ BDEPEND=" PATCHES=( "${FILESDIR}"/${P}-disable-automagic-dep.patch + "${FILESDIR}"/${P}-fix-linking-with-lld.patch ) BUILD_DIR="${WORKDIR}/${MY_PN}-${PV}_build"