From 6d3d7729199ed768d5c24becd3d19390f387d13c Mon Sep 17 00:00:00 2001 From: Jerry James Date: Jul 05 2022 18:42:22 +0000 Subject: Remove Java support on i686 (rhbz#2104022). --- diff --git a/bigloo.spec b/bigloo.spec index dced64e..b6479c2 100644 --- a/bigloo.spec +++ b/bigloo.spec @@ -37,7 +37,7 @@ Name: bigloo Version: 4.4c -Release: 4%{?patch_ver:.%{patch_ver}}%{?prerel:.%{prerel}}%{?dist} +Release: 5%{?patch_ver:.%{patch_ver}}%{?prerel:.%{prerel}}%{?dist} Summary: A compiler for the Scheme programming language License: GPLv2+ @@ -70,8 +70,10 @@ BuildRequires: gcc BuildRequires: gcc-c++ BuildRequires: gmp-devel BuildRequires: indent +%ifarch %{java_arches} BuildRequires: java-devel BuildRequires: javapackages-tools +%endif BuildRequires: libtool BuildRequires: libunistring-devel BuildRequires: make @@ -100,7 +102,9 @@ BuildRequires: zip Requires: bigloo-libs%{?_isa} = %{version}-%{release} Requires: emacs-filesystem >= %{?_emacs_version}%{!?_emacs_version:0} +%ifarch %{java_arches} Requires: javapackages-filesystem +%endif Requires: indent Requires: gmp-devel%{?_isa} %if %{without customgc} @@ -191,8 +195,12 @@ export LDFLAGS="-Wl,-z,relro -Wl,--as-needed" --infodir=%{_infodir} \ --docdir=%{_docdir} \ --lispdir=%{_emacs_sitelispdir}/bigloo \ +%ifarch %{java_arches} --jvm=yes \ --javaprefix=%{_jvmdir}/java/bin \ +%else + --jvm=no \ +%endif --bee=full \ %if %{with customgc} --customgc=yes \ @@ -240,9 +248,11 @@ rmdir %{buildroot}%{_libdir}/pkgconfig chmod 755 %{buildroot}%{_bindir}/* find %{buildroot}%{_libdir} -name \*.so -exec chmod 755 {} \+ +%ifarch %{java_arches} # move jigloo to the proper place mkdir %{buildroot}%{_javadir} mv %{buildroot}%{_bindir}/jigloo.class %{buildroot}%{_javadir} +%endif # Remove references to the build root sed -e 's|^BOOTDIR=.*|BOOTDIR=%{_prefix}|g' \ @@ -284,7 +294,9 @@ make test %files %{_bindir}/* +%ifarch %{java_arches} %{_javadir}/jigloo.class +%endif %{_infodir}/* %{_mandir}/man*/* %{_emacs_sitelispdir}/bigloo/ @@ -304,6 +316,9 @@ make test %changelog +* Tue Jul 5 2022 Jerry James - 4.4c-5.4 +- Remove Java support on i686 (rhbz#2104022) + * Mon Mar 28 2022 Jerry James - 4.4c-4.4 - Version 4.4c-4