diff --git a/0001-Don-t-add-rpaths-to-libraries.patch b/0001-Don-t-add-rpaths-to-libraries.patch index fd8479049e67c0708302841a818cee9db4c80a2d..622ba2f6047b497368c3c8d3384bfea0a658db15 100644 --- a/0001-Don-t-add-rpaths-to-libraries.patch +++ b/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 diff --git a/ocaml-4.14.0.tar.gz b/ocaml-4.14.1.tar.gz similarity index 43% rename from ocaml-4.14.0.tar.gz rename to ocaml-4.14.1.tar.gz index ee54917783a4e80371aeeb60e1f1616c54d7514f..ceed1a6d35db9742e99f0b34faa9a3a9db8813ed 100644 Binary files a/ocaml-4.14.0.tar.gz and b/ocaml-4.14.1.tar.gz differ diff --git a/ocaml.spec b/ocaml.spec index 0bebeb6a7fd30e70f4d1413ba9f90a295b9afb07..2a9252f26efb11ac0ff89a6d1cb673be6995639d 100644 --- a/ocaml.spec +++ b/ocaml.spec @@ -12,12 +12,12 @@ Name: ocaml -Version: 4.14.0 +Version: 4.14.1 Release: 1 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 @@ -82,8 +82,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` @@ -235,6 +248,9 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/ocaml/eventlog_metadata %{_mandir}/man3/* %changelog +* Fri Feb 2 2024 Jingwiw - 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