Sync from SUSE:SLFO:Main ocaml revision 34565f8809a8d0acb2bea787198d726e

This commit is contained in:
Adrian Schröter 2025-02-25 16:11:41 +01:00
parent 2e2931f7a3
commit 56e99baf80
2 changed files with 8 additions and 5 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Fri Feb 7 07:07:07 UTC 2025 - ohering@suse.de
- Require unversioned gcc package (bsc#1232663)
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Mar 14 14:14:14 UTC 2024 - ohering@suse.de Thu Mar 14 14:14:14 UTC 2024 - ohering@suse.de

View File

@ -1,7 +1,7 @@
# #
# spec file for package ocaml # spec file for package ocaml
# #
# Copyright (c) 2024 SUSE LLC # Copyright (c) 2025 SUSE LLC
# Copyright (c) 2010 Andrew Psaltis <ampsaltis at gmail dot com> # Copyright (c) 2010 Andrew Psaltis <ampsaltis at gmail dot com>
# Copyright (c) 2011 Andrew Psaltis <ampsaltis at gmail dot com> # Copyright (c) 2011 Andrew Psaltis <ampsaltis at gmail dot com>
# #
@ -59,14 +59,14 @@ Patch0: ocaml-configure-Allow-user-defined-C-compiler-flags.patch
BuildRequires: autoconf >= 2.69 BuildRequires: autoconf >= 2.69
BuildRequires: fdupes BuildRequires: fdupes
BuildRequires: ncurses-devel BuildRequires: ncurses-devel
BuildRequires: ocaml-rpm-macros >= 20231101 BuildRequires: ocaml-rpm-macros >= 20240909
BuildRequires: pkgconfig BuildRequires: pkgconfig
Requires: ncurses-devel Requires: ncurses-devel
Requires: ocaml(runtime) = %version-%release Requires: ocaml(runtime) = %version-%release
Obsoletes: ocaml-docs Obsoletes: ocaml-docs
Provides: ocaml(compiler) = %ocaml_base_version Provides: ocaml(compiler) = %ocaml_base_version
Provides: ocaml(ocaml_base_version) = %ocaml_base_version Provides: ocaml(ocaml_base_version) = %ocaml_base_version
Requires: %(type -P gcc | xargs readlink -f | xargs rpm -qf --qf '%%{NAME}\n') Requires: gcc
Provides: ocaml(ocaml.opt) = %ocaml_base_version Provides: ocaml(ocaml.opt) = %ocaml_base_version
Obsoletes: ocaml-seq < %version-%release Obsoletes: ocaml-seq < %version-%release
Obsoletes: ocaml-seq-debuginfo < %version-%release Obsoletes: ocaml-seq-debuginfo < %version-%release
@ -153,8 +153,6 @@ applications that use Ocaml.
echo %version > VERSION echo %version > VERSION
export CC='gcc' export CC='gcc'
export AS='as' 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" export ASPP="$CC -c"
configure_target= configure_target=
extra_cflags=() extra_cflags=()