From 55627de9641f73ba90c6141e79d69eb868b18342 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 29 Jul 2024 07:20:09 +0000 Subject: [PATCH] sys-libs/libsepol: Sync with Gentoo It's from Gentoo commit 323492b796511ad4cc8ae5c69ebef20810200f60. --- .../sys-libs/libsepol/libsepol-3.7.ebuild | 19 ++++++++++++------- .../sys-libs/libsepol/libsepol-9999.ebuild | 19 ++++++++++++------- 2 files changed, 24 insertions(+), 14 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/sys-libs/libsepol/libsepol-3.7.ebuild b/sdk_container/src/third_party/portage-stable/sys-libs/libsepol/libsepol-3.7.ebuild index 4cb9db6305..95aea8cbaf 100644 --- a/sdk_container/src/third_party/portage-stable/sys-libs/libsepol/libsepol-3.7.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-libs/libsepol/libsepol-3.7.ebuild @@ -23,6 +23,7 @@ fi LICENSE="GPL-2" SLOT="0/2" +IUSE="+static-libs" # tests are not meant to be run outside of the full SELinux userland repo RESTRICT="test" @@ -32,19 +33,23 @@ src_prepare() { multilib_copy_sources } +my_make() { + emake \ + PREFIX="${EPREFIX}/usr" \ + LIBDIR="\$(PREFIX)/$(get_libdir)" \ + SHLIBDIR="${EPREFIX}/$(get_libdir)" \ + "${@}" +} + multilib_src_compile() { tc-export CC AR RANLIB local -x CFLAGS="${CFLAGS} -fno-semantic-interposition" - emake \ - LIBDIR="\$(PREFIX)/$(get_libdir)" \ - SHLIBDIR="/$(get_libdir)" + my_make } multilib_src_install() { - emake DESTDIR="${D}" \ - LIBDIR="\$(PREFIX)/$(get_libdir)" \ - SHLIBDIR="/$(get_libdir)" \ - install + my_make DESTDIR="${D}" install + use static-libs || rm "${ED}"/usr/$(get_libdir)/*.a || die } diff --git a/sdk_container/src/third_party/portage-stable/sys-libs/libsepol/libsepol-9999.ebuild b/sdk_container/src/third_party/portage-stable/sys-libs/libsepol/libsepol-9999.ebuild index 4cb9db6305..95aea8cbaf 100644 --- a/sdk_container/src/third_party/portage-stable/sys-libs/libsepol/libsepol-9999.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-libs/libsepol/libsepol-9999.ebuild @@ -23,6 +23,7 @@ fi LICENSE="GPL-2" SLOT="0/2" +IUSE="+static-libs" # tests are not meant to be run outside of the full SELinux userland repo RESTRICT="test" @@ -32,19 +33,23 @@ src_prepare() { multilib_copy_sources } +my_make() { + emake \ + PREFIX="${EPREFIX}/usr" \ + LIBDIR="\$(PREFIX)/$(get_libdir)" \ + SHLIBDIR="${EPREFIX}/$(get_libdir)" \ + "${@}" +} + multilib_src_compile() { tc-export CC AR RANLIB local -x CFLAGS="${CFLAGS} -fno-semantic-interposition" - emake \ - LIBDIR="\$(PREFIX)/$(get_libdir)" \ - SHLIBDIR="/$(get_libdir)" + my_make } multilib_src_install() { - emake DESTDIR="${D}" \ - LIBDIR="\$(PREFIX)/$(get_libdir)" \ - SHLIBDIR="/$(get_libdir)" \ - install + my_make DESTDIR="${D}" install + use static-libs || rm "${ED}"/usr/$(get_libdir)/*.a || die }