Pass C compiler to ant

__cc defaults to gcc, so this does not change the current build at all, but
it allows us to to do test builds with other compilers simply by
redefining the __cc macro.
This commit is contained in:
Tom Stellard 2020-04-02 23:25:43 +00:00
parent fd443bda62
commit f3cba3e9a2

View File

@ -3,7 +3,7 @@
Name: jna
Version: 5.4.0
Release: 2%{?dist}
Release: 3%{?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,
@ -124,7 +124,7 @@ export JAVA_HOME=%{_jvmdir}/java
# -Drelease removes the .SNAPSHOT suffix from maven artifact names
#ant -Dcflags_extra.native="%{optflags}" -Ddynlink.native=true native compile javadoc jar contrib-jars
ant -Drelease -Dcompatibility=1.6 -Dplatform.compatibility=1.6\
-Dcflags_extra.native="%{optflags}" -Ddynlink.native=true native dist
-Dcflags_extra.native="%{optflags}" -Ddynlink.native=true -DCC=%{__cc} native dist
# remove compiled contribs
find contrib -name build -exec rm -rf {} \; || :
@ -159,6 +159,9 @@ install -m 755 build/native*/libjnidispatch*.so %{buildroot}%{_libdir}/%{name}/
%changelog
* Thu Apr 02 2020 Tom Stellard <tstellar@redhat.com> - 5.4.0-3
- Pass C compiler to ant
* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 5.4.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild