From 7d087f9f781d2f5f27d23be030e23a07296fce42 Mon Sep 17 00:00:00 2001 From: wang--ge Date: Mon, 15 Apr 2024 10:41:05 +0800 Subject: [PATCH 1/2] revert cache gcc flag and diable cache compile --- ocaml.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/ocaml.spec b/ocaml.spec index 45147c1..8bb01ef 100644 --- a/ocaml.spec +++ b/ocaml.spec @@ -13,7 +13,7 @@ Name: ocaml Version: 4.14.1 -Release: 2 +Release: 3 Summary: OCaml compiler and programming environment License: LGPL-2.1-only URL: http://www.ocaml.org @@ -82,9 +82,9 @@ autoconf --force %build -export CC='ccache gcc' +export CC='gcc' export AS='as' -test -x "$(type -P {ccache,gcc} | xargs readlink -f)" && export CC="$_" +test -x "$(type -P gcc | xargs readlink -f)" && export CC="$_" test -x "$(type -P as | xargs readlink -f)" && export AS="$_" export ASPP="$CC -c" configure_target= @@ -248,6 +248,9 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/ocaml/eventlog_metadata %{_mandir}/man3/* %changelog +* Mon Apr 15 2024 Ge Wang - 4.14.1-3 +- revert cache gcc flag and disable cache compile + * Tue Apr 02 2024 yaoxin - 4.14.1-2 - Support ccache compile to fix build error -- Gitee From 8a42c7bd4c60f0816e46d9941fac95a1dde1308e Mon Sep 17 00:00:00 2001 From: wang--ge Date: Mon, 15 Apr 2024 11:46:06 +0800 Subject: [PATCH 2/2] disable ccache --- ocaml.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ocaml.spec b/ocaml.spec index 8bb01ef..64740da 100644 --- a/ocaml.spec +++ b/ocaml.spec @@ -81,10 +81,9 @@ autoconf --force %endif %build - +export CCACHE_DISABLE=1 export CC='gcc' export AS='as' -test -x "$(type -P gcc | xargs readlink -f)" && export CC="$_" test -x "$(type -P as | xargs readlink -f)" && export AS="$_" export ASPP="$CC -c" configure_target= @@ -105,6 +104,7 @@ bash -x tools/autogen %make_build opt %make_build opt.opt %endif +unset CCACHE_DISABLE %check cd testsuite @@ -249,7 +249,7 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/ocaml/eventlog_metadata %changelog * Mon Apr 15 2024 Ge Wang - 4.14.1-3 -- revert cache gcc flag and disable cache compile +- revert ccache gcc flag and disable cache compile * Tue Apr 02 2024 yaoxin - 4.14.1-2 - Support ccache compile to fix build error -- Gitee