[gentoo-commits] repo/gentoo:master commit in: dev-debug/sysdig/files/

2024-05-20 Thread Mike Gilbert 
commit: 637ef57e26304673bd422589a7892988e9312b78
Author: Holger Hoffstätte  applied-asynchrony  com>
AuthorDate: Sat Apr 13 13:24:16 2024 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Mon May 20 15:52:38 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=637ef57e

dev-debug/sysdig: add a missed  include on musl

Bug: https://bugs.gentoo.org/929227
Signed-off-by: Holger Hoffstätte  applied-asynchrony.com>
Signed-off-by: Mike Gilbert  gentoo.org>

 dev-debug/sysdig/files/0.29.3-libs-gcc13.patch | 13 +
 1 file changed, 13 insertions(+)

diff --git a/dev-debug/sysdig/files/0.29.3-libs-gcc13.patch 
b/dev-debug/sysdig/files/0.29.3-libs-gcc13.patch
index ce1a686cc65c..4fb4d52c1db4 100644
--- a/dev-debug/sysdig/files/0.29.3-libs-gcc13.patch
+++ b/dev-debug/sysdig/files/0.29.3-libs-gcc13.patch
@@ -26,3 +26,16 @@ index c15c13c..f9f9f45 100644
  #include 
  #include 
  #include 
+
+diff --git 
libs-e5c53d648f3c4694385bbe488e7d47eaa36c229a-orig/userspace/libsinsp/scap_open_exception.h
 
libs-e5c53d648f3c4694385bbe488e7d47eaa36c229a/userspace/libsinsp/scap_open_exception.h
+index 6877456..b6fa6be 100644
+--- 
libs-e5c53d648f3c4694385bbe488e7d47eaa36c229a-orig/userspace/libsinsp/scap_open_exception.h
 
libs-e5c53d648f3c4694385bbe488e7d47eaa36c229a/userspace/libsinsp/scap_open_exception.h
+@@ -17,6 +17,7 @@ limitations under the License.
+ #pragma once
+ 
+ #include "sinsp_exception.h"
++#include 
+ 
+ /*!
+   \brief Instances of this exception are thrown when calls to scap_open()

[gentoo-commits] repo/gentoo:master commit in: dev-debug/sysdig/, dev-debug/sysdig/files/

2024-05-20 Thread Mike Gilbert 
commit: 844fbd1e96beda0fb94ea06aba8f2618bfdad1f7
Author: Holger Hoffstätte  applied-asynchrony  com>
AuthorDate: Sat Apr 13 13:58:37 2024 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Mon May 20 15:52:38 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=844fbd1e

dev-debug/sysdig: don't try to link against libanl on musl

libanl is an empty stub library since glibc-2.34 and does not exist
on musl. Since sysdig uses c-ares and therefore does not even need
glibc's async name lookups, we can safely remove it when building
on musl.

Bug: https://bugs.gentoo.org/929227
Bug: https://bugs.gentoo.org/929907
Signed-off-by: Holger Hoffstätte  applied-asynchrony.com>
Closes: https://github.com/gentoo/gentoo/pull/36237
Signed-off-by: Mike Gilbert  gentoo.org>

 dev-debug/sysdig/files/0.29.3-libs-no-libanl.patch | 16 
 dev-debug/sysdig/sysdig-0.29.3-r2.ebuild   | 12 +---
 2 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/dev-debug/sysdig/files/0.29.3-libs-no-libanl.patch 
b/dev-debug/sysdig/files/0.29.3-libs-no-libanl.patch
new file mode 100644
index ..16563aee8ca0
--- /dev/null
+++ b/dev-debug/sysdig/files/0.29.3-libs-no-libanl.patch
@@ -0,0 +1,16 @@
+
+Remove libanl from list of linked libraries as it is not needed at all
+and does not exist on musl.
+
+--- 
libs-e5c53d648f3c4694385bbe488e7d47eaa36c229a/userspace/libsinsp/CMakeLists.txt~
   2022-03-25 09:50:03.0 +
 
libs-e5c53d648f3c4694385bbe488e7d47eaa36c229a/userspace/libsinsp/CMakeLists.txt 
   2024-04-13 13:40:53.40196 +
+@@ -230,8 +230,7 @@ if(NOT WIN32)
+ 
+   if(NOT MUSL_OPTIMIZED_BUILD)
+   list(APPEND SINSP_LIBRARIES
+-  rt
+-  anl)
++  rt)
+   endif()
+ 
+   else()

diff --git a/dev-debug/sysdig/sysdig-0.29.3-r2.ebuild 
b/dev-debug/sysdig/sysdig-0.29.3-r2.ebuild
index 7262049544d9..64902719ed6b 100644
--- a/dev-debug/sysdig/sysdig-0.29.3-r2.ebuild
+++ b/dev-debug/sysdig/sysdig-0.29.3-r2.ebuild
@@ -46,9 +46,15 @@ DEPEND="${RDEPEND}
 PDEPEND="modules? ( =dev-debug/scap-driver-${PV}* )"
 
 src_prepare() {
-   # manually apply patch to falcosecurity-libs dependency
-   pushd "${WORKDIR}" && \
-   eapply -p0 "${FILESDIR}/${PV}-libs-gcc13.patch" && \
+   # manually apply patches to falcosecurity-libs dependency
+   pushd "${WORKDIR}"
+   # gcc13 needs explicit 
+   eapply -p0 "${FILESDIR}/${PV}-libs-gcc13.patch" || die
+
+   # musl has no libanl (#929227)
+   if [ ${ELIBC} == "musl" ] ; then
+   eapply -p0 "${FILESDIR}/${PV}-libs-no-libanl.patch" || 
die
+   fi
popd
 
# force C++14 standard for libs & main

[gentoo-commits] repo/gentoo:master commit in: dev-debug/sysdig/

2024-05-20 Thread Mike Gilbert 
commit: 429ad433252c9bc4ecf8e20c756e84d9c0ec6874
Author: Holger Hoffstätte  applied-asynchrony  com>
AuthorDate: Sat Apr 13 13:23:27 2024 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Mon May 20 15:52:35 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=429ad433

dev-debug/sysdig: add missing libelf dependency

Noticed while building in a clean chroot.

Signed-off-by: Holger Hoffstätte  applied-asynchrony.com>
Signed-off-by: Mike Gilbert  gentoo.org>

 dev-debug/sysdig/sysdig-0.29.3-r2.ebuild | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/dev-debug/sysdig/sysdig-0.29.3-r2.ebuild 
b/dev-debug/sysdig/sysdig-0.29.3-r2.ebuild
index c4d7a6199eb2..7262049544d9 100644
--- a/dev-debug/sysdig/sysdig-0.29.3-r2.ebuild
+++ b/dev-debug/sysdig/sysdig-0.29.3-r2.ebuild
@@ -34,7 +34,8 @@ RDEPEND="${LUA_DEPS}
net-libs/grpc:=
net-misc/curl
sys-libs/ncurses:=
-   sys-libs/zlib:="
+   sys-libs/zlib:=
+   virtual/libelf:="
 
 DEPEND="${RDEPEND}
dev-cpp/nlohmann_json