Rearrange how BC-compiled stuff is built and installed

This commit is contained in:
gbenson 2005-05-26 11:54:21 +00:00
parent 7d26dbd404
commit 10c5a267f9

View File

@ -42,7 +42,7 @@ Javadoc for %{name}.
%prep %prep
rm -rf $RPM_BUILD_ROOT rm -rf $RPM_BUILD_ROOT
%setup -n %{full_name}-%{version} %setup -q -n %{full_name}-%{version}
# remove all binary libs # remove all binary libs
find . -name "*.jar" -exec rm -f {} \; find . -name "*.jar" -exec rm -f {} \;
@ -50,11 +50,15 @@ find . -name "*.jar" -exec rm -f {} \;
mkdir lib mkdir lib
ant -Djakarta-site2.dir=. jar javadocs ant -Djakarta-site2.dir=. jar javadocs
gcj-dbtool -n build/%{name}-%{version}.db 128
aot-compile \ aot-compile \
build/%{full_name}-%{version}.jar \ build/%{full_name}-%{version}.jar \
lib%{name}-%{version}.jar.so \ build/lib%{name}-%{version}.jar.so \
"$RPM_OPT_FLAGS -fPIC" "$RPM_OPT_FLAGS -fPIC"
gcj-dbtool -f \
build/%{name}-%{version}.db \
build/%{full_name}-%{version}.jar \
%{_libdir}/lib%{name}-%{version}.jar.so
%install %install
# jars # jars
@ -67,15 +71,12 @@ cp -r docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
rm -rf docs/api rm -rf docs/api
# solibs # solibs
install -d -m 755 $RPM_BUILD_ROOT%{_libdir} install -d -m 755 $RPM_BUILD_ROOT%{_libdir}
install -m 755 lib%{name}-%{version}.jar.so $RPM_BUILD_ROOT%{_libdir} install -m 755 build/lib%{name}-%{version}.jar.so $RPM_BUILD_ROOT%{_libdir}
ln -sf lib%{name}-%{version}.jar.so $RPM_BUILD_ROOT%{_libdir}/lib%{name}.jar.so ln -sf lib%{name}-%{version}.jar.so $RPM_BUILD_ROOT%{_libdir}/lib%{name}.jar.so
# gcjdb # gcjdb
gcjdbdir=`gcj-dbtool -p %{_libdir}`.d gcjdbdir=`gcj-dbtool -p %{_libdir}`.d
mkdir -p $RPM_BUILD_ROOT$gcjdbdir install -d -m 755 $RPM_BUILD_ROOT$gcjdbdir
gcj-dbtool -n $RPM_BUILD_ROOT$gcjdbdir/%{name}-%{version}.db 80000 install -m 644 build/%{name}-%{version}.db $RPM_BUILD_ROOT$gcjdbdir
gcj-dbtool -f $RPM_BUILD_ROOT$gcjdbdir/%{name}-%{version}.db \
$RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar \
%{_libdir}/lib%{name}-%{version}.jar.so
%clean %clean
rm -rf $RPM_BUILD_ROOT rm -rf $RPM_BUILD_ROOT
@ -111,6 +112,9 @@ fi
%{_javadocdir}/%{name}-%{version} %{_javadocdir}/%{name}-%{version}
%changelog %changelog
* Thu May 26 2005 Gary Benson <gbenson@redhat.com>
- Rearrange how BC-compiled stuff is built and installed.
* Mon May 23 2005 Gary Benson <gbenson@redhat.com> 0:1.3-1jpp_6fc * Mon May 23 2005 Gary Benson <gbenson@redhat.com> 0:1.3-1jpp_6fc
- Add alpha to the list of build architectures (#157522). - Add alpha to the list of build architectures (#157522).
- Use absolute paths for rebuild-gcj-db. - Use absolute paths for rebuild-gcj-db.