packages: crossmingw32-gcc/crossmingw32-gcc.spec - restored java (just comp...

[qboosh]

Author: qboosh                       Date: Sat Oct  2 17:54:27 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- restored java (just compiler, no libgcj/classpath)

---- Files affected:
packages/crossmingw32-gcc:
   crossmingw32-gcc.spec (1.83 -> 1.84) 

---- Diffs:

================================================================
Index: packages/crossmingw32-gcc/crossmingw32-gcc.spec
diff -u packages/crossmingw32-gcc/crossmingw32-gcc.spec:1.83 packages/crossmingw32-gcc/crossmingw32-gcc.spec:1.84
--- packages/crossmingw32-gcc/crossmingw32-gcc.spec:1.83	Sat Oct  2 16:11:48 2010
+++ packages/crossmingw32-gcc/crossmingw32-gcc.spec	Sat Oct  2 19:54:21 2010
@@ -1,7 +1,7 @@
 # $Revision$, $Date$
 #
 # TODO:
-# - restore languages other than c, c++
+# - restore fortran
 # - openmp
 #
 # Conditional build:
@@ -196,7 +196,6 @@
 %description -n crossmingw32-libobjc-dll -l pl.UTF-8
 Biblioteka DLL libobjc dla Windows.
 
-# does this even work?
 %package fortran
 Summary:	MinGW32 binary utility development utilities - Fortran
 Summary(pl.UTF-8):	Zestaw narzędzi MinGW32 - Fortran
@@ -222,7 +221,6 @@
 
 Ten pakiet zawiera kompilator Fortranu generujący kod pod Win32.
 
-# does this even work?
 %package java
 Summary:	MinGW32 binary utility development utilities - Java
 Summary(pl.UTF-8):	Zestaw narzędzi MinGW32 - Java
@@ -268,7 +266,6 @@
 rm -rf builddir && install -d builddir && cd builddir
 %if %{with bootstrap}
 install -d %{target}/winsup
-# sysroot/%{target}/lib
 ln -sf ../../../winsup/mingw/lib %{target}/winsup/mingw
 ln -sf ../../../winsup/w32api %{target}/winsup/w32api
 WINSUPDIR=$(cd ..; pwd)/winsup
@@ -295,7 +292,7 @@
 	--with-mangler-in-ld \
 	--with-long-double-128 \
 	--enable-threads \
-	--enable-languages="c,c++,objc" \
+	--enable-languages="c,c++,java,objc" \
 	--enable-c99 \
 	--enable-long-long \
 	--enable-fully-dynamic-string \
@@ -309,7 +306,7 @@
 	--disable-multilib \
 	--disable-libssp \
 	--target=%{target}
-# ,fortran,java
+# ,fortran
 
 cd ..
 %{__make} -C builddir all-host
@@ -330,11 +327,13 @@
 %{__rm} -r $RPM_BUILD_ROOT%{gcclibdir}/include-fixed
 %{__rm} -r $RPM_BUILD_ROOT%{gcclibdir}/install-tools
 
-# restore hardlinks
+# make links in host bindir
 ln -f $RPM_BUILD_ROOT%{arch}/bin/%{target}-gcc $RPM_BUILD_ROOT%{_bindir}/%{target}-gcc
 ln -f $RPM_BUILD_ROOT%{arch}/bin/%{target}-g++ $RPM_BUILD_ROOT%{_bindir}/%{target}-g++
 ln -f $RPM_BUILD_ROOT%{arch}/bin/%{target}-cpp $RPM_BUILD_ROOT%{_bindir}/%{target}-cpp
 ln -f $RPM_BUILD_ROOT%{arch}/bin/%{target}-gcov $RPM_BUILD_ROOT%{_bindir}/%{target}-gcov
+ln -f $RPM_BUILD_ROOT%{arch}/bin/%{target}-gcj $RPM_BUILD_ROOT%{_bindir}/%{target}-gcj
+ln -f $RPM_BUILD_ROOT%{arch}/bin/%{target}-jcf-dump $RPM_BUILD_ROOT%{_bindir}/%{target}-jcf-dump
 
 # DLLs
 install -d $RPM_BUILD_ROOT%{_dlldir}
@@ -354,6 +353,8 @@
 %{__rm} -r $RPM_BUILD_ROOT%{_infodir}
 # common FSF man pages
 %{__rm} $RPM_BUILD_ROOT%{_mandir}/man7/{fsf-funding,gfdl,gpl}.7
+# programs not packaged
+%{__rm} $RPM_BUILD_ROOT%{_mandir}/man1/%{target}-{aot-compile,gc-analyze,gcj-dbtool,gij,grmic,jv-convert,rebuild-gcj-db}.1
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -415,7 +416,6 @@
 %defattr(644,root,root,755)
 %{_dlldir}/libstdc++-6.dll
 
-# no obj-c, fortran, java for the moment
 %files objc
 %defattr(644,root,root,755)
 %attr(755,root,root) %{gcclibdir}/cc1obj
@@ -431,39 +431,30 @@
 %defattr(644,root,root,755)
 %{_dlldir}/libobjc-2.dll
 
+# no fortran for the moment
 %if 0
 %files fortran
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/%{target}-gfortran
 %attr(755,root,root) %{arch}/bin/gfortran
-%attr(755,root,root) %{gcclib}/f951
+%attr(755,root,root) %{gcclibdir}/f951
 %{arch}/lib/libgfortran.a
 %{arch}/lib/libgfortran.la
 %{arch}/lib/libgfortranbegin.a
 %{arch}/lib/libgfortranbegin.la
 %{_mandir}/man1/%{target}-gfortran.1*
+%endif
 
 %files java
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/%{target}-gcj
-%attr(755,root,root) %{_bindir}/%{target}-gcjh
-%attr(755,root,root) %{_bindir}/%{target}-gjnih
-%attr(755,root,root) %{_bindir}/%{target}-grepjar
-%attr(755,root,root) %{_bindir}/%{target}-fastjar
 %attr(755,root,root) %{_bindir}/%{target}-jcf-dump
-%attr(755,root,root) %{_bindir}/%{target}-jv-scan
-#%attr(755,root,root) %{arch}/bin/grepjar
-#%attr(755,root,root) %{arch}/bin/jar
-%attr(755,root,root) %{gcclib}/jc1
-%attr(755,root,root) %{gcclib}/jvgenmain
+%attr(755,root,root) %{arch}/bin/%{target}-gcj
+%attr(755,root,root) %{arch}/bin/%{target}-jcf-dump
+%attr(755,root,root) %{gcclibdir}/jc1
+%attr(755,root,root) %{gcclibdir}/jvgenmain
 %{_mandir}/man1/%{target}-gcj.1*
-%{_mandir}/man1/%{target}-gcjh.1*
-%{_mandir}/man1/%{target}-gjnih.1*
-%{_mandir}/man1/%{target}-grepjar.1*
-%{_mandir}/man1/%{target}-fastjar.1*
 %{_mandir}/man1/%{target}-jcf-dump.1*
-%{_mandir}/man1/%{target}-jv-scan.1*
-%endif
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -471,6 +462,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.84  2010/10/02 17:54:21  qboosh
+- restored java (just compiler, no libgcj/classpath)
+
 Revision 1.83  2010/10/02 14:11:48  qboosh
 - changed passed --prefix, fixes objc build
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/crossmingw32-gcc/crossmingw32-gcc.spec?r1=1.83&r2=1.84&f=u