commit: 6273f7c0c37bc0fae7071ec6237654796bdcca55 Author: Violet Purcell <vimproved <AT> inventati <DOT> org> AuthorDate: Mon May 8 04:34:02 2023 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Mon May 8 13:38:03 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6273f7c0
sys-apps/acl: Fix build with musl 1.2.4 Closes: https://bugs.gentoo.org/905910 Signed-off-by: Violet Purcell <vimproved <AT> inventati.org> Closes: https://github.com/gentoo/gentoo/pull/30925 Signed-off-by: Sam James <sam <AT> gentoo.org> .../acl/{acl-2.3.1.ebuild => acl-2.3.1-r2.ebuild} | 25 +++++++++++++-- sys-apps/acl/acl-2.3.1.ebuild | 6 +++- .../acl/files/acl-2.3.1-musl-1.2.4-lfs64-fix.patch | 37 ++++++++++++++++++++++ 3 files changed, 65 insertions(+), 3 deletions(-) diff --git a/sys-apps/acl/acl-2.3.1.ebuild b/sys-apps/acl/acl-2.3.1-r2.ebuild similarity index 58% copy from sys-apps/acl/acl-2.3.1.ebuild copy to sys-apps/acl/acl-2.3.1-r2.ebuild index 521af3d45354..887d476d910d 100644 --- a/sys-apps/acl/acl-2.3.1.ebuild +++ b/sys-apps/acl/acl-2.3.1-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -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=" @@ -20,6 +20,10 @@ RDEPEND=" DEPEND="${RDEPEND}" BDEPEND="nls? ( sys-devel/gettext )" +PATCHES=( + "${FILESDIR}/${PN}-2.3.1-musl-1.2.4-lfs64-fix.patch" +) + src_prepare() { default @@ -32,6 +36,23 @@ multilib_src_configure() { # bug #667372 filter-flags -flto* + # Broken with FORTIFY_SOURCE=3 + # Our toolchain sets F_S=2 by default w/ >= -O2, so we need + # to unset F_S first, then explicitly set 2, to negate any default + # and anything set by the user if they're choosing 3 (or if they've + # modified GCC to set 3). + # + # Refs: + # 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. + filter-flags -D_FORTIFY_SOURCE=3 + append-cppflags -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 + fi + local myeconfargs=( --bindir="${EPREFIX}"/bin $(use_enable static-libs static) diff --git a/sys-apps/acl/acl-2.3.1.ebuild b/sys-apps/acl/acl-2.3.1.ebuild index 521af3d45354..517cb13a2f4b 100644 --- a/sys-apps/acl/acl-2.3.1.ebuild +++ b/sys-apps/acl/acl-2.3.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -20,6 +20,10 @@ RDEPEND=" DEPEND="${RDEPEND}" BDEPEND="nls? ( sys-devel/gettext )" +PATCHES=( + "${FILESDIR}/${PN}-2.3.1-musl-1.2.4-lfs64-fix.patch" +) + src_prepare() { default diff --git a/sys-apps/acl/files/acl-2.3.1-musl-1.2.4-lfs64-fix.patch b/sys-apps/acl/files/acl-2.3.1-musl-1.2.4-lfs64-fix.patch new file mode 100644 index 000000000000..3b5d2c6babdc --- /dev/null +++ b/sys-apps/acl/files/acl-2.3.1-musl-1.2.4-lfs64-fix.patch @@ -0,0 +1,37 @@ +Bug: https://bugs.gentoo.org/905910 +Upstream Bug: https://savannah.nongnu.org/bugs/index.php?64162 + +From a9100afd77fea00b311f114a5a04108283aa681a Mon Sep 17 00:00:00 2001 +From: Violet Purcell <[email protected]> +Date: Mon, 8 May 2023 04:17:07 +0000 +Subject: [PATCH] musl 1.2.4 LFS64 removal fixes + +--- + tools/chacl.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/tools/chacl.c b/tools/chacl.c +index 525a7ff..8fff875 100644 +--- a/tools/chacl.c ++++ b/tools/chacl.c +@@ -320,7 +320,7 @@ walk_dir(acl_t acl, acl_t dacl, const char *fname) + { + int failed = 0; + DIR *dir; +- struct dirent64 *d; ++ struct dirent *d; + char *name; + + if ((dir = opendir(fname)) == NULL) { +@@ -332,7 +332,7 @@ walk_dir(acl_t acl, acl_t dacl, const char *fname) + return(0); /* got a file, not an error */ + } + +- while ((d = readdir64(dir)) != NULL) { ++ while ((d = readdir(dir)) != NULL) { + /* skip "." and ".." entries */ + if (strcmp(d->d_name, ".") == 0 || strcmp(d->d_name, "..") == 0) + continue; +-- +2.40.1 +
