From 5f590b450d05371b425c11388ad1877b5761787f Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 7 Aug 2023 07:14:04 +0000 Subject: [PATCH] sys-apps/acl: Sync with Gentoo It's from Gentoo commit cc9abc19ceb0c3bb7d2632394c38f4772f490ca8. --- .../portage-stable/sys-apps/acl/acl-2.3.1-r1.ebuild | 6 ++---- .../portage-stable/sys-apps/acl/acl-2.3.1-r2.ebuild | 8 +++----- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/acl/acl-2.3.1-r1.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/acl/acl-2.3.1-r1.ebuild index c167d5b8ae..371710aeb2 100644 --- a/sdk_container/src/third_party/portage-stable/sys-apps/acl/acl-2.3.1-r1.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-apps/acl/acl-2.3.1-r1.ebuild @@ -3,7 +3,7 @@ EAPI=7 -inherit flag-o-matic libtool multilib-minimal usr-ldscript +inherit flag-o-matic libtool multilib-minimal toolchain-funcs usr-ldscript DESCRIPTION="Access control list utilities, libraries, and headers" HOMEPAGE="https://savannah.nongnu.org/projects/acl" @@ -42,9 +42,7 @@ multilib_src_configure() { # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=104964 # https://savannah.nongnu.org/bugs/index.php?62519 # bug #847280 - if is-flagq '-O[23]' || is-flagq '-Ofast' ; then - # We can't unconditionally do this b/c we fortify needs - # some level of optimisation. + if tc-enables-fortify-source ; then filter-flags -D_FORTIFY_SOURCE=3 append-cppflags -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 fi diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/acl/acl-2.3.1-r2.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/acl/acl-2.3.1-r2.ebuild index 0d5e8c7407..d89fd34d6a 100644 --- a/sdk_container/src/third_party/portage-stable/sys-apps/acl/acl-2.3.1-r2.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-apps/acl/acl-2.3.1-r2.ebuild @@ -3,7 +3,7 @@ EAPI=7 -inherit flag-o-matic libtool multilib-minimal usr-ldscript +inherit flag-o-matic libtool multilib-minimal toolchain-funcs usr-ldscript DESCRIPTION="Access control list utilities, libraries, and headers" HOMEPAGE="https://savannah.nongnu.org/projects/acl" @@ -11,7 +11,7 @@ SRC_URI="mirror://nongnu/${PN}/${P}.tar.xz" LICENSE="LGPL-2.1" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" IUSE="nls static-libs" RDEPEND=" @@ -46,9 +46,7 @@ multilib_src_configure() { # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=104964 # https://savannah.nongnu.org/bugs/index.php?62519 # bug #847280 - if is-flagq '-O[23]' || is-flagq '-Ofast' ; then - # We can't unconditionally do this b/c we fortify needs - # some level of optimisation. + if tc-enables-fortify-source ; then filter-flags -D_FORTIFY_SOURCE=3 append-cppflags -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 fi