diff --git a/contrib/crossrpms/freebsd7.2/i586/Makefile.am b/contrib/crossrpms/freebsd7.2/i586/Makefile.am index 1a2470884a..698d5c6fc3 100644 --- a/contrib/crossrpms/freebsd7.2/i586/Makefile.am +++ b/contrib/crossrpms/freebsd7.2/i586/Makefile.am @@ -10,14 +10,14 @@ EXTRA_DIST += libs.add EXTRA_DIST += target-libs.add include ../libs.am -BINUTILS_VERS = 2.19 +BINUTILS_VERS = 2.19.1 BINUTILS_PKGVERS = $(BINUTILS_VERS) -BINUTILS_RPMREL = 0.20090827.1 +BINUTILS_RPMREL = 0.20090831.1 include ../binutils.am BINUTILS_OPTS += -GCC_VERS = 4.3.4 +GCC_VERS = 4.4.1 GCC_PKGVERS = $(GCC_VERS) -GCC_RPMREL = 0.20090827.1 +GCC_RPMREL = 0.20090831.1 include ../gcc.am GCC_OPTS += --languages=cxx,fortran,objc diff --git a/contrib/crossrpms/freebsd7.2/i586/binutils-sources.add b/contrib/crossrpms/freebsd7.2/i586/binutils-sources.add index 057c363814..7fd3fa38f9 100644 --- a/contrib/crossrpms/freebsd7.2/i586/binutils-sources.add +++ b/contrib/crossrpms/freebsd7.2/i586/binutils-sources.add @@ -1,2 +1,2 @@ Source0: http://ftp.gnu.org/gnu/binutils/binutils-2.19.tar.bz2 -Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/binutils-2.19-rtems4.10-20081023.diff +@PATCH0@ diff --git a/contrib/crossrpms/freebsd7.2/i586/i586-pc-freebsd7.2-binutils.spec b/contrib/crossrpms/freebsd7.2/i586/i586-pc-freebsd7.2-binutils.spec index 803d65b115..fdf8253a82 100644 --- a/contrib/crossrpms/freebsd7.2/i586/i586-pc-freebsd7.2-binutils.spec +++ b/contrib/crossrpms/freebsd7.2/i586/i586-pc-freebsd7.2-binutils.spec @@ -30,15 +30,15 @@ %define _host_rpmprefix %{nil} %endif -%define binutils_pkgvers 2.19 -%define binutils_version 2.19 -%define binutils_rpmvers %{expand:%(echo "2.19" | tr - _ )} +%define binutils_pkgvers 2.19.1 +%define binutils_version 2.19.1 +%define binutils_rpmvers %{expand:%(echo "2.19.1" | tr - _ )} Name: i586-pc-freebsd7.2-binutils Summary: Binutils for target i586-pc-freebsd7.2 Group: Development/Tools Version: %{binutils_rpmvers} -Release: 0.20090827.1%{?dist} +Release: 0.20090831.1%{?dist} License: GPL/LGPL URL: http://sources.redhat.com/binutils BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -57,7 +57,6 @@ BuildRequires: flex BuildRequires: bison Source0: http://ftp.gnu.org/gnu/binutils/binutils-2.19.tar.bz2 -Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/binutils-2.19-rtems4.10-20081023.diff %description Cross binutils for target i586-pc-freebsd7.2 @@ -164,6 +163,7 @@ GNU binutils targetting i586-pc-freebsd7.2. %files -n i586-pc-freebsd7.2-binutils %defattr(-,root,root) + %{_mandir}/man1/i586-pc-freebsd7.2-*.1* %{_bindir}/i586-pc-freebsd7.2-* diff --git a/contrib/crossrpms/freebsd7.2/i586/i586-pc-freebsd7.2-gcc.spec b/contrib/crossrpms/freebsd7.2/i586/i586-pc-freebsd7.2-gcc.spec index 1fa82c8c39..a3e6c8bb39 100644 --- a/contrib/crossrpms/freebsd7.2/i586/i586-pc-freebsd7.2-gcc.spec +++ b/contrib/crossrpms/freebsd7.2/i586/i586-pc-freebsd7.2-gcc.spec @@ -31,9 +31,9 @@ %endif -%define gcc_pkgvers 4.3.4 -%define gcc_version 4.3.4 -%define gcc_rpmvers %{expand:%(echo "4.3.4" | tr - _ )} +%define gcc_pkgvers 4.4.1 +%define gcc_version 4.4.1 +%define gcc_rpmvers %{expand:%(echo "4.4.1" | tr - _ )} Name: i586-pc-freebsd7.2-gcc @@ -41,7 +41,7 @@ Summary: i586-pc-freebsd7.2 gcc Group: Development/Tools Version: %{gcc_rpmvers} -Release: 0.20090827.1%{?dist} +Release: 0.20090831.1%{?dist} License: GPL URL: http://gcc.gnu.org BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -122,6 +122,7 @@ BuildRequires: i586-pc-freebsd7.2-sys-root Requires: i586-pc-freebsd7.2-binutils Requires: i586-pc-freebsd7.2-sys-root +Requires: i586-pc-freebsd7.2-gcc-libgcc = %{gcc_rpmvers}-%{release} %define _gcclibdir %{_prefix}/lib @@ -274,16 +275,13 @@ Cross gcc for i586-pc-freebsd7.2. fi # Collect multilib subdirectories - f=`build/gcc/xgcc -Bbuild/gcc/ --print-multi-lib | sed -e 's,;.*$,,'` + multilibs=`build/gcc/xgcc -Bbuild/gcc/ --print-multi-lib | sed -e 's,;.*$,,'` rm -f dirs ; echo "%defattr(-,root,root,-)" >> dirs - echo "%dir %{_gcclibdir}/gcc" >> dirs - echo "%dir %{_gcclibdir}/gcc/i586-pc-freebsd7.2" >> dirs - TGTDIR="%{_gcclibdir}/gcc/i586-pc-freebsd7.2/%{gcc_version}" - for i in $f; do + for i in $multilibs; do case $i in \.) echo "%dir ${TGTDIR}" >> dirs ;; @@ -314,6 +312,7 @@ Cross gcc for i586-pc-freebsd7.2. *include/objc*) ;; *include/g++*);; *include/c++*);; + *include-fixed/*);; *finclude/*);; *adainclude*);; *adalib*);; @@ -419,8 +418,23 @@ sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \ %description -n i586-pc-freebsd7.2-gcc GNU cc compiler for i586-pc-freebsd7.2. -%files -n i586-pc-freebsd7.2-gcc -f build/files.gcc +# ============================================================== +# i586-pc-freebsd7.2-gcc-libgcc +# ============================================================== +%package -n i586-pc-freebsd7.2-gcc-libgcc +Summary: libgcc for i586-pc-freebsd7.2-gcc +Group: Development/Tools +Version: %{gcc_rpmvers} +%{?_with_noarch_subpackages:BuildArch: noarch} +License: GPL + +%description -n i586-pc-freebsd7.2-gcc-libgcc +libgcc i586-pc-freebsd7.2-gcc. + + +%files -n i586-pc-freebsd7.2-gcc %defattr(-,root,root) + %{_mandir}/man1/i586-pc-freebsd7.2-gcc.1* %{_mandir}/man1/i586-pc-freebsd7.2-cpp.1* %{_mandir}/man1/i586-pc-freebsd7.2-gcov.1* @@ -431,7 +445,20 @@ GNU cc compiler for i586-pc-freebsd7.2. %{_bindir}/i586-pc-freebsd7.2-gcov%{_exeext} %{_bindir}/i586-pc-freebsd7.2-gccbug +%dir %{_libexecdir}/gcc +%dir %{_libexecdir}/gcc/i586-pc-freebsd7.2 +%dir %{_libexecdir}/gcc/i586-pc-freebsd7.2/%{gcc_version} +%{_libexecdir}/gcc/i586-pc-freebsd7.2/%{gcc_version}/cc1%{_exeext} +%{_libexecdir}/gcc/i586-pc-freebsd7.2/%{gcc_version}/collect2%{_exeext} + + +%files -n i586-pc-freebsd7.2-gcc-libgcc -f build/files.gcc +%defattr(-,root,root) +%dir %{_gcclibdir}/gcc +%dir %{_gcclibdir}/gcc/i586-pc-freebsd7.2 +%dir %{_gcclibdir}/gcc/i586-pc-freebsd7.2/%{gcc_version} %dir %{_gcclibdir}/gcc/i586-pc-freebsd7.2/%{gcc_version}/include + %if "%{gcc_version}" > "4.0.3" %if "i586-pc-freebsd7.2" != "bfin-rtems4.10" %if "i586-pc-freebsd7.2" != "avr-rtems4.10" @@ -441,15 +468,9 @@ GNU cc compiler for i586-pc-freebsd7.2. %endif %if "%{gcc_version}" >= "4.3.0" -%dir %{_gcclibdir}/gcc/i586-pc-freebsd7.2/%{gcc_version}/include-fixed +%{_gcclibdir}/gcc/i586-pc-freebsd7.2/%{gcc_version}/include-fixed %endif -%dir %{_libexecdir}/gcc -%dir %{_libexecdir}/gcc/i586-pc-freebsd7.2 -%dir %{_libexecdir}/gcc/i586-pc-freebsd7.2/%{gcc_version} -%{_libexecdir}/gcc/i586-pc-freebsd7.2/%{gcc_version}/cc1%{_exeext} -%{_libexecdir}/gcc/i586-pc-freebsd7.2/%{gcc_version}/collect2%{_exeext} - # ============================================================== # i586-pc-freebsd7.2-gcc-c++ # ============================================================== @@ -458,20 +479,32 @@ Summary: GCC c++ compiler for i586-pc-freebsd7.2 Group: Development/Tools Version: %{gcc_rpmvers} License: GPL +Requires: i586-pc-freebsd7.2-gcc-libstdc++ = %{gcc_rpmvers}-%{release} %if "%{_build}" != "%{_host}" BuildRequires: i586-pc-freebsd7.2-gcc-c++ = %{gcc_rpmvers} %endif -Provides: i586-pc-freebsd7.2-c++ = %{gcc_rpmvers}-%{release} -Obsoletes: i586-pc-freebsd7.2-c++ < %{gcc_rpmvers}-%{release} Requires: i586-pc-freebsd7.2-gcc = %{gcc_rpmvers}-%{release} %description -n i586-pc-freebsd7.2-gcc-c++ GCC c++ compiler for i586-pc-freebsd7.2. -%files -n i586-pc-freebsd7.2-gcc-c++ -f build/files.g++ + +%package -n i586-pc-freebsd7.2-gcc-libstdc++ +Summary: libstdc++ for i586-pc-freebsd7.2 +Group: Development/Tools +Version: %{gcc_rpmvers} +%{?_with_noarch_subpackages:BuildArch: noarch} +License: GPL + +%description -n i586-pc-freebsd7.2-gcc-libstdc++ +%{_summary} + + +%files -n i586-pc-freebsd7.2-gcc-c++ %defattr(-,root,root) + %{_mandir}/man1/i586-pc-freebsd7.2-g++.1* %{_bindir}/i586-pc-freebsd7.2-c++%{_exeext} @@ -482,6 +515,12 @@ GCC c++ compiler for i586-pc-freebsd7.2. %dir %{_libexecdir}/gcc/i586-pc-freebsd7.2/%{gcc_version} %{_libexecdir}/gcc/i586-pc-freebsd7.2/%{gcc_version}/cc1plus%{_exeext} + +%files -n i586-pc-freebsd7.2-gcc-libstdc++ -f build/files.g++ +%defattr(-,root,root) +%dir %{_gcclibdir}/gcc +%dir %{_gcclibdir}/gcc/i586-pc-freebsd7.2 +%dir %{_gcclibdir}/gcc/i586-pc-freebsd7.2/%{gcc_version} %dir %{_gcclibdir}/gcc/i586-pc-freebsd7.2/%{gcc_version}/include %{_gcclibdir}/gcc/i586-pc-freebsd7.2/%{gcc_version}/include/c++ @@ -494,16 +533,13 @@ Group: Development/Tools Version: %{gcc_rpmvers} License: GPL -Provides: i586-pc-freebsd7.2-gfortran = %{gcc_rpmvers}-%{release} -Obsoletes: i586-pc-freebsd7.2-gfortran < %{gcc_rpmvers}-%{release} - Requires: i586-pc-freebsd7.2-gcc = %{gcc_rpmvers}-%{release} -Obsoletes: i586-pc-freebsd7.2-g77 < %{gcc_rpmvers}-%{release} +Requires: i586-pc-freebsd7.2-gcc-libgfortran = %{gcc_rpmvers}-%{release} %description -n i586-pc-freebsd7.2-gcc-gfortran GCC fortran compiler for i586-pc-freebsd7.2. -%files -n i586-pc-freebsd7.2-gcc-gfortran -f build/files.gfortran +%files -n i586-pc-freebsd7.2-gcc-gfortran %defattr(-,root,root) %{_bindir}/i586-pc-freebsd7.2-gfortran%{_exeext} @@ -514,6 +550,24 @@ GCC fortran compiler for i586-pc-freebsd7.2. %dir %{_libexecdir}/gcc/i586-pc-freebsd7.2/%{gcc_version} %{_libexecdir}/gcc/i586-pc-freebsd7.2/%{gcc_version}/f951%{_exeext} +# ============================================================== +# i586-pc-freebsd7.2-gcc-libgfortran +# ============================================================== +%package -n i586-pc-freebsd7.2-gcc-libgfortran +Summary: Fortran 95 support libraries for i586-pc-freebsd7.2-gcc +Group: Development/Tools +Version: %{gcc_rpmvers} +%{?_with_noarch_subpackages:BuildArch: noarch} +License: GPL + +%description -n i586-pc-freebsd7.2-gcc-libgfortran +%{_summary} + +%files -n i586-pc-freebsd7.2-gcc-libgfortran -f build/files.gfortran +%defattr(-,root,root) +%dir %{_gcclibdir}/gcc +%dir %{_gcclibdir}/gcc/i586-pc-freebsd7.2 +%dir %{_gcclibdir}/gcc/i586-pc-freebsd7.2/%{gcc_version} %if "%{gcc_version}" >= "4.2.0" %{_gcclibdir}/gcc/i586-pc-freebsd7.2/%{gcc_version}/finclude %endif @@ -526,21 +580,38 @@ Summary: Objective C support for i586-pc-freebsd7.2-gcc Group: Development/Tools Version: %{gcc_rpmvers} License: GPL -Provides: i586-pc-freebsd7.2-objc = %{gcc_rpmvers}-%{release} -Obsoletes: i586-pc-freebsd7.2-objc < %{gcc_rpmvers}-%{release} Requires: i586-pc-freebsd7.2-gcc = %{gcc_rpmvers}-%{release} +Requires: i586-pc-freebsd7.2-gcc-libobjc = %{gcc_rpmvers}-%{release} %description -n i586-pc-freebsd7.2-gcc-objc GCC objc compiler for i586-pc-freebsd7.2. -%files -n i586-pc-freebsd7.2-gcc-objc -f build/files.objc +%files -n i586-pc-freebsd7.2-gcc-objc %defattr(-,root,root) - %dir %{_libexecdir}/gcc %dir %{_libexecdir}/gcc/i586-pc-freebsd7.2 %dir %{_libexecdir}/gcc/i586-pc-freebsd7.2/%{gcc_version} %{_libexecdir}/gcc/i586-pc-freebsd7.2/%{gcc_version}/cc1obj%{_exeext} +# ============================================================== +# i586-pc-freebsd7.2-gcc-libobjc +# ============================================================== +%package -n i586-pc-freebsd7.2-gcc-libobjc +Summary: Objective C support for i586-pc-freebsd7.2-gcc +Group: Development/Tools +Version: %{gcc_rpmvers} +%{?_with_noarch_subpackages:BuildArch: noarch} +License: GPL + +%description -n i586-pc-freebsd7.2-gcc-libobjc +Support libraries for GCC's objc compiler for i586-pc-freebsd7.2. + +%files -n i586-pc-freebsd7.2-gcc-libobjc -f build/files.objc +%defattr(-,root,root) +%dir %{_gcclibdir}/gcc +%dir %{_gcclibdir}/gcc/i586-pc-freebsd7.2 +%dir %{_gcclibdir}/gcc/i586-pc-freebsd7.2/%{gcc_version} +%dir %{_gcclibdir}/gcc/i586-pc-freebsd7.2/%{gcc_version}/include %{_gcclibdir}/gcc/i586-pc-freebsd7.2/%{gcc_version}/include/objc