From ccf949c841fb08fec339abf524816dfc34525998 Mon Sep 17 00:00:00 2001 From: liyunfei Date: Fri, 11 Aug 2023 16:16:50 +0800 Subject: [PATCH] add clang compile support --- ostree.spec | 9 ++++++++- remove-specific-cc-in-automake.patch | 11 +++++++++++ 2 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 remove-specific-cc-in-automake.patch diff --git a/ostree.spec b/ostree.spec index cfe71dc..20e87af 100644 --- a/ostree.spec +++ b/ostree.spec @@ -1,7 +1,7 @@ #needsrootforbuild Name: ostree Version: 2023.5 -Release: 1 +Release: 2 Summary: A tool like git for operating system binaries License: LGPLv2+ URL: https://ostree.readthedocs.io/en/latest/ @@ -10,6 +10,7 @@ Source0: https://github.com/ostreedev/%{name}/releases/download/v%{versio Patch9000: Do-not-run-testcase-test-libarvhive-import-because-selinux-is-off.patch Patch9001: skip-updating-the-preference.patch Patch9002: skip-if-etc-mtab-is-not-a-symlink-of-proc-self-mounts.patch +Patch9003: remove-specific-cc-in-automake.patch BuildRequires: bison autoconf automake libtool gobject-introspection-devel pkgconfig(liblzma) docbook-xsl BuildRequires: pkgconfig(e2p) pkgconfig(zlib) pkgconfig(libcurl) pkgconfig(libsoup-2.4) gpgme-devel @@ -94,6 +95,12 @@ make check %{_mandir}/man*/{ostree,rofiles}*.gz %changelog +* Fri Aug 11 2023 liyunfei - 2023.5-2 +- Type:bugfix +- ID:NA +- SUG:NA +- DESC:add clang compile support + * Wed Jul 12 2023 jiangchuangang - 2023.5-1 - update to 2023.5 diff --git a/remove-specific-cc-in-automake.patch b/remove-specific-cc-in-automake.patch new file mode 100644 index 0000000..250e237 --- /dev/null +++ b/remove-specific-cc-in-automake.patch @@ -0,0 +1,11 @@ +diff -up libostree-2022.2/Makefile-libostree.am.orig2 libostree-2022.2/Makefile-libostree.am +--- libostree-2022.2/Makefile-libostree.am.orig2 2023-04-19 19:03:26.663366592 +0800 ++++ libostree-2022.2/Makefile-libostree.am 2023-04-19 19:03:48.391512904 +0800 +@@ -267,7 +267,4 @@ 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 -- Gitee