Temporary hack for 64bit build

This commit is contained in:
Levente Farkas 2010-07-22 21:17:11 +00:00
parent ff19158183
commit ca6ba15ff6
2 changed files with 15 additions and 2 deletions

View File

@ -1,2 +1,3 @@
jna-3_2_4-1_el5:HEAD:jna-3.2.4-1.el5.src.rpm:1259001126 jna-3_2_4-1_el5:HEAD:jna-3.2.4-1.el5.src.rpm:1259001126
jna-3_2_7-1_fc12:HEAD:jna-3.2.7-1.fc12.src.rpm:1279792606 jna-3_2_7-1_fc12:HEAD:jna-3.2.7-1.fc12.src.rpm:1279792606
jna-3_2_7-2_fc12:HEAD:jna-3.2.7-2.fc12.src.rpm:1279833400

View File

@ -1,6 +1,6 @@
Name: jna Name: jna
Version: 3.2.7 Version: 3.2.7
Release: 1%{?dist} Release: 2%{?dist}
Summary: Pure Java access to native libraries Summary: Pure Java access to native libraries
Group: Development/Libraries Group: Development/Libraries
@ -99,7 +99,12 @@ chmod 0644 LICENSE.txt
%build %build
# 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.
ant -Dcflags_extra.native="%{optflags}" -Ddynlink.native=true -Dnomixedjar.native=true jar javadoc ant -Dcflags_extra.native="%{optflags}" -Ddynlink.native=true -Dnomixedjar.native=true jar
# dirty 64bit hack
%ifarch x86_64
ln -s build-d64 build
%endif
ant -Dcflags_extra.native="%{optflags}" -Ddynlink.native=true -Dnomixedjar.native=true javadoc
# remove compiled contribs # remove compiled contribs
find contrib -name build -delete || : find contrib -name build -delete || :
sed -i "s/VERSION/%{version}/" %{name}-pom.xml sed -i "s/VERSION/%{version}/" %{name}-pom.xml
@ -107,6 +112,10 @@ sed -i "s/VERSION/%{version}/" %{name}-pom.xml
%install %install
rm -rf %{buildroot} rm -rf %{buildroot}
# dirty 64bit hack
%ifarch x86_64
rm build
%endif
# jars # jars
install -D -m 644 build*/%{name}.jar %{buildroot}%{_javadir}/%{name}-%{version}.jar install -D -m 644 build*/%{name}.jar %{buildroot}%{_javadir}/%{name}-%{version}.jar
(cd %{buildroot}%{_javadir}/; for jar in `ls *-%{version}.jar`; do ln -s $jar `echo $jar | sed -e 's/-%{version}//'`; done) (cd %{buildroot}%{_javadir}/; for jar in `ls *-%{version}.jar`; do ln -s $jar `echo $jar | sed -e 's/-%{version}//'`; done)
@ -166,6 +175,9 @@ rm -rf %{buildroot}
%changelog %changelog
* Thu Jul 23 2010 Levente Farkas <lfarkas@lfarkas.org> - 3.2.7-2
- Temporary hack for 64bit build
* Thu Jul 22 2010 Levente Farkas <lfarkas@lfarkas.org> - 3.2.7-1 * Thu Jul 22 2010 Levente Farkas <lfarkas@lfarkas.org> - 3.2.7-1
- Rebase on upstream 3.2.7 - Rebase on upstream 3.2.7