Changeset 04da1c36 in rtems


Ignore:
Timestamp:
Aug 27, 2009, 10:05:56 AM (10 years ago)
Author:
Ralf Corsepius <ralf.corsepius@…>
Branches:
4.10, 4.11, master
Children:
a34a266a
Parents:
dff3caf
Message:

Modernize.

Location:
contrib/crossrpms/freebsd7.1/i586
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • contrib/crossrpms/freebsd7.1/i586/Makefile.am

    rdff3caf r04da1c36  
    66
    77FREEBSD_VERS = 7.1
    8 FREEBSD_RPMREL = @VERSION@
     8FREEBSD_RPMREL = 0.20090827.1
    99EXTRA_DIST += libs.add
    1010EXTRA_DIST += target-libs.add
    11 
    12 LIBS_SUBPACKAGES = $(top_srcdir)/common/common.add
    13 LIBS_SUBPACKAGES += $(srcdir)/libs.add
    14 LIBS_SUBPACKAGES += $(top_srcdir)/gcc/rpm-install.add
    15 LIBS_SUBPACKAGES += $(top_srcdir)/common/clean.add
    16 LIBS_SUBPACKAGES += $(srcdir)/target-libs.add
    17 
    18 $(TARGET)-libs.spec.in: $(LIBS_SUBPACKAGES) Makefile.am
    19         cat $(LIBS_SUBPACKAGES) | sed \
    20           -e "s/[@]FREEBSD_VERS[@]/$(FREEBSD_VERS)/g" \
    21           -e "s/[@]FREEBSD_RPMREL[@]/$(FREEBSD_RPMREL)/g" \
    22           -e "s,%{gcc_rpmvers},%{freebsd_rpmvers},g" \
    23         > $(TARGET)-libs.spec.in
    24 CLEANFILES += $(TARGET)-libs.spec.in
    25                              
    26 @rpmprefix@$(TARGET)-libs.spec: $(TARGET)-libs.spec.in
    27         $(MKSPEC) $(TARGET)-libs.spec.in | $(SPECSTRIP) > $@
    28 CLEANFILES += @rpmprefix@$(TARGET)-libs.spec
    29 noinst_DATA += @rpmprefix@$(TARGET)-libs.spec
    30 
     11include ../libs.am
    3112
    3213BINUTILS_VERS = 2.19
    3314BINUTILS_PKGVERS = $(BINUTILS_VERS)
    34 BINUTILS_RPMREL = @VERSION@%{?dist}
     15BINUTILS_RPMREL = 0.20090827.1
    3516include ../binutils.am
    3617BINUTILS_OPTS +=
    3718
    38 GCC_VERS = 4.3.3
     19GCC_VERS = 4.3.4
    3920GCC_PKGVERS = $(GCC_VERS)
    40 GCC_RPMREL = @VERSION@%{?dist}
     21GCC_RPMREL = 0.20090827.1
    4122include ../gcc.am
    4223GCC_OPTS += --languages=cxx,fortran,objc
  • contrib/crossrpms/freebsd7.1/i586/i586-pc-freebsd7.1-binutils.spec

    rdff3caf r04da1c36  
    3939Group:          Development/Tools
    4040Version:        %{binutils_rpmvers}
    41 Release:        0.20090506.1%{?dist}
     41Release:        0.20090827.1%{?dist}
    4242License:        GPL/LGPL
    4343URL:            http://sources.redhat.com/binutils
  • contrib/crossrpms/freebsd7.1/i586/i586-pc-freebsd7.1-gcc.spec

    rdff3caf r04da1c36  
    3232
    3333
    34 %define gcc_pkgvers 4.3.3
    35 %define gcc_version 4.3.3
    36 %define gcc_rpmvers %{expand:%(echo "4.3.3" | tr - _ )}
     34%define gcc_pkgvers 4.3.4
     35%define gcc_version 4.3.4
     36%define gcc_rpmvers %{expand:%(echo "4.3.4" | tr - _ )}
    3737
    3838
     
    4242Group:          Development/Tools
    4343Version:        %{gcc_rpmvers}
    44 Release:        0.20090506.1%{?dist}
     44Release:        0.20090827.1%{?dist}
    4545License:        GPL
    4646URL:            http://gcc.gnu.org
     
    8484%if %{defined _mpfr_minvers}
    8585# FIXME: This is an ugly cludge
    86 %{?fc9:%global mpfr_provided 2.3.1}
    8786%{?fc10:%global mpfr_provided 2.3.2}
    8887%{?fc11:%global mpfr_provided 2.4.1}
    8988%{?suse10_3:%global mpfr_provided 2.2.1}
     89%{?suse11_0:%global mpfr_provided 2.3.1}
     90%{?suse11_1:%global mpfr_provided 2.3.2}
    9091%{?cygwin:%global mpfr_provided 2.4.1}
    9192%{?mingw32:%global mpfr_provided %{nil}}
     
    124125
    125126
    126 %if "%{gcc_version}" >= "3.4"
    127 %define gcclib %{_libdir}/gcc
    128 %define gccexec %{_libexecdir}/gcc
    129 %else
    130 %define gcclib %{_libdir}/gcc-lib
    131 %define gccexec %{_libdir}/gcc-lib
    132 %endif
     127%define _gcclibdir %{_prefix}/lib
    133128
    134129Source0:        ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-core-%{gcc_pkgvers}.tar.bz2
     
    188183  languages="c"
    189184  languages="$languages,c++"
    190   languages="$languages,f95"
     185  languages="$languages,fortran"
    191186  languages="$languages,objc"
    192187%if "%{_build}" != "%{_host}"
     
    202197    --exec_prefix=%{_exec_prefix} \
    203198    --includedir=%{_includedir} \
    204     --libdir=%{_libdir} \
     199    --libdir=%{_gcclibdir} \
    205200    --libexecdir=%{_libexecdir} \
    206201    --mandir=%{_mandir} \
     
    242237  if test -f $RPM_BUILD_ROOT%{_includedir}/mf-runtime.h; then
    243238    mv $RPM_BUILD_ROOT%{_includedir}/mf-runtime.h \
    244       $RPM_BUILD_ROOT%{gcclib}/i586-pc-freebsd7.1/%{gcc_version}/include/
     239      $RPM_BUILD_ROOT%{_gcclibdir}/gcc/i586-pc-freebsd7.1/%{gcc_version}/include/
    245240  fi
    246241%endif
    247242
    248243  # host library
     244%if "%{gcc_version}" >= "4.2.0"
     245  # libiberty doesn't honor --libdir, but always installs to a
     246  # magically guessed _libdir
    249247  rm -f  ${RPM_BUILD_ROOT}%{_libdir}/libiberty.a
     248%else
     249  # libiberty installs to --libdir=...
     250  rm -f ${RPM_BUILD_ROOT}%{_gcclibdir}/libiberty.a
     251%endif
    250252
    251253  # We use the version from binutils
     
    259261  rm -rf $RPM_BUILD_ROOT%{_mandir}/man7
    260262
    261 #  # Bug in gcc-4.0.0pre
    262 #  mv $RPM_BUILD_ROOT%{_bindir}/gfortran $RPM_BUILD_ROOT%{_bindir}/i586-pc-freebsd7.1-gfortran
    263 
    264 %if "%{gcc_version}" >= "3.4"
    265263  # Bug in gcc-3.4.0pre
    266264  rm -f $RPM_BUILD_ROOT%{_bindir}/i586-pc-freebsd7.1-i586-pc-freebsd7.1-gcjh%{_exeext}
    267 %endif
    268 
    269 %if "%{gcc_version}" >= "3.3"
     265
    270266  # Bug in gcc-3.3.x/gcc-3.4.x: Despite we don't need fixincludes, it installs
    271267  # the fixinclude-install-tools
    272   rm -rf ${RPM_BUILD_ROOT}%{gcclib}/i586-pc-freebsd7.1/%{gcc_version}/install-tools
    273   rm -rf ${RPM_BUILD_ROOT}%{gccexec}/i586-pc-freebsd7.1/%{gcc_version}/install-tools
    274 %endif
     268  rm -rf ${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/i586-pc-freebsd7.1/%{gcc_version}/install-tools
     269  rm -rf ${RPM_BUILD_ROOT}%{_libexecdir}/gcc/i586-pc-freebsd7.1/%{gcc_version}/install-tools
    275270
    276271  # Bug in gcc > 4.1.0: Installs an unused, empty directory
     
    285280  rm -f dirs ;
    286281  echo "%defattr(-,root,root,-)" >> dirs
    287   echo "%dir %{gcclib}" >> dirs
    288   echo "%dir %{gcclib}/i586-pc-freebsd7.1" >> dirs
    289 
    290   TGTDIR="%{gcclib}/i586-pc-freebsd7.1/%{gcc_version}"
     282  echo "%dir %{_gcclibdir}/gcc" >> dirs
     283  echo "%dir %{_gcclibdir}/gcc/i586-pc-freebsd7.1" >> dirs
     284
     285  TGTDIR="%{_gcclibdir}/gcc/i586-pc-freebsd7.1/%{gcc_version}"
    291286  for i in $f; do
    292287    case $i in
     
    300295  # Collect files to go into different packages
    301296  cp dirs build/files.gcc
    302   cp dirs build/files.g77
    303297  cp dirs build/files.gfortran
    304298  cp dirs build/files.objc
     
    306300  cp dirs build/files.g++
    307301
    308   TGTDIR="%{gcclib}/i586-pc-freebsd7.1/%{gcc_version}"
     302  TGTDIR="%{_gcclibdir}/gcc/i586-pc-freebsd7.1/%{gcc_version}"
    309303  f=`find ${RPM_BUILD_ROOT}${TGTDIR} ! -type d -print | sed -e "s,^$RPM_BUILD_ROOT,,g"`;
    310304  for i in $f; do
     
    321315    *include/g++*);;
    322316    *include/c++*);;
     317    *finclude/*);;
    323318    *adainclude*);;
    324319    *adalib*);;
     
    368363#!/bin/sh
    369364grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/i586-pc-freebsd7.1/(lib|include|sys-root)' \
    370   | grep -v '^${RPM_BUILD_ROOT}%{gcclib}/i586-pc-freebsd7.1/' | %__find_provides
     365  %{?_gcclibdir:| grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/i586-pc-freebsd7.1/'} | %__find_provides
    371366EOF
    372367chmod +x %{_builddir}/%{name}-%{gcc_rpmvers}/find-provides
     
    376371#!/bin/sh
    377372grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/i586-pc-freebsd7.1/(lib|include|sys-root)' \
    378   | grep -v '^${RPM_BUILD_ROOT}%{gcclib}/i586-pc-freebsd7.1/' | %__find_requires
     373  %{?_gcclibdir:| grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/i586-pc-freebsd7.1/'} | %__find_requires
    379374EOF
    380375chmod +x %{_builddir}/%{name}-%{gcc_rpmvers}/find-requires
     
    428423%defattr(-,root,root)
    429424%{_mandir}/man1/i586-pc-freebsd7.1-gcc.1*
    430 %if "%{gcc_version}" >= "3.4"
    431425%{_mandir}/man1/i586-pc-freebsd7.1-cpp.1*
    432426%{_mandir}/man1/i586-pc-freebsd7.1-gcov.1*
    433 %endif
    434427
    435428%{_bindir}/i586-pc-freebsd7.1-cpp%{_exeext}
    436429%{_bindir}/i586-pc-freebsd7.1-gcc%{_exeext}
    437 %if "%{gcc_version}" >= "3.3"
    438430%{_bindir}/i586-pc-freebsd7.1-gcc-%{gcc_version}%{_exeext}
    439 %endif
    440431%{_bindir}/i586-pc-freebsd7.1-gcov%{_exeext}
    441432%{_bindir}/i586-pc-freebsd7.1-gccbug
    442433
    443 %dir %{gcclib}/i586-pc-freebsd7.1/%{gcc_version}/include
     434%dir %{_gcclibdir}/gcc/i586-pc-freebsd7.1/%{gcc_version}/include
    444435%if "%{gcc_version}" > "4.0.3"
    445436%if "i586-pc-freebsd7.1" != "bfin-rtems4.10"
    446437%if "i586-pc-freebsd7.1" != "avr-rtems4.10"
    447 %dir %{gcclib}/i586-pc-freebsd7.1/%{gcc_version}/include/ssp
     438%dir %{_gcclibdir}/gcc/i586-pc-freebsd7.1/%{gcc_version}/include/ssp
    448439%endif
    449440%endif
     
    451442
    452443%if "%{gcc_version}" >= "4.3.0"
    453 %dir %{gcclib}/i586-pc-freebsd7.1/%{gcc_version}/include-fixed
    454 %endif
    455 
    456 %dir %{gccexec}
    457 %dir %{gccexec}/i586-pc-freebsd7.1
    458 %dir %{gccexec}/i586-pc-freebsd7.1/%{gcc_version}
    459 %{gccexec}/i586-pc-freebsd7.1/%{gcc_version}/cc1%{_exeext}
    460 %{gccexec}/i586-pc-freebsd7.1/%{gcc_version}/collect2%{_exeext}
     444%dir %{_gcclibdir}/gcc/i586-pc-freebsd7.1/%{gcc_version}/include-fixed
     445%endif
     446
     447%dir %{_libexecdir}/gcc
     448%dir %{_libexecdir}/gcc/i586-pc-freebsd7.1
     449%dir %{_libexecdir}/gcc/i586-pc-freebsd7.1/%{gcc_version}
     450%{_libexecdir}/gcc/i586-pc-freebsd7.1/%{gcc_version}/cc1%{_exeext}
     451%{_libexecdir}/gcc/i586-pc-freebsd7.1/%{gcc_version}/collect2%{_exeext}
    461452
    462453# ==============================================================
     
    487478%{_bindir}/i586-pc-freebsd7.1-g++%{_exeext}
    488479
    489 %dir %{gccexec}
    490 %dir %{gccexec}/i586-pc-freebsd7.1
    491 %dir %{gccexec}/i586-pc-freebsd7.1/%{gcc_version}
    492 %{gccexec}/i586-pc-freebsd7.1/%{gcc_version}/cc1plus%{_exeext}
    493 
    494 %dir %{gcclib}/i586-pc-freebsd7.1/%{gcc_version}/include
    495 %{gcclib}/i586-pc-freebsd7.1/%{gcc_version}/include/c++
     480%dir %{_libexecdir}/gcc
     481%dir %{_libexecdir}/gcc/i586-pc-freebsd7.1
     482%dir %{_libexecdir}/gcc/i586-pc-freebsd7.1/%{gcc_version}
     483%{_libexecdir}/gcc/i586-pc-freebsd7.1/%{gcc_version}/cc1plus%{_exeext}
     484
     485%dir %{_gcclibdir}/gcc/i586-pc-freebsd7.1/%{gcc_version}/include
     486%{_gcclibdir}/gcc/i586-pc-freebsd7.1/%{gcc_version}/include/c++
    496487
    497488# ==============================================================
     
    519510%{_mandir}/man1/i586-pc-freebsd7.1-gfortran.1*
    520511
    521 %dir %{gccexec}
    522 %dir %{gccexec}/i586-pc-freebsd7.1
    523 %dir %{gccexec}/i586-pc-freebsd7.1/%{gcc_version}
    524 %{gccexec}/i586-pc-freebsd7.1/%{gcc_version}/f951%{_exeext}
     512%dir %{_libexecdir}/gcc
     513%dir %{_libexecdir}/gcc/i586-pc-freebsd7.1
     514%dir %{_libexecdir}/gcc/i586-pc-freebsd7.1/%{gcc_version}
     515%{_libexecdir}/gcc/i586-pc-freebsd7.1/%{gcc_version}/f951%{_exeext}
     516
     517%if "%{gcc_version}" >= "4.2.0"
     518%{_gcclibdir}/gcc/i586-pc-freebsd7.1/%{gcc_version}/finclude
     519%endif
    525520
    526521# ==============================================================
     
    543538%defattr(-,root,root)
    544539
    545 %dir %{gccexec}
    546 %dir %{gccexec}/i586-pc-freebsd7.1
    547 %dir %{gccexec}/i586-pc-freebsd7.1/%{gcc_version}
    548 %{gccexec}/i586-pc-freebsd7.1/%{gcc_version}/cc1obj%{_exeext}
    549 
    550 %{gcclib}/i586-pc-freebsd7.1/%{gcc_version}/include/objc
    551 
     540%dir %{_libexecdir}/gcc
     541%dir %{_libexecdir}/gcc/i586-pc-freebsd7.1
     542%dir %{_libexecdir}/gcc/i586-pc-freebsd7.1/%{gcc_version}
     543%{_libexecdir}/gcc/i586-pc-freebsd7.1/%{gcc_version}/cc1obj%{_exeext}
     544
     545%{_gcclibdir}/gcc/i586-pc-freebsd7.1/%{gcc_version}/include/objc
     546
  • contrib/crossrpms/freebsd7.1/i586/i586-pc-freebsd7.1-libs.spec

    rdff3caf r04da1c36  
    3838
    3939Name:           i586-pc-freebsd7.1
    40 Release:        0.20090506.1%{?dist}
     40Release:        0.20090827.1%{?dist}%{?dist}
    4141License:        FreeBSD
    4242Group:          Development/Tools
     
    154154#!/bin/sh
    155155grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/i586-pc-freebsd7.1/(lib|include|sys-root)' \
    156   | grep -v '^${RPM_BUILD_ROOT}%{gcclib}/i586-pc-freebsd7.1/' | %__find_provides
     156  %{?_gcclibdir:| grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/i586-pc-freebsd7.1/'} | %__find_provides
    157157EOF
    158158chmod +x %{_builddir}/%{name}-%{freebsd_rpmvers}/find-provides
     
    162162#!/bin/sh
    163163grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/i586-pc-freebsd7.1/(lib|include|sys-root)' \
    164   | grep -v '^${RPM_BUILD_ROOT}%{gcclib}/i586-pc-freebsd7.1/' | %__find_requires
     164  %{?_gcclibdir:| grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/i586-pc-freebsd7.1/'} | %__find_requires
    165165EOF
    166166chmod +x %{_builddir}/%{name}-%{freebsd_rpmvers}/find-requires
Note: See TracChangeset for help on using the changeset viewer.