packages: crossmingw32-gcc/crossmingw32-gcc.spec - changed passed --prefix, ...

Sat Oct 2 16:11:53 CEST 2010

Author: qboosh                       Date: Sat Oct  2 14:11:53 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- changed passed --prefix, fixes objc build

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

---- Diffs:

================================================================
Index: packages/crossmingw32-gcc/crossmingw32-gcc.spec
diff -u packages/crossmingw32-gcc/crossmingw32-gcc.spec:1.82 packages/crossmingw32-gcc/crossmingw32-gcc.spec:1.83

--- packages/crossmingw32-gcc/crossmingw32-gcc.spec:1.82	Sat Oct  2 12:18:27 2010
+++ packages/crossmingw32-gcc/crossmingw32-gcc.spec	Sat Oct  2 16:11:48 2010
@@ -53,7 +53,8 @@
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		target		i386-mingw32
-%define		arch		%{_prefix}/%{target}
+%define		sysprefix	/usr
+%define		arch		%{sysprefix}/%{target}
 %define		gccarchdir	%{_libdir}/gcc/%{target}
 %define		gcclibdir	%{gccarchdir}/%{version}
 %define		_dlldir		/usr/share/wine/windows/system
@@ -146,7 +147,6 @@
 %description -n crossmingw32-libstdc++-dll -l pl.UTF-8
 Biblioteka DLL libstdc++ dla Windows.
 
-# does this even work?
 %package objc
 Summary:	MinGW32 binary utility development utilities - objc
 Summary(pl.UTF-8):	Zestaw narzędzi MinGW32 - objc
@@ -171,6 +171,31 @@
 
 Ten pakiet zawiera kompilator objc generujący kod pod Win32.
 
+%package -n crossmingw32-libobjc-static
+Summary:	Static Objective C library - cross MinGW32 version
+Summary(pl.UTF-8):	Statyczna biblioteka Objective C - wersja skrośna MinGW32
+Group:		Development/Libraries
+Requires:	%{name}-objc = %{epoch}:%{version}-%{release}
+
+%description -n crossmingw32-libobjc-static
+Static Objective C library - cross MinGW32 version.
+
+%description -n crossmingw32-libobjc-static -l pl.UTF-8
+Statyczna biblioteka Objective C - wersja skrośna MinGW32.
+
+%package -n crossmingw32-libobjc-dll
+Summary:	libobjc DLL library for Windows
+Summary(pl.UTF-8):	Biblioteka DLL libobjc dla Windows
+Group:		Applications/Emulators
+Requires:	crossmingw32-libgcc-dll = %{epoch}:%{version}-%{release}
+Requires:	wine
+
+%description -n crossmingw32-libobjc-dll
+libobjc DLL library for Windows.
+
+%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
@@ -254,8 +279,10 @@
 CXXFLAGS="%{rpmcxxflags}" \
 TEXCONFIG=false \
 ../configure \
-	--prefix=%{arch} \
+	--prefix=%{sysprefix} \
+	--bindir=%{arch}/bin \
 	--libdir=%{_libdir} \
+	--includedir=%{arch}/include \
 	--libexecdir=%{_libdir} \
 	--infodir=%{_infodir} \
 	--mandir=%{_mandir} \
@@ -268,7 +295,7 @@
 	--with-mangler-in-ld \
 	--with-long-double-128 \
 	--enable-threads \
-	--enable-languages="c,c++" \
+	--enable-languages="c,c++,objc" \
 	--enable-c99 \
 	--enable-long-long \
 	--enable-fully-dynamic-string \
@@ -282,7 +309,7 @@
 	--disable-multilib \
 	--disable-libssp \
 	--target=%{target}
-# ,fortran,java,objc
+# ,fortran,java
 
 cd ..
 %{__make} -C builddir all-host
@@ -299,10 +326,6 @@
 # host (ELF) library
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/libiberty.a
 
-# cross library - strange path
-install -d $RPM_BUILD_ROOT%{arch}/lib
-mv -f $RPM_BUILD_ROOT%{arch}/%{target}/lib/libiberty.a $RPM_BUILD_ROOT%{arch}/lib
-
 mv $RPM_BUILD_ROOT%{gcclibdir}/include-fixed/{limits,syslimits}.h $RPM_BUILD_ROOT%{gcclibdir}/include
 %{__rm} -r $RPM_BUILD_ROOT%{gcclibdir}/include-fixed
 %{__rm} -r $RPM_BUILD_ROOT%{gcclibdir}/install-tools
@@ -315,8 +338,11 @@
 
 # DLLs
 install -d $RPM_BUILD_ROOT%{_dlldir}
-mv -f $RPM_BUILD_ROOT%{arch}/bin/libstdc++-6.dll $RPM_BUILD_ROOT%{_dlldir}
-install builddir/i386-mingw32/libgcc/shlib/libgcc_s_dw2-1.dll $RPM_BUILD_ROOT%{_dlldir}
+mv -f $RPM_BUILD_ROOT%{arch}/bin/*.dll $RPM_BUILD_ROOT%{_dlldir}
+if [ ! -f $RPM_BUILD_ROOT%{_dlldir}/libgcc_s_dw2-1.dll ]; then
+	echo "libgcc DLL not installed?"
+	install builddir/i386-mingw32/libgcc/shlib/libgcc_s_dw2-1.dll $RPM_BUILD_ROOT%{_dlldir}
+fi
 
 %if 0%{!?debug:1}
 %{target}-strip --strip-unneeded -R.comment -R.note $RPM_BUILD_ROOT%{_dlldir}/*.dll
@@ -342,6 +368,7 @@
 %attr(755,root,root) %{arch}/bin/%{target}-gccbug
 %attr(755,root,root) %{arch}/bin/%{target}-cpp
 %attr(755,root,root) %{arch}/bin/%{target}-gcov
+%attr(755,root,root) %{arch}/bin/gcc
 %{arch}/lib/libiberty.a
 %dir %{gccarchdir}
 %dir %{gcclibdir}
@@ -367,6 +394,8 @@
 %attr(755,root,root) %{_bindir}/%{target}-g++
 %attr(755,root,root) %{arch}/bin/%{target}-c++
 %attr(755,root,root) %{arch}/bin/%{target}-g++
+%attr(755,root,root) %{arch}/bin/c++
+%attr(755,root,root) %{arch}/bin/g++
 %attr(755,root,root) %{gcclibdir}/cc1plus
 %{gcclibdir}/libstdc++.dll.a
 %{gcclibdir}/libstdc++.la
@@ -387,13 +416,22 @@
 %{_dlldir}/libstdc++-6.dll
 
 # no obj-c, fortran, java for the moment
-%if 0
 %files objc
 %defattr(644,root,root,755)
-%attr(755,root,root) %{gcclib}/cc1obj
-%{arch}/lib/libobjc.a
-%{arch}/lib/libobjc.la
+%attr(755,root,root) %{gcclibdir}/cc1obj
+%{gcclibdir}/libobjc.dll.a
+%{gcclibdir}/libobjc.la
+%{gcclibdir}/include/objc
+
+%files -n crossmingw32-libobjc-static
+%defattr(644,root,root,755)
+%{gcclibdir}/libobjc.a
 
+%files -n crossmingw32-libobjc-dll
+%defattr(644,root,root,755)
+%{_dlldir}/libobjc-2.dll
+
+%if 0
 %files fortran
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/%{target}-gfortran
@@ -433,6 +471,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.83  2010/10/02 14:11:48  qboosh
+- changed passed --prefix, fixes objc build
+
 Revision 1.82  2010/10/02 10:18:27  qboosh
 - fixed bootstrap bcond, updated bootstrap libs: mingwrt 3.15, w32api 3.18
 - path fixes
================================================================

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

