Try another technique for unversioned Python avoidance
This commit is contained in:
parent
222d8a41fe
commit
6e99a9d6c2
@ -36,6 +36,7 @@ Group: Development/Languages/Mono
|
|||||||
Url: http://www.mono-project.com
|
Url: http://www.mono-project.com
|
||||||
Source0: http://download.mono-project.com/sources/mono/mono-%{version}.tar.bz2
|
Source0: http://download.mono-project.com/sources/mono/mono-%{version}.tar.bz2
|
||||||
Patch0: llvm_llc_opt_default_path.patch
|
Patch0: llvm_llc_opt_default_path.patch
|
||||||
|
Patch1: use_python3_not_unversioned_for_genmdesc.patch
|
||||||
BuildRequires: autoconf
|
BuildRequires: autoconf
|
||||||
BuildRequires: automake
|
BuildRequires: automake
|
||||||
BuildRequires: bison
|
BuildRequires: bison
|
||||||
@ -44,9 +45,6 @@ BuildRequires: cmake
|
|||||||
BuildRequires: gettext
|
BuildRequires: gettext
|
||||||
BuildRequires: fdupes
|
BuildRequires: fdupes
|
||||||
BuildRequires: gcc-c++
|
BuildRequires: gcc-c++
|
||||||
%if 0%{?rhel} >= 8
|
|
||||||
BuildRequires: python-unversioned-command
|
|
||||||
%endif
|
|
||||||
%if 0%{?rhel} < 7
|
%if 0%{?rhel} < 7
|
||||||
BuildRequires: devtoolset-2-toolchain
|
BuildRequires: devtoolset-2-toolchain
|
||||||
%endif
|
%endif
|
||||||
@ -140,6 +138,9 @@ technologies that have been submitted to the ECMA for standardization.
|
|||||||
%prep
|
%prep
|
||||||
%setup -q -n mono-%{version}
|
%setup -q -n mono-%{version}
|
||||||
%patch0 -p1
|
%patch0 -p1
|
||||||
|
%if 0%{?rhel} >= 8
|
||||||
|
%patch1 -p1
|
||||||
|
%endif
|
||||||
|
|
||||||
%build
|
%build
|
||||||
%{?scl:scl enable %{scl} - << \EOF}
|
%{?scl:scl enable %{scl} - << \EOF}
|
||||||
|
13
use_python3_not_unversioned_for_genmdesc.patch
Normal file
13
use_python3_not_unversioned_for_genmdesc.patch
Normal file
@ -0,0 +1,13 @@
|
|||||||
|
diff --git a/mono/mini/Makefile.am.in b/mono/mini/Makefile.am.in
|
||||||
|
index 65399906806..4538c5ba428 100755
|
||||||
|
--- a/mono/mini/Makefile.am.in
|
||||||
|
+++ b/mono/mini/Makefile.am.in
|
||||||
|
@@ -775,7 +775,7 @@ MemoryIntrinsics.dll: MemoryIntrinsics.il
|
||||||
|
|
||||||
|
GENMDESC_OPTS=
|
||||||
|
|
||||||
|
-GENMDESC_PRG=python $(srcdir)/genmdesc.py $(target_define) $(srcdir)
|
||||||
|
+GENMDESC_PRG=python3 $(srcdir)/genmdesc.py $(target_define) $(srcdir)
|
||||||
|
|
||||||
|
cpu-wasm.h: mini-ops.h cpu-wasm.md
|
||||||
|
$(GENMDESC_PRG) cpu-wasm.h wasm_desc $(srcdir)/cpu-wasm.md
|
Loading…
x
Reference in New Issue
Block a user