commit: 195d4c82c66a72c929422c18a979e61ef83bfe01 Author: LinuxUserGD <hugegameartgd <AT> gmail <DOT> com> AuthorDate: Sun Mar 10 16:00:27 2024 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Fri Mar 15 02:33:24 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=195d4c82
sys-libs/libapparmor: test compiler support of flto-partition flag [sam: Drop revbump.] [sam: Fix $() -> ${} in patch.] Closes: https://bugs.gentoo.org/919463 Upstream-PR: https://gitlab.com/apparmor/apparmor/-/merge_requests/1155 Upstream-Commit: https://gitlab.com/apparmor/apparmor/-/commit/d8bb0435c2b283fe9eed2a6db9a0b09ac2566c0e Signed-off-by: LinuxUserGD <hugegameartgd <AT> gmail.com> Closes: https://github.com/gentoo/gentoo/pull/29512 Closes: https://github.com/gentoo/gentoo/pull/35697 Signed-off-by: Sam James <sam <AT> gentoo.org> .../libapparmor-3.1.4-clang-flto-partition.patch | 33 ++++++++++++++++++++++ sys-libs/libapparmor/libapparmor-3.1.4-r1.ebuild | 4 +++ 2 files changed, 37 insertions(+) diff --git a/sys-libs/libapparmor/files/libapparmor-3.1.4-clang-flto-partition.patch b/sys-libs/libapparmor/files/libapparmor-3.1.4-clang-flto-partition.patch new file mode 100644 index 000000000000..6cb3528ea4db --- /dev/null +++ b/sys-libs/libapparmor/files/libapparmor-3.1.4-clang-flto-partition.patch @@ -0,0 +1,33 @@ +https://gitlab.com/apparmor/apparmor/-/commit/d8bb0435c2b283fe9eed2a6db9a0b09ac2566c0e +From d8bb0435c2b283fe9eed2a6db9a0b09ac2566c0e Mon Sep 17 00:00:00 2001 +From: John Johansen <j...@jjmx.net> +Date: Sun, 25 Feb 2024 03:31:01 +0000 +Subject: [PATCH] Merge makefiles: test for support of flto-partition flag +--- a/configure.ac ++++ b/configure.ac +@@ -92,6 +92,13 @@ if test "$ac_cv_prog_cc_c99" = "no"; then + AC_MSG_ERROR([C99 mode is required to build libapparmor]) + fi + ++EXTRA_CFLAGS="-Wall ${EXTRA_WARNINGS} -fPIC" ++AX_CHECK_COMPILE_FLAG([-flto-partition=none], , , [-Werror]) ++AS_VAR_IF([ax_cv_check_cflags__Werror__flto_partition_none], [yes], ++ [EXTRA_CFLAGS="$EXTRA_CFLAGS -flto-partition=none"] ++ ,) ++AC_SUBST([AM_CFLAGS], ["$EXTRA_CFLAGS"]) ++ + AC_OUTPUT( + Makefile + doc/Makefile +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -39,7 +39,6 @@ include $(COMMONDIR)/Make.rules + BUILT_SOURCES = grammar.h scanner.h af_protos.h + AM_LFLAGS = -v + AM_YFLAGS = -d -p aalogparse_ +-AM_CFLAGS = -Wall $(EXTRA_WARNINGS) -fPIC -flto-partition=none + AM_CPPFLAGS = -D_GNU_SOURCE -I$(top_srcdir)/include/ + scanner.h: scanner.l + $(LEX) -v $< +-- +GitLab diff --git a/sys-libs/libapparmor/libapparmor-3.1.4-r1.ebuild b/sys-libs/libapparmor/libapparmor-3.1.4-r1.ebuild index 0b01f9a89d00..30cc21d16aee 100644 --- a/sys-libs/libapparmor/libapparmor-3.1.4-r1.ebuild +++ b/sys-libs/libapparmor/libapparmor-3.1.4-r1.ebuild @@ -46,6 +46,10 @@ BDEPEND=" ) " +PATCHES=( + "${FILESDIR}"/${PN}-3.1.4-clang-flto-partition.patch +) + src_prepare() { default