From 025ef72b9974d6dab28db0e139dc18385a0d5103 Mon Sep 17 00:00:00 2001 From: starlet-dx <15929766099@163.com> Date: Tue, 2 Apr 2024 14:12:00 +0800 Subject: [PATCH 1/3] Support ccache compile to fix build error --- ocaml.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/ocaml.spec b/ocaml.spec index 2a9252f..45147c1 100644 --- a/ocaml.spec +++ b/ocaml.spec @@ -13,7 +13,7 @@ Name: ocaml Version: 4.14.1 -Release: 1 +Release: 2 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='gcc' +export CC='ccache gcc' export AS='as' -test -x "$(type -P gcc | xargs readlink -f)" && export CC="$_" +test -x "$(type -P {ccache,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 +* Tue Apr 02 2024 yaoxin - 4.14.1-2 +- Support ccache compile to fix build error + * Fri Feb 2 2024 Jingwiw - 4.14.1-1 - Upgrade version to 4.14.1 -- Gitee From 742a0993e3dfecbd5d6e796b7f72c8267f05d39f Mon Sep 17 00:00:00 2001 From: caodongxia <315816521@qq.com> Date: Tue, 16 Apr 2024 06:15:08 +0000 Subject: [PATCH 2/3] =?UTF-8?q?=E5=9B=9E=E9=80=80=20'Pull=20Request=20!54?= =?UTF-8?q?=20:=20Support=20ccache=20compile=20to=20fix=20build=20error'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ocaml.spec | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/ocaml.spec b/ocaml.spec index 45147c1..2a9252f 100644 --- a/ocaml.spec +++ b/ocaml.spec @@ -13,7 +13,7 @@ Name: ocaml Version: 4.14.1 -Release: 2 +Release: 1 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,9 +248,6 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/ocaml/eventlog_metadata %{_mandir}/man3/* %changelog -* Tue Apr 02 2024 yaoxin - 4.14.1-2 -- Support ccache compile to fix build error - * Fri Feb 2 2024 Jingwiw - 4.14.1-1 - Upgrade version to 4.14.1 -- Gitee From 2d5cd6564da67c246e3fa7dbeb0ec4eea96adc58 Mon Sep 17 00:00:00 2001 From: yueyuankun Date: Sat, 11 May 2024 15:05:54 +0800 Subject: [PATCH 3/3] replace openEuler with macro vendor --- ocaml.spec | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/ocaml.spec b/ocaml.spec index 2a9252f..1b7cb7c 100644 --- a/ocaml.spec +++ b/ocaml.spec @@ -13,7 +13,7 @@ Name: ocaml Version: 4.14.1 -Release: 1 +Release: 2 Summary: OCaml compiler and programming environment License: LGPL-2.1-only URL: http://www.ocaml.org @@ -26,7 +26,7 @@ Patch0003: 0003-configure-Remove-incorrect-assumption-about-cross-co.patch BuildRequires: gcc binutils-devel ncurses-devel gdbm-devel gawk perl-interpreter BuildRequires: util-linux chrpath autoconf annobin make -Requires: gcc util-linux openEuler-rpm-config +Requires: gcc util-linux %{_vendor}-rpm-config Provides: bundled(md5-plumb) ocaml(runtime) = %{version} Provides: ocaml(compiler) = %{version} @@ -114,7 +114,7 @@ make -j1 all ||: make install DESTDIR=$RPM_BUILD_ROOT perl -pi -e "s|^%{buildroot}||" %{buildroot}%{_libdir}/ocaml/ld.conf -echo %{version} > %{buildroot}%{_libdir}/ocaml/openEuler-ocaml-release +echo %{version} > %{buildroot}%{_libdir}/ocaml/%{_vendor}-ocaml-release chrpath --delete %{buildroot}%{_libdir}/ocaml/stublibs/*.so @@ -213,7 +213,7 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/ocaml/eventlog_metadata %dir %{_libdir}/ocaml/threads %{_libdir}/ocaml/threads/*.cmi %{_libdir}/ocaml/threads/*.cma -%{_libdir}/ocaml/openEuler-ocaml-release +%{_libdir}/ocaml/%{_vendor}-ocaml-release #ocamldoc @@ -248,6 +248,9 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/ocaml/eventlog_metadata %{_mandir}/man3/* %changelog +* Mon Apr 15 2024 yueyuankun - 4.14.1-2 +- Replace openEuler with vendor macros + * Fri Feb 2 2024 Jingwiw - 4.14.1-1 - Upgrade version to 4.14.1 -- Gitee