Changeset 1eb6505 in rtems


Ignore:
Timestamp:
Apr 22, 2005, 5:15:44 AM (15 years ago)
Author:
Ralf Corsepius <ralf.corsepius@…>
Branches:
4.10, 4.11, 4.8, 4.9, master
Children:
b898358c
Parents:
6d4ad17
Message:

2005-04-22 Ralf Corsepius <ralf.corsepius@…>

  • gccnewlib/base-gfortran.add, gccnewlib/target-gfortran.add: New.
  • gccnewlib/Makefile.am: Reflect addition of gfortran.
  • gccnewlib/base-g77.add, gccnewlib/base-gcc.add, gccnewlib/base-gcj.add, gccnewlib/base-gnat.add, gccnewlib/target-g++.add, gccnewlib/target-g77.add, gccnewlib/target-gcc.add, gccnewlib/target-gcj.add, gccnewlib/target-gnat.add: Remove RPM_INSTALL_PREFIX. Remove superfluous %doc directives. Use %_infodir, %_includedir, %_bindir, %_libdir.
  • gccnewlib/gccnewlib.add: Ditto. Add further BR's, Reflect addition of gfortran. Reflect gcc's changes to "version_string".
Location:
scripts
Files:
12 edited

Legend:

Unmodified
Added
Removed
  • scripts/ChangeLog

    r6d4ad17 r1eb6505  
     12005-04-22      Ralf Corsepius <ralf.corsepius@rtems.org>
     2
     3        * gccnewlib/base-gfortran.add, gccnewlib/target-gfortran.add: New.
     4        * gccnewlib/Makefile.am: Reflect addition of gfortran.
     5        * gccnewlib/base-g77.add, gccnewlib/base-gcc.add, gccnewlib/base-gcj.add,
     6        gccnewlib/base-gnat.add, gccnewlib/target-g++.add, gccnewlib/target-g77.add,
     7        gccnewlib/target-gcc.add, gccnewlib/target-gcj.add,
     8        gccnewlib/target-gnat.add:
     9        Remove RPM_INSTALL_PREFIX. Remove superfluous
     10        %doc directives. Use %_infodir, %_includedir, %_bindir, %_libdir.
     11        * gccnewlib/gccnewlib.add: Ditto.
     12        Add further BR's, Reflect addition of gfortran.
     13        Reflect gcc's changes to "version_string".
     14
    1152005-04-20      Ralf Corsepius <ralf.corsepius@rtems.org>
    216
  • scripts/gccnewlib/Makefile.am

    r6d4ad17 r1eb6505  
    1111SUBPACKAGES += gccnewlib.add
    1212SUBPACKAGES += $(top_builddir)/common/clean.add
    13 SUBPACKAGES += base-gcc.add target-gcc.add base-g77.add target-g77.add \
    14     base-gcj.add target-gcj.add target-objc.add target-c++.add base-gnat.add \
    15     target-gnat.add
     13SUBPACKAGES += base-gcc.add target-gcc.add
     14SUBPACKAGES += base-g77.add target-g77.add
     15SUBPACKAGES += base-gcj.add target-gcj.add
     16SUBPACKAGES += base-gfortran.add target-gfortran.add
     17SUBPACKAGES += target-objc.add
     18SUBPACKAGES += target-c++.add
     19SUBPACKAGES += base-gnat.add target-gnat.add
    1620
    1721noinst_DATA = gccnewlib.spec.in
  • scripts/gccnewlib/base-g77.add

    r6d4ad17 r1eb6505  
    1616%defattr(-,root,root)
    1717%dir %{_infodir}
    18 %doc %{_infodir}/g77.info*.gz
     18%{_infodir}/g77.info*.gz
    1919
    2020%dir %{_mandir}
    2121%dir %{_mandir}/man1
    22 %doc %{_mandir}/man1/%{gcc_target}-g77.1*
     22%{_mandir}/man1/%{gcc_target}-g77.1*
    2323
    2424%post -n %{rpmprefix}rtems@osversion@-base-g77
    25   if test -d $RPM_INSTALL_PREFIX%{_infodir};
     25  if test -d %{_infodir};
    2626  then
    27     rm -f $RPM_INSTALL_PREFIX%{_infodir}/dir
    28     f=`find $RPM_INSTALL_PREFIX%{_infodir} -name '*.info.gz'`
     27    rm -f %{_infodir}/dir
     28    f=`find %{_infodir} -name '*.info.gz'`
    2929    test -n "$f" && for i in $f; do
    30       install-info $i $RPM_INSTALL_PREFIX%{_infodir}/dir
     30      install-info $i %{_infodir}/dir
    3131    done
    3232  fi
    3333
    3434%postun -n %{rpmprefix}rtems@osversion@-base-g77
    35   if test -d $RPM_INSTALL_PREFIX%{_infodir};
     35  if test -d %{_infodir};
    3636  then
    37     rm -f $RPM_INSTALL_PREFIX%{_infodir}/dir
    38     f=`find $RPM_INSTALL_PREFIX%{_infodir} -name '*.info.gz'`
     37    rm -f %{_infodir}/dir
     38    f=`find %{_infodir} -name '*.info.gz'`
    3939    test -n "$f" && for i in $f; do
    40       install-info $i $RPM_INSTALL_PREFIX%{_infodir}/dir
     40      install-info $i %{_infodir}/dir
    4141    done
    4242  fi
  • scripts/gccnewlib/base-gcc.add

    r6d4ad17 r1eb6505  
    1515%defattr(-,root,root)
    1616%dir %{_infodir}
    17 %doc %{_infodir}/cpp.info*
    18 %doc %{_infodir}/cppinternals.info*
    19 %doc %{_infodir}/gcc.info*
    20 %doc %{_infodir}/libc.info*
    21 %doc %{_infodir}/libm.info*
    22 %doc %{_infodir}/gccint.info*
     17%{_infodir}/cpp.info*
     18%{_infodir}/cppinternals.info*
     19%{_infodir}/gcc.info*
     20%{_infodir}/libc.info*
     21%{_infodir}/libm.info*
     22%{_infodir}/gccint.info*
    2323%if "%{gcc_version}" >= "3.4"
    24 %doc %{_infodir}/gccinstall.info*
     24%{_infodir}/gccinstall.info*
    2525%endif
    2626
     
    2828%if "%{gcc_version}" < "3.4"
    2929%dir %{_mandir}/man1
    30 %doc %{_mandir}/man1/cpp.1*
    31 %doc %{_mandir}/man1/gcov.1*
     30%{_mandir}/man1/cpp.1*
     31%{_mandir}/man1/gcov.1*
    3232%endif
    3333%dir %{_mandir}/man7
    34 %doc %{_mandir}/man7/fsf-funding.7*
    35 %doc %{_mandir}/man7/gfdl.7*
    36 %doc %{_mandir}/man7/gpl.7*
     34%{_mandir}/man7/fsf-funding.7*
     35%{_mandir}/man7/gfdl.7*
     36%{_mandir}/man7/gpl.7*
    3737
    38 %dir %{_prefix}/include
     38%dir %{_includedir}
    3939
    4040%post -n %{rpmprefix}rtems@osversion@-base-gcc
    41   if test -d $RPM_INSTALL_PREFIX%{_infodir};
     41  if test -d %{_infodir};
    4242  then
    43     rm -f $RPM_INSTALL_PREFIX%{_infodir}/dir
    44     f=`find $RPM_INSTALL_PREFIX%{_infodir} -name '*.info.gz'`
     43    rm -f %{_infodir}/dir
     44    f=`find %{_infodir} -name '*.info.gz'`
    4545    test -n "$f" && for i in $f; do
    46       install-info $i $RPM_INSTALL_PREFIX%{_infodir}/dir
     46      install-info $i %{_infodir}/dir
    4747    done
    4848  fi
    4949
    5050%postun -n %{rpmprefix}rtems@osversion@-base-gcc
    51   if test -d $RPM_INSTALL_PREFIX%{_infodir};
     51  if test -d %{_infodir};
    5252  then
    53     rm -f $RPM_INSTALL_PREFIX%{_infodir}/dir
    54     f=`find $RPM_INSTALL_PREFIX%{_infodir} -name '*.info.gz'`
     53    rm -f %{_infodir}/dir
     54    f=`find %{_infodir} -name '*.info.gz'`
    5555    test -n "$f" && for i in $f; do
    56       install-info $i $RPM_INSTALL_PREFIX%{_infodir}/dir
     56      install-info $i %{_infodir}/dir
    5757    done
    5858  fi
  • scripts/gccnewlib/base-gcj.add

    r6d4ad17 r1eb6505  
    1616%defattr(-,root,root)
    1717%if "%{gcc_version}" <= "3.4"
    18 %dir %{_prefix}/bin
    19 %{_prefix}/bin/jar%{_exeext}
    20 %{_prefix}/bin/grepjar%{_exeext}
     18%dir %{_bindir}
     19%{_bindir}/jar%{_exeext}
     20%{_bindir}/grepjar%{_exeext}
    2121%endif
    2222
    2323%dir %{_infodir}
    24 %doc %{_infodir}/gcj.info*
     24%{_infodir}/gcj.info*
    2525%if "%{gcc_version}" >= "3.3"
    26 %doc %{_infodir}/fastjar.info*
     26%{_infodir}/fastjar.info*
    2727%endif
    2828%if "%{gcc_version}" >= "3.3" && "%{gcc_version}" <= "3.4"
    2929%dir %{_mandir}/man1
    30 %doc %{_mandir}/man1/gcjh.1*
    31 %doc %{_mandir}/man1/jv-scan.1*
    32 %doc %{_mandir}/man1/jcf-dump.1*
    33 %doc %{_mandir}/man1/gij.1*
    34 %doc %{_mandir}/man1/jv-convert.1*
    35 %doc %{_mandir}/man1/rmic.1*
    36 %doc %{_mandir}/man1/rmiregistry.1*
    37 %doc %{_mandir}/man1/jar.1*
    38 %doc %{_mandir}/man1/grepjar.1*
     30%{_mandir}/man1/gcjh.1*
     31%{_mandir}/man1/jv-scan.1*
     32%{_mandir}/man1/jcf-dump.1*
     33%{_mandir}/man1/gij.1*
     34%{_mandir}/man1/jv-convert.1*
     35%{_mandir}/man1/rmic.1*
     36%{_mandir}/man1/rmiregistry.1*
     37%{_mandir}/man1/jar.1*
     38%{_mandir}/man1/grepjar.1*
    3939%endif
    4040
  • scripts/gccnewlib/base-gnat.add

    r6d4ad17 r1eb6505  
    1414%files -n %{rpmprefix}rtems@osversion@-base-gnat
    1515%defattr(-,root,root)
    16 %dir %{_prefix}/bin
     16%dir %{_bindir}
    1717
    1818%if "%{gcc_version}" >= "3.3"
     
    2222%if "%{gcc_version}" >= "3.3"
    2323%post -n %{rpmprefix}rtems@osversion@-base-gnat
    24   if test -d $RPM_INSTALL_PREFIX%{_infodir};
     24  if test -d %{_infodir};
    2525  then
    26     rm -f $RPM_INSTALL_PREFIX%{_infodir}/dir
    27     f=`find $RPM_INSTALL_PREFIX%{_infodir} -name '*.info.gz'`
     26    rm -f %{_infodir}/dir
     27    f=`find %{_infodir} -name '*.info.gz'`
    2828    test -n "$f" && for i in $f; do
    29       install-info $i $RPM_INSTALL_PREFIX%{_infodir}/dir
     29      install-info $i %{_infodir}/dir
    3030    done
    3131  fi
    3232
    3333%postun -n %{rpmprefix}rtems@osversion@-base-gnat
    34   if test -d $RPM_INSTALL_PREFIX%{_infodir};
     34  if test -d %{_infodir};
    3535  then
    36     rm -f $RPM_INSTALL_PREFIX%{_infodir}/dir
    37     f=`find $RPM_INSTALL_PREFIX%{_infodir} -name '*.info.gz'`
     36    rm -f %{_infodir}/dir
     37    f=`find %{_infodir} -name '*.info.gz'`
    3838    test -n "$f" && for i in $f; do
    39       install-info $i $RPM_INSTALL_PREFIX%{_infodir}/dir
     39      install-info $i %{_infodir}/dir
    4040    done
    4141  fi
  • scripts/gccnewlib/gccnewlib.add

    r6d4ad17 r1eb6505  
    5757
    5858%define build_cxx       %{?cxx:%cxx}%{!?cxx:1}
     59%if "%{gcc_version}" >= "4.0.0"
     60%define build_f95       %{?f95:%f95}%{!?f95:0}
     61%define build_g77       0
     62%else
     63%define build_f95       0
    5964%define build_g77       %{?g77:%g77}%{!?g77:0}
     65%endif
    6066%define build_objc      %{?objc:%objc}%{!?objc:0}
    6167%define build_gcj       0
     
    116122%endif
    117123
     124%if "%_vendor" == "redhat"
    118125%if %build_gnat
    119126# Building gnat requires gnat
    120 %if "%_vendor" == "redhat"
    121127# This really isn't available until RedHat 8.0.  How to conditionalize this?
    122 # BuildPreReq:  gcc-gnat
     128BuildRequires:  gcc-gnat
     129%endif
     130%if %build_f95
     131BuildRequires: gmp-devel
    123132%endif
    124133%endif
     
    159168
    160169  cd gcc-%{gcc_version}
    161     sed -e 's/\(version_string = \"[^\"]*\)/\1 (RTEMS gcc-%{gcc_version}-@gcc_patch_version@\/newlib-%{newlib_version}-@newlib_patch_version@-@Release@)/' \
     170    sed -e 's/\(version_string.* = \"[^\"]*\)/\1 (RTEMS gcc-%{gcc_version}-@gcc_patch_version@\/newlib-%{newlib_version}-@newlib_patch_version@-@Release@)/' \
    162171    gcc/version.c > gcc/version.c~
    163172    mv gcc/version.c~  gcc/version.c
     
    184193%if %build_g77
    185194  languages="$languages,g77"
     195%endif
     196%if %build_f95
     197  languages="$languages,f95"
    186198%endif
    187199%if %build_gcj
     
    262274# If it doesn't find it, gcc doesn't install %{gcc_target}/bin/gcc
    263275%if "%{gcc_version}" < "3.0"
    264   ../gcc-%{gcc_version}/mkinstalldirs \
    265     $RPM_BUILD_ROOT%{_prefix}/%{gcc_target}/bin
     276  mkdir -p $RPM_BUILD_ROOT%{_prefix}/%{gcc_target}/bin
    266277%endif
    267278
     
    294305
    295306  # We use the version from binutils
    296   rm -f $RPM_BUILD_ROOT%{_prefix}/bin/%{gcc_target}-c++filt%{_exeext}
     307  rm -f $RPM_BUILD_ROOT%{_bindir}/%{gcc_target}-c++filt%{_exeext}
    297308
    298309  # We don't ship info/dir
    299310  rm -f $RPM_BUILD_ROOT%{_infodir}/dir
    300311
     312%if %build_f95
     313#  # Bug in gcc-4.0.0pre
     314#  mv $RPM_BUILD_ROOT%{_bindir}/gfortran $RPM_BUILD_ROOT%{_bindir}/%{gcc_target}-gfortran
     315%endif
     316
    301317%if "%{gcc_version}" >= "3.4"
    302318  # Bug in gcc-3.4.0pre
    303   rm -f $RPM_BUILD_ROOT%{_prefix}/bin/%{gcc_target}-%{gcc_target}-gcjh%{_exeext}
     319  rm -f $RPM_BUILD_ROOT%{_bindir}/%{gcc_target}-%{gcc_target}-gcjh%{_exeext}
    304320%endif
    305321
     
    307323  # Bug in gcc-3.3.x/gcc-3.4.x: Despite we don't need fixincludes, it installs
    308324  # the fixinclude-install-tools
     325  rm -rf ${RPM_BUILD_ROOT}%{gcclib}/%{gcc_target}/%{gcc_version}/install-tools
    309326  rm -rf ${RPM_BUILD_ROOT}%{gccexec}/%{gcc_target}/%{gcc_version}/install-tools
    310327%endif
     
    313330  # Bug in gcc-2.95.x: It bogusly tries to share cpp for all targets.
    314331  # Rename it to target_alias-cpp
    315   if test -f $RPM_BUILD_ROOT%{_prefix}/bin/cpp%{_exeext};
     332  if test -f $RPM_BUILD_ROOT%{_bindir}/cpp%{_exeext};
    316333  then
    317     mv $RPM_BUILD_ROOT%{_prefix}/bin/cpp%{_exeext} \
    318       $RPM_BUILD_ROOT%{_prefix}/bin/%{gcc_target}-cpp%{_exeext}
     334    mv $RPM_BUILD_ROOT%{_bindir}/cpp%{_exeext} \
     335      $RPM_BUILD_ROOT%{_bindir}/%{gcc_target}-cpp%{_exeext}
    319336  fi
    320337%endif
     
    363380  cp dirs files.gcc
    364381  cp dirs files.g77
     382  cp dirs files.gfortran
    365383  cp dirs files.objc
    366384  cp dirs files.gcj
     
    373391    *lib*.la) rm ${RPM_BUILD_ROOT}/$i ;; # ignore: gcc produces bogus libtool libs
    374392    *f771) ;;
     393    *f951) ;;
    375394    *cc1) ;;
    376395    *cc1obj) ;;
     
    386405    *jc1) ;;
    387406    *jvgenmain) ;;
     407    *libgfortran*.a) echo "$i" >> files.gfortran ;;
    388408    *libstdc++.a) echo "$i" >> files.g++ ;;
    389409    *libsupc++.a) echo "$i" >> files.g++ ;;
  • scripts/gccnewlib/target-c++.add

    r6d4ad17 r1eb6505  
    1515%files -n %{rpmprefix}%{gcc_target}-c++ -f build/files.g++
    1616%defattr(-,root,root)
    17 %doc %{_mandir}/man1/%{gcc_target}-g++.1*
     17%{_mandir}/man1/%{gcc_target}-g++.1*
    1818
    19 %dir %{_prefix}/bin
    20 %{_prefix}/bin/%{gcc_target}-c++%{_exeext}
    21 %{_prefix}/bin/%{gcc_target}-g++%{_exeext}
     19%dir %{_bindir}
     20%{_bindir}/%{gcc_target}-c++%{_exeext}
     21%{_bindir}/%{gcc_target}-g++%{_exeext}
    2222
    2323%{gccexec}/%{gcc_target}/%{gcc_version}/cc1plus%{_exeext}
  • scripts/gccnewlib/target-g77.add

    r6d4ad17 r1eb6505  
    1515%files -n %{rpmprefix}%{gcc_target}-g77 -f build/files.g77
    1616%defattr(-,root,root)
    17 %dir %{_prefix}/bin
    18 %{_prefix}/bin/%{gcc_target}-g77%{_exeext}
     17%dir %{_bindir}
     18%{_bindir}/%{gcc_target}-g77%{_exeext}
    1919
    2020%{gcclib}/%{gcc_target}/%{gcc_version}/f771%{_exeext}
  • scripts/gccnewlib/target-gcc.add

    r6d4ad17 r1eb6505  
    1414%files -n %{rpmprefix}%{gcc_target}-gcc -f build/files.gcc
    1515%defattr(-,root,root)
    16 %doc %{_mandir}/man1/%{gcc_target}-gcc.1*
     16%{_mandir}/man1/%{gcc_target}-gcc.1*
    1717%if "%{gcc_version}" >= "3.4"
    18 %doc %{_mandir}/man1/%{gcc_target}-cpp.1*
    19 %doc %{_mandir}/man1/%{gcc_target}-gcov.1*
     18%{_mandir}/man1/%{gcc_target}-cpp.1*
     19%{_mandir}/man1/%{gcc_target}-gcov.1*
    2020%endif
    21 %{_prefix}/bin/%{gcc_target}-cpp%{_exeext}
    22 %{_prefix}/bin/%{gcc_target}-gcc%{_exeext}
     21%{_bindir}/%{gcc_target}-cpp%{_exeext}
     22%{_bindir}/%{gcc_target}-gcc%{_exeext}
    2323%if "%{gcc_version}" >= "3.3"
    24 %{_prefix}/bin/%{gcc_target}-gcc-%{gcc_version}%{_exeext}
     24%{_bindir}/%{gcc_target}-gcc-%{gcc_version}%{_exeext}
    2525%endif
    26 %{_prefix}/bin/%{gcc_target}-gcov%{_exeext}
    27 %{_prefix}/bin/%{gcc_target}-gccbug
     26%{_bindir}/%{gcc_target}-gcov%{_exeext}
     27%{_bindir}/%{gcc_target}-gccbug
    2828%{_prefix}/%{gcc_target}/include
    2929
  • scripts/gccnewlib/target-gcj.add

    r6d4ad17 r1eb6505  
    1515%files -n %{rpmprefix}%{gcc_target}-gcj -f build/files.gcj
    1616%defattr(-,root,root)
    17 %dir %{_prefix}/bin
    18 %{_prefix}/bin/%{gcc_target}-gcj%{_exeext}
    19 %{_prefix}/bin/%{gcc_target}-jcf-dump%{_exeext}
    20 %{_prefix}/bin/%{gcc_target}-jv-scan%{_exeext}
    21 %{_prefix}/bin/%{gcc_target}-gcjh%{_exeext}
    22 %doc %{_mandir}/man1/%{gcc_target}-gcj.1*
     17%dir %{_bindir}
     18%{_bindir}/%{gcc_target}-gcj%{_exeext}
     19%{_bindir}/%{gcc_target}-jcf-dump%{_exeext}
     20%{_bindir}/%{gcc_target}-jv-scan%{_exeext}
     21%{_bindir}/%{gcc_target}-gcjh%{_exeext}
     22%{_mandir}/man1/%{gcc_target}-gcj.1*
    2323
    2424%if "%{gcc_version}" >= "3.4"
    25 %{_prefix}/bin/%{gcc_target}-jar%{_exeext}
    26 %{_prefix}/bin/%{gcc_target}-grepjar%{_exeext}
    27 %doc %{_mandir}/man1/%{gcc_target}-jar.1*
    28 %doc %{_mandir}/man1/%{gcc_target}-grepjar.1*
    29 %doc %{_mandir}/man1/%{gcc_target}-rmic.1*
    30 %doc %{_mandir}/man1/%{gcc_target}-rmiregistry.1*
    31 %doc %{_mandir}/man1/%{gcc_target}-gcjh.1*
    32 %doc %{_mandir}/man1/%{gcc_target}-gij.1*
    33 %doc %{_mandir}/man1/%{gcc_target}-jcf-dump.1*
    34 %doc %{_mandir}/man1/%{gcc_target}-jv-convert.1*
    35 %doc %{_mandir}/man1/%{gcc_target}-jv-scan.1*
     25%{_bindir}/%{gcc_target}-jar%{_exeext}
     26%{_bindir}/%{gcc_target}-grepjar%{_exeext}
     27%{_mandir}/man1/%{gcc_target}-jar.1*
     28%{_mandir}/man1/%{gcc_target}-grepjar.1*
     29%{_mandir}/man1/%{gcc_target}-rmic.1*
     30%{_mandir}/man1/%{gcc_target}-rmiregistry.1*
     31%{_mandir}/man1/%{gcc_target}-gcjh.1*
     32%{_mandir}/man1/%{gcc_target}-gij.1*
     33%{_mandir}/man1/%{gcc_target}-jcf-dump.1*
     34%{_mandir}/man1/%{gcc_target}-jv-convert.1*
     35%{_mandir}/man1/%{gcc_target}-jv-scan.1*
    3636%endif
    3737
  • scripts/gccnewlib/target-gnat.add

    r6d4ad17 r1eb6505  
    1515%files -n %{rpmprefix}%{gcc_target}-gnat
    1616%defattr(-,root,root)
    17 %dir %{_prefix}/bin
    18 %{_prefix}/bin/%{gcc_target}-gnat*
     17%dir %{_bindir}
     18%{_bindir}/%{gcc_target}-gnat*
    1919
    2020%{gccexec}/%{gcc_target}/%{gcc_version}/cc1plus%{_exeext}
Note: See TracChangeset for help on using the changeset viewer.