diff options
| author |   orbea <orbea@riseup.net> | 2024-04-04 07:48:49 -0700 |
|---|---|---|
| committer |   Mike Gilbert <floppym@gentoo.org> | 2024-04-04 12:48:19 -0400 |
| commit | 971cbaa931df4aa0c40b10438808ed83d3a62879 (patch) | |
| tree | a706b8c6110b6273abda5b45baac4911d731830d | |
| parent | net-libs/nghttp2: Stabilize 1.61.0 arm, #928585 (diff) | |
| download | gentoo-971cbaa931df4aa0c40b10438808ed83d3a62879.tar.gz gentoo-971cbaa931df4aa0c40b10438808ed83d3a62879.tar.bz2 gentoo-971cbaa931df4aa0c40b10438808ed83d3a62879.zip | |
sys-libs/libcap-ng: link using libcap-ng.la
Closes: https://bugs.gentoo.org/928450
Upstream-PR: https://github.com/stevegrubb/libcap-ng/pull/52
Upstream-Commit: https://github.com/stevegrubb/libcap-ng/commit/75fe3714a8da28f0e2939c4402527782014401dd
Signed-off-by: orbea <orbea@riseup.net>
Signed-off-by: Mike Gilbert <floppym@gentoo.org>
| -rw-r--r-- | sys-libs/libcap-ng/files/libcap-ng-0.8.4-slibtool.patch | 32 | ||||
| -rw-r--r-- | sys-libs/libcap-ng/libcap-ng-0.8.4-r1.ebuild | 8 |
2 files changed, 37 insertions, 3 deletions
diff --git a/sys-libs/libcap-ng/files/libcap-ng-0.8.4-slibtool.patch b/sys-libs/libcap-ng/files/libcap-ng-0.8.4-slibtool.patch new file mode 100644 index 000000000000..d69f986875e3 --- /dev/null +++ b/sys-libs/libcap-ng/files/libcap-ng-0.8.4-slibtool.patch @@ -0,0 +1,32 @@ +https://github.com/stevegrubb/libcap-ng/commit/75fe3714a8da28f0e2939c4402527782014401dd +https://github.com/stevegrubb/libcap-ng/pull/52 + +From b7d21b473badb349bc0d6246b3804a8a2d329f36 Mon Sep 17 00:00:00 2001 +From: orbea <orbea@riseup.net> +Date: Wed, 3 Apr 2024 17:32:04 -0700 +Subject: [PATCH] utils: link using libcap-ng.la + +When linking internal dependencies that were linked using $(LIBTOOL) the +ideal method is to use the generated libtool archive (.la) file. This +fixes the build with slibtool which doesn't find -lcap-ng during the +build and explicitly requires the .la file to be used. + +Gentoo Issue: https://bugs.gentoo.org/928450 +Signed-off-by: orbea <orbea@riseup.net> +--- + utils/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/utils/Makefile.am b/utils/Makefile.am +index f430454..97aa021 100644 +--- a/utils/Makefile.am ++++ b/utils/Makefile.am +@@ -25,7 +25,7 @@ CONFIG_CLEAN_FILES = *.loT *.rej *.orig + AUTOMAKE_OPTIONS = no-dependencies + EXTRA_DIST = $(man_MANS) + AM_CPPFLAGS = -I${top_srcdir} -I${top_srcdir}/src +-LIBS = -L${top_builddir}/src -lcap-ng ++LDADD = ${top_builddir}/src/libcap-ng.la + AM_CFLAGS = -W -Wall -Wshadow ${WFLAGS} -Wundef -D_GNU_SOURCE + bin_PROGRAMS = pscap netcap filecap captest + man_MANS = pscap.8 netcap.8 filecap.8 captest.8 diff --git a/sys-libs/libcap-ng/libcap-ng-0.8.4-r1.ebuild b/sys-libs/libcap-ng/libcap-ng-0.8.4-r1.ebuild index f69c5049ed83..b2bf31f448fc 100644 --- a/sys-libs/libcap-ng/libcap-ng-0.8.4-r1.ebuild +++ b/sys-libs/libcap-ng/libcap-ng-0.8.4-r1.ebuild @@ -27,17 +27,19 @@ BDEPEND="python? ( >=dev-lang/swig-2 )" PATCHES=( "${FILESDIR}"/${P}-swig.patch + # https://bugs.gentoo.org/928450 + "${FILESDIR}"/${P}-slibtool.patch ) src_prepare() { default if use prefix ; then - sed -i "s@cat /usr@cat ${EPREFIX}/usr@" bindings/python*/Makefile.am || die # bug #668722 - eautomake + sed -i "s@cat /usr@cat ${EPREFIX}/usr@" bindings/python*/Makefile.am || die fi - elibtoolize + + eautoreconf } src_configure() { |