| 1 |
commit: c0c542fa48334cdbc3be019d30cb7b26927fe356 |
| 2 |
Author: Jonas Licht <jonas.licht <AT> fem <DOT> tu-ilmenau <DOT> de> |
| 3 |
AuthorDate: Fri Mar 26 11:29:06 2021 +0000 |
| 4 |
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Mar 31 06:28:56 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c0c542fa |
| 7 |
|
| 8 |
net-analyzer/openvas-scanner: fix build with lld |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/740560 |
| 11 |
Package-Manager: Portage-3.0.13, Repoman-3.0.2 |
| 12 |
Signed-off-by: Jonas Licht <jonas.licht <AT> fem.tu-ilmenau.de> |
| 13 |
Closes: https://github.com/gentoo/gentoo/pull/20124 |
| 14 |
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org> |
| 15 |
|
| 16 |
...penvas-scanner-7.0.1-fix-linking-with-lld.patch | 33 ++++++++++++++++++++++ |
| 17 |
.../openvas-scanner/openvas-scanner-20.8.1.ebuild | 1 + |
| 18 |
.../openvas-scanner/openvas-scanner-7.0.1.ebuild | 1 + |
| 19 |
3 files changed, 35 insertions(+) |
| 20 |
|
| 21 |
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 |
| 22 |
new file mode 100644 |
| 23 |
index 00000000000..2b31a7c7d22 |
| 24 |
--- /dev/null |
| 25 |
+++ b/net-analyzer/openvas-scanner/files/openvas-scanner-7.0.1-fix-linking-with-lld.patch |
| 26 |
@@ -0,0 +1,33 @@ |
| 27 |
+diff --git a/nasl/CMakeLists.txt b/nasl/CMakeLists.txt |
| 28 |
+index b594679c..adf9a221 100644 |
| 29 |
+--- a/nasl/CMakeLists.txt |
| 30 |
++++ b/nasl/CMakeLists.txt |
| 31 |
+@@ -87,6 +87,28 @@ endif (NOT KSBA) |
| 32 |
+ message (STATUS "Looking for pcap...") |
| 33 |
+ find_library (PCAP pcap) |
| 34 |
+ |
| 35 |
++message (STATUS "Looking for pcap... ${PCAP}") |
| 36 |
++if (NOT PCAP) |
| 37 |
++ message (SEND_ERROR "The pcap library is required.") |
| 38 |
++endif (NOT PCAP) |
| 39 |
++ |
| 40 |
++message (STATUS "Looking for pcap-config...") |
| 41 |
++find_program (PCAP_CONFIG pcap-config) |
| 42 |
++ |
| 43 |
++if (PCAP_CONFIG) |
| 44 |
++ message (STATUS "Looking for pcap-config... ${PCAP_CONFIG}") |
| 45 |
++ execute_process (COMMAND pcap-config --libs |
| 46 |
++ OUTPUT_VARIABLE PCAP_LDFLAGS |
| 47 |
++ OUTPUT_STRIP_TRAILING_WHITESPACE) |
| 48 |
++ execute_process (COMMAND pcap-config --cflags |
| 49 |
++ OUTPUT_VARIABLE PCAP_CFLAGS |
| 50 |
++ OUTPUT_STRIP_TRAILING_WHITESPACE) |
| 51 |
++else (PCAP_CONFIG) |
| 52 |
++ message (STATUS "pcap-config not found, using defaults...") |
| 53 |
++ set (PCAP_LDFLAGS "-L/usr/lib -lpcap") |
| 54 |
++ set (PCAP_CFLAGS "-I/usr/include") |
| 55 |
++endif (PCAP_CONFIG) |
| 56 |
++ |
| 57 |
+ find_library (GPGME gpgme) |
| 58 |
+ message (STATUS "Looking for gpgme... ${GPGME}") |
| 59 |
+ if (NOT GPGME) |
| 60 |
|
| 61 |
diff --git a/net-analyzer/openvas-scanner/openvas-scanner-20.8.1.ebuild b/net-analyzer/openvas-scanner/openvas-scanner-20.8.1.ebuild |
| 62 |
index 22bdb9fec93..5d4642e49c5 100644 |
| 63 |
--- a/net-analyzer/openvas-scanner/openvas-scanner-20.8.1.ebuild |
| 64 |
+++ b/net-analyzer/openvas-scanner/openvas-scanner-20.8.1.ebuild |
| 65 |
@@ -51,6 +51,7 @@ BDEPEND=" |
| 66 |
|
| 67 |
PATCHES=( |
| 68 |
"${FILESDIR}"/${PN}-7.0.1-disable-automagic-dep.patch |
| 69 |
+ "${FILESDIR}"/${PN}-7.0.1-fix-linking-with-lld.patch |
| 70 |
#qa fix for rpath |
| 71 |
"${FILESDIR}"/${P}-rpath-qa-fix.patch |
| 72 |
) |
| 73 |
|
| 74 |
diff --git a/net-analyzer/openvas-scanner/openvas-scanner-7.0.1.ebuild b/net-analyzer/openvas-scanner/openvas-scanner-7.0.1.ebuild |
| 75 |
index 1fc5a911179..6b20b2711f2 100644 |
| 76 |
--- a/net-analyzer/openvas-scanner/openvas-scanner-7.0.1.ebuild |
| 77 |
+++ b/net-analyzer/openvas-scanner/openvas-scanner-7.0.1.ebuild |
| 78 |
@@ -50,6 +50,7 @@ BDEPEND=" |
| 79 |
|
| 80 |
PATCHES=( |
| 81 |
"${FILESDIR}"/${P}-disable-automagic-dep.patch |
| 82 |
+ "${FILESDIR}"/${P}-fix-linking-with-lld.patch |
| 83 |
) |
| 84 |
|
| 85 |
BUILD_DIR="${WORKDIR}/${MY_PN}-${PV}_build" |
Archives