diff options
| author |   Sam James <sam@gentoo.org> | 2023-06-23 06:34:19 +0100 |
|---|---|---|
| committer | Sam James <sam@gentoo.org> | 2023-06-23 06:34:52 +0100 |
| commit | 625905a0e2802ad82919f13508adb9c76eaa279f (patch) | |
| tree | da45ef9a9dd51ce85932382d0e2e1b40a0d546c4 /dev-util/ostree | |
| parent | dev-java/swt: add 4.28 (diff) | |
| download | gentoo-625905a0e2802ad82919f13508adb9c76eaa279f.tar.gz gentoo-625905a0e2802ad82919f13508adb9c76eaa279f.tar.bz2 gentoo-625905a0e2802ad82919f13508adb9c76eaa279f.zip | |
dev-util/ostree: respect CC w/ USE=introspection
Reported by block_iv on IRC.
Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'dev-util/ostree')
| -rw-r--r-- | dev-util/ostree/files/ostree-2023.3-dont-force-clang-introspection.patch | 14 | ||||
| -rw-r--r-- | dev-util/ostree/ostree-2023.3-r1.ebuild | 1 |
2 files changed, 15 insertions, 0 deletions
diff --git a/dev-util/ostree/files/ostree-2023.3-dont-force-clang-introspection.patch b/dev-util/ostree/files/ostree-2023.3-dont-force-clang-introspection.patch new file mode 100644 index 000000000000..c8f554ae69a0 --- /dev/null +++ b/dev-util/ostree/files/ostree-2023.3-dont-force-clang-introspection.patch @@ -0,0 +1,14 @@ +Clang has supported -fstack-clash-protection for a while now. +--- a/Makefile-libostree.am ++++ b/Makefile-libostree.am +@@ -266,10 +266,6 @@ libostree_1_la_CFLAGS += $(OT_DEP_LIBSODIUM_CFLAGS) + libostree_1_la_LIBADD += $(OT_DEP_LIBSODIUM_LIBS) + endif # USE_LIBSODIUM + +-# XXX: work around clang being passed -fstack-clash-protection which it doesn't understand +-# See: https://bugzilla.redhat.com/show_bug.cgi?id=1672012 +-INTROSPECTION_SCANNER_ENV = CC=gcc +- + if BUILDOPT_INTROSPECTION + OSTree-1.0.gir: libostree-1.la Makefile + OSTree_1_0_gir_EXPORT_PACKAGES = ostree-1 diff --git a/dev-util/ostree/ostree-2023.3-r1.ebuild b/dev-util/ostree/ostree-2023.3-r1.ebuild index ce6f430cb40f..3f15f173ee52 100644 --- a/dev-util/ostree/ostree-2023.3-r1.ebuild +++ b/dev-util/ostree/ostree-2023.3-r1.ebuild @@ -67,6 +67,7 @@ BDEPEND=" PATCHES=( "${FILESDIR}"/ostree-2023.3-libgpg-error-underlinked-lld.patch + "${FILESDIR}"/ostree-2023.3-dont-force-clang-introspection.patch ) src_prepare() { |