commit: c0c542fa48334cdbc3be019d30cb7b26927fe356 Author: Jonas Licht <jonas.licht <AT> fem <DOT> tu-ilmenau <DOT> de> AuthorDate: Fri Mar 26 11:29:06 2021 +0000 Commit: Joonas Niilola <juippis <AT> gentoo <DOT> 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 <jonas.licht <AT> fem.tu-ilmenau.de> Closes: https://github.com/gentoo/gentoo/pull/20124 Signed-off-by: Joonas Niilola <juippis <AT> 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"
