remove special-cased aarch32 build for java-1.8.0-openjdk
This commit is contained in:
parent
28a1a01c65
commit
ea3bab24c1
17
jna.spec
17
jna.spec
@ -3,7 +3,7 @@
|
||||
|
||||
Name: jna
|
||||
Version: 5.4.0
|
||||
Release: 5%{?dist}
|
||||
Release: 6%{?dist}
|
||||
Summary: Pure Java access to native libraries
|
||||
# Most of code is dual-licensed under either LGPL 2.1+ only or Apache
|
||||
# License 2.0. WeakIdentityHashMap.java was taken from Apache CXF,
|
||||
@ -49,11 +49,6 @@ BuildRequires: libXt-devel
|
||||
BuildRequires: reflections
|
||||
%endif
|
||||
|
||||
%ifarch %{arm}
|
||||
# Speed up builds on 32bit arm
|
||||
BuildRequires: java-1.8.0-openjdk-aarch32-devel
|
||||
%endif
|
||||
|
||||
%description
|
||||
JNA provides Java programs easy access to native shared libraries
|
||||
(DLLs on Windows) without writing anything but Java code. JNA's
|
||||
@ -111,13 +106,6 @@ cp lib/native/aix-ppc64.jar lib/clover.jar
|
||||
|
||||
|
||||
%build
|
||||
# Ensure we get the jit on arm
|
||||
%ifarch %{arm}
|
||||
export JAVA_HOME=$(ls -d %{_jvmdir}/java-1.8.0-openjdk-aarch32*)
|
||||
%else
|
||||
export JAVA_HOME=%{_jvmdir}/java
|
||||
%endif
|
||||
|
||||
# We pass -Ddynlink.native which comes from our patch because
|
||||
# upstream doesn't want to default to dynamic linking.
|
||||
# -Drelease removes the .SNAPSHOT suffix from maven artifact names
|
||||
@ -158,6 +146,9 @@ install -m 755 build/native*/libjnidispatch*.so %{buildroot}%{_libdir}/%{name}/
|
||||
|
||||
|
||||
%changelog
|
||||
* Thu Jul 23 2020 Fabio Valentini <decathorpe@gmail.com> - 5.4.0-6
|
||||
- Remove special-cased aarch32 build for java-1.8.0-openjdk.
|
||||
|
||||
* Fri Jul 10 2020 Jiri Vanek <jvanek@redhat.com> - 5.4.0-5
|
||||
- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user