rpms/jna
5
0
Fork 0
Code Issues Pull Requests Releases Activity

remove special-cased aarch32 build for java-1.8.0-openjdk

Browse Source
This commit is contained in:
Fabio Valentini 2020-07-23 12:34:23 +02:00
parent 28a1a01c65
commit ea3bab24c1
No known key found for this signature in database
GPG Key ID: 5AC5F572E5D410AF
1 changed files with 4 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
jna.spec
View File

@ -3,7 +3,7 @@
Name: jna Name: jna
Version: 5.4.0 Version: 5.4.0
Release: 5%{?dist} Release: 6%{?dist}
Summary: Pure Java access to native libraries Summary: Pure Java access to native libraries
# Most of code is dual-licensed under either LGPL 2.1+ only or Apache # Most of code is dual-licensed under either LGPL 2.1+ only or Apache
# License 2.0. WeakIdentityHashMap.java was taken from Apache CXF, # License 2.0. WeakIdentityHashMap.java was taken from Apache CXF,
@ -49,11 +49,6 @@ BuildRequires: libXt-devel
BuildRequires: reflections BuildRequires: reflections
%endif %endif
%ifarch %{arm}
# Speed up builds on 32bit arm
BuildRequires: java-1.8.0-openjdk-aarch32-devel
%endif
%description %description
JNA provides Java programs easy access to native shared libraries JNA provides Java programs easy access to native shared libraries
(DLLs on Windows) without writing anything but Java code. JNA's (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 %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 # We pass -Ddynlink.native which comes from our patch because
# upstream doesn't want to default to dynamic linking. # upstream doesn't want to default to dynamic linking.
# -Drelease removes the .SNAPSHOT suffix from maven artifact names # -Drelease removes the .SNAPSHOT suffix from maven artifact names
@ -158,6 +146,9 @@ install -m 755 build/native*/libjnidispatch*.so %{buildroot}%{_libdir}/%{name}/
%changelog %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 * Fri Jul 10 2020 Jiri Vanek <jvanek@redhat.com> - 5.4.0-5
- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 - Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11