!68 Sync master release

From: @wk333 
Reviewed-by: @lyn1001 
Signed-off-by: @lyn1001

0001-Don-t-add-rpaths-to-libraries.patch

@@ -8,13 +8,13 @@ Subject: [PATCH 1/3] Don't add rpaths to libraries.
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/utils/config.mlp b/utils/config.mlp
-index bbb3c5694..57d509cd0 100644
+index f758a9b..ee17a73 100644
 --- a/utils/config.mlp
 +++ b/utils/config.mlp
-@@ -55,8 +55,8 @@ let native_c_compiler =
+@@ -54,8 +54,8 @@ let native_c_compiler =
+   c_compiler ^ " " ^ ocamlopt_cflags ^ " " ^ ocamlopt_cppflags
  let native_c_libraries = "%%NATIVECCLIBS%%"
  let native_pack_linker = "%%PACKLD%%"
- let ranlib = "%%RANLIBCMD%%"
 -let default_rpath = "%%RPATH%%"
 -let mksharedlibrpath = "%%MKSHAREDLIBRPATH%%"
 +let default_rpath = ""
@@ -22,6 +22,7 @@ index bbb3c5694..57d509cd0 100644
  let ar = "%%ARCMD%%"
  let supports_shared_libraries = %%SUPPORTS_SHARED_LIBRARIES%%
  let mkdll, mkexe, mkmaindll =
--- 
+
+---
 2.32.0
 

ocaml.spec

@@ -1,32 +1,25 @@
-%ifnarch loongarch64
 %global native_compiler 1
-%else
-%global native_compiler 0
-%endif
 
-%ifnarch loongarch64
 %global natdynlink 1
-%else
-%global natdynlink 0
-%endif
 
 
 Name:           ocaml
-Version:        4.14.0
-Release:        1
+Version:        4.14.1
+Release:        3
 Summary:        OCaml compiler and programming environment
 License:        LGPL-2.1-only
 URL:            http://www.ocaml.org
-Source0:        https://github.com/ocaml/ocaml/archive/%{version}/%{name}-%{version}.tar.gz
+Source0:        https://github.com/ocaml/ocaml/archive/refs/tags/%{name}-%{version}.tar.gz
 
 Patch0001:      0001-Don-t-add-rpaths-to-libraries.patch	
 Patch0002:      0002-configure-Allow-user-defined-C-compiler-flags.patch	
 Patch0003:      0003-configure-Remove-incorrect-assumption-about-cross-co.patch
+Patch0004:      0004-add-loongarch64-native-support.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}
@@ -82,8 +75,21 @@ autoconf --force
 
 %build
 
+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=
+extra_cflags=()
+extra_cflags+=( '-Werror=implicit-function-declaration' )
+extra_cflags+=( '-Werror=return-type' )
+extra_cflags+=( '-Wno-deprecated-declarations' )
+export EXTRA_CFLAGS="${extra_cflags[@]}"
+bash -x tools/autogen
+
 %configure \
-    OC_CFLAGS="$CFLAGS" \
+    OC_CFLAGS="$CFLAGS $EXTRA_CFLAGS" \
     OC_LDFLAGS="$LDFLAGS" \
     --libdir=%{_libdir}/ocaml \
     --host=`./build-aux/config.guess`
@@ -101,7 +107,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
 
@@ -200,7 +206,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
@@ -235,6 +241,15 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/ocaml/eventlog_metadata
 %{_mandir}/man3/*
 
 %changelog
+* Fri Jun 07 2024 Wenlong Zhang <zhangwenlong@loongson.cn> - 4.14.1-3
+- Add LoongArch native support for ocaml
+
+* Mon Apr 15 2024 yueyuankun <yueyuankun@kylinos.cn> - 4.14.1-2
+- Replace openEuler with vendor macros
+
+* Fri Feb 2 2024 Jingwiw <wangjingwei@iscas.ac.cn> - 4.14.1-1
+- Upgrade version to 4.14.1
+
 * Thu Aug 24 2023 xu_ping <707078654@qq.com> - 4.14.0-1
 - Upgrade version to 4.14.0