upgrade to 4.14.1
This commit is contained in:
parent
66ad9967ee
commit
362a603189
@ -8,13 +8,13 @@ Subject: [PATCH 1/3] Don't add rpaths to libraries.
|
|||||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||||
|
|
||||||
diff --git a/utils/config.mlp b/utils/config.mlp
|
diff --git a/utils/config.mlp b/utils/config.mlp
|
||||||
index bbb3c5694..57d509cd0 100644
|
index f758a9b..ee17a73 100644
|
||||||
--- a/utils/config.mlp
|
--- a/utils/config.mlp
|
||||||
+++ b/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_c_libraries = "%%NATIVECCLIBS%%"
|
||||||
let native_pack_linker = "%%PACKLD%%"
|
let native_pack_linker = "%%PACKLD%%"
|
||||||
let ranlib = "%%RANLIBCMD%%"
|
|
||||||
-let default_rpath = "%%RPATH%%"
|
-let default_rpath = "%%RPATH%%"
|
||||||
-let mksharedlibrpath = "%%MKSHAREDLIBRPATH%%"
|
-let mksharedlibrpath = "%%MKSHAREDLIBRPATH%%"
|
||||||
+let default_rpath = ""
|
+let default_rpath = ""
|
||||||
@ -22,6 +22,7 @@ index bbb3c5694..57d509cd0 100644
|
|||||||
let ar = "%%ARCMD%%"
|
let ar = "%%ARCMD%%"
|
||||||
let supports_shared_libraries = %%SUPPORTS_SHARED_LIBRARIES%%
|
let supports_shared_libraries = %%SUPPORTS_SHARED_LIBRARIES%%
|
||||||
let mkdll, mkexe, mkmaindll =
|
let mkdll, mkexe, mkmaindll =
|
||||||
--
|
|
||||||
|
---
|
||||||
2.32.0
|
2.32.0
|
||||||
|
|
||||||
|
|||||||
Binary file not shown.
BIN
ocaml-4.14.1.tar.gz
Normal file
BIN
ocaml-4.14.1.tar.gz
Normal file
Binary file not shown.
22
ocaml.spec
22
ocaml.spec
@ -12,12 +12,12 @@
|
|||||||
|
|
||||||
|
|
||||||
Name: ocaml
|
Name: ocaml
|
||||||
Version: 4.14.0
|
Version: 4.14.1
|
||||||
Release: 1
|
Release: 1
|
||||||
Summary: OCaml compiler and programming environment
|
Summary: OCaml compiler and programming environment
|
||||||
License: LGPL-2.1-only
|
License: LGPL-2.1-only
|
||||||
URL: http://www.ocaml.org
|
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
|
Patch0001: 0001-Don-t-add-rpaths-to-libraries.patch
|
||||||
Patch0002: 0002-configure-Allow-user-defined-C-compiler-flags.patch
|
Patch0002: 0002-configure-Allow-user-defined-C-compiler-flags.patch
|
||||||
@ -82,8 +82,21 @@ autoconf --force
|
|||||||
|
|
||||||
%build
|
%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 \
|
%configure \
|
||||||
OC_CFLAGS="$CFLAGS" \
|
OC_CFLAGS="$CFLAGS $EXTRA_CFLAGS" \
|
||||||
OC_LDFLAGS="$LDFLAGS" \
|
OC_LDFLAGS="$LDFLAGS" \
|
||||||
--libdir=%{_libdir}/ocaml \
|
--libdir=%{_libdir}/ocaml \
|
||||||
--host=`./build-aux/config.guess`
|
--host=`./build-aux/config.guess`
|
||||||
@ -235,6 +248,9 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/ocaml/eventlog_metadata
|
|||||||
%{_mandir}/man3/*
|
%{_mandir}/man3/*
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* 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
|
* Thu Aug 24 2023 xu_ping <707078654@qq.com> - 4.14.0-1
|
||||||
- Upgrade version to 4.14.0
|
- Upgrade version to 4.14.0
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user