Changeset 02c7c81 in rtems


Ignore:
Timestamp:
Mar 27, 2004, 3:16:25 AM (16 years ago)
Author:
Ralf Corsepius <ralf.corsepius@…>
Branches:
4.10, 4.11, 4.8, 4.9, master
Children:
0720ff4
Parents:
1dec74de
Message:

2004-03-26 Ralf Corsepius <corsepiu@…>

  • Index: base-g77.add, base-gcc.add, base-gcj.add, base-gnat.add, gccnewlib.add, target-c++.add, target-gcc.add, target-gcj.add: Apply _infodir, _mandir. Gzip man pages. Reflect gcc having fixed gccinstall.info.
Location:
scripts
Files:
9 edited

Legend:

Unmodified
Added
Removed
  • scripts/ChangeLog

    r1dec74de r02c7c81  
     12004-03-26      Ralf Corsepius <corsepiu@faw.uni-ulm.de>
     2
     3        * Index: base-g77.add, base-gcc.add, base-gcj.add, base-gnat.add,
     4        gccnewlib.add, target-c++.add, target-gcc.add, target-gcj.add:
     5        Apply _infodir, _mandir. Gzip man pages.
     6        Reflect gcc having fixed gccinstall.info.
     7
    182004-03-26      Ralf Corsepius <corsepiu@faw.uni-ulm.de>
    29
  • scripts/gcc3newlib/base-g77.add

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

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

    r1dec74de r02c7c81  
    2121%endif
    2222
    23 %dir %{_prefix}/info
    24 %doc %{_prefix}/info/gcj.info*
     23%dir %{_infodir}
     24%doc %{_infodir}/gcj.info*
    2525%if "%{gcc_version}" >= "3.3"
    26 %doc %{_prefix}/info/fastjar.info*
     26%doc %{_infodir}/fastjar.info*
    2727%endif
    2828%if "%{gcc_version}" >= "3.3" && "%{gcc_version}" <= "3.4"
    29 %dir %{_prefix}/man/man1
    30 %doc %{_prefix}/man/man1/gcjh.1*
    31 %doc %{_prefix}/man/man1/jv-scan.1*
    32 %doc %{_prefix}/man/man1/jcf-dump.1*
    33 %doc %{_prefix}/man/man1/gij.1*
    34 %doc %{_prefix}/man/man1/jv-convert.1*
    35 %doc %{_prefix}/man/man1/rmic.1*
    36 %doc %{_prefix}/man/man1/rmiregistry.1*
    37 %doc %{_prefix}/man/man1/jar.1*
    38 %doc %{_prefix}/man/man1/grepjar.1*
     29%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*
    3939%endif
    4040
  • scripts/gcc3newlib/base-gnat.add

    r1dec74de r02c7c81  
    1717
    1818%if "%{gcc_version}" >= "3.3"
    19 %{_prefix}/info/gnat*
     19%{_infodir}/gnat*
    2020%endif
    2121
    2222%if "%{gcc_version}" >= "3.3"
    2323%post -n %{rpmprefix}rtems@osversion@-base-gnat
    24   if test -d $RPM_INSTALL_PREFIX%{_prefix}/info;
     24  if test -d $RPM_INSTALL_PREFIX%{_infodir};
    2525  then
    26     rm -f $RPM_INSTALL_PREFIX%{_prefix}/info/dir
    27     f=`find $RPM_INSTALL_PREFIX%{_prefix}/info -name '*.info.gz'`
     26    rm -f $RPM_INSTALL_PREFIX%{_infodir}/dir
     27    f=`find $RPM_INSTALL_PREFIX%{_infodir} -name '*.info.gz'`
    2828    test -n "$f" && for i in $f; do
    29       install-info $i $RPM_INSTALL_PREFIX%{_prefix}/info/dir
     29      install-info $i $RPM_INSTALL_PREFIX%{_infodir}/dir
    3030    done
    3131  fi
    3232
    3333%postun -n %{rpmprefix}rtems@osversion@-base-gnat
    34   if test -d $RPM_INSTALL_PREFIX%{_prefix}/info;
     34  if test -d $RPM_INSTALL_PREFIX%{_infodir};
    3535  then
    36     rm -f $RPM_INSTALL_PREFIX%{_prefix}/info/dir
    37     f=`find $RPM_INSTALL_PREFIX%{_prefix}/info -name '*.info.gz'`
     36    rm -f $RPM_INSTALL_PREFIX%{_infodir}/dir
     37    f=`find $RPM_INSTALL_PREFIX%{_infodir} -name '*.info.gz'`
    3838    test -n "$f" && for i in $f; do
    39       install-info $i $RPM_INSTALL_PREFIX%{_prefix}/info/dir
     39      install-info $i $RPM_INSTALL_PREFIX%{_infodir}/dir
    4040    done
    4141  fi
  • scripts/gcc3newlib/gccnewlib.add

    r1dec74de r02c7c81  
    196196  export PATH="%{_bindir}:${PATH}"
    197197  ../gcc-%{gcc_version}/configure \
     198    --prefix=%{_prefix} --mandir=%{_mandir} \
     199    --infodir=%{_infodir} \
    198200    --build=%_build --host=%_host \
    199201    --target=%{gcc_target} \
     
    201203    --with-system-zlib --disable-nls \
    202204    --enable-version-specific-runtime-libs \
    203     --enable-threads=rtems --prefix=%{_prefix} \
     205    --enable-threads=rtems \
    204206    --enable-languages=$languages ${libgcj_flag}
    205207
     
    265267
    266268  make prefix=$RPM_BUILD_ROOT%{_prefix} \
    267     bindir=$RPM_BUILD_ROOT%{_bindir} install
     269    bindir=$RPM_BUILD_ROOT%{_bindir} \
     270    mandir=$RPM_BUILD_ROOT%{_mandir} \
     271    infodir=$RPM_BUILD_ROOT%{_infodir} \
     272    install
    268273  cd %{gcc_target}/newlib
    269274  make prefix=$RPM_BUILD_ROOT%{_prefix} \
    270     bindir=$RPM_BUILD_ROOT%{_bindir} install-info
     275    bindir=$RPM_BUILD_ROOT%{_bindir} \
     276    mandir=$RPM_BUILD_ROOT%{_mandir} \
     277    infodir=$RPM_BUILD_ROOT%{_infodir} \
     278    install-info
    271279  # cd back to build/
    272280  cd ../..
     
    289297
    290298  # We don't ship info/dir
    291   rm -f $RPM_BUILD_ROOT%{_prefix}/info/dir
     299  rm -f $RPM_BUILD_ROOT%{_infodir}/dir
    292300
    293301%if "%{gcc_version}" >= "3.4"
    294302  # Bug in gcc-3.4.0pre
    295303  rm -f $RPM_BUILD_ROOT%{_prefix}/bin/%{gcc_target}-%{gcc_target}-gcjh%{_exeext}
    296 %if "%{gcc_version}" < "3.4.1"
    297   # Broken in gcc-3.4.0pre
    298   rm -f $RPM_BUILD_ROOT%{_infodir}/gccinstall.*
    299 %endif
    300304%endif
    301305
     
    317321
    318322  # gzip info files
    319   gzip -f $RPM_BUILD_ROOT%{_prefix}/info/*.info 2>/dev/null
    320 %if "%{gcc_version}" < "3.3"
     323  gzip -9qf $RPM_BUILD_ROOT%{_infodir}/*.info 2>/dev/null
     324%if "%{gcc_version}" < "3.3" || "%{gcc_version}" >= "3.4"
    321325  # gcc-3.3 ships monolytic *.infos
    322   gzip -f $RPM_BUILD_ROOT%{_prefix}/info/*.info-? 2>/dev/null
    323   gzip -f $RPM_BUILD_ROOT%{_prefix}/info/*.info-?? 2>/dev/null
    324 %endif
     326  gzip -9qf $RPM_BUILD_ROOT%{_infodir}/*.info-? 2>/dev/null
     327  gzip -9qf $RPM_BUILD_ROOT%{_infodir}/*.info-?? 2>/dev/null
     328%endif
     329
     330  # gzip man pages
     331  gzip -9qf $RPM_BUILD_ROOT%{_mandir}/man?/*.? 2>/dev/null
    325332
    326333  rm -f dirs ;
     
    368375    *cc1) ;;
    369376    *cc1obj) ;;
     377    *cc1plus) ;; # ignore: explicitly put into rpm elsewhere
    370378    *collect2) ;;
    371379    *libobjc*) echo "$i" >> files.objc ;;
     
    378386    *jc1) ;;
    379387    *jvgenmain) ;;
    380     *cc1plus) ;; # ignore: explicitly put into rpm elsewhere
    381388    *libstdc++.a) echo "$i" >> files.g++ ;;
    382389    *libsupc++.a) echo "$i" >> files.g++ ;;
  • scripts/gcc3newlib/target-c++.add

    r1dec74de r02c7c81  
    1515%files -n %{rpmprefix}%{gcc_target}-c++ -f build/files.g++
    1616%defattr(-,root,root)
    17 %doc %{_prefix}/man/man1/%{gcc_target}-g++.1*
     17%doc %{_mandir}/man1/%{gcc_target}-g++.1*
    1818
    1919%dir %{_prefix}/bin
  • scripts/gcc3newlib/target-gcc.add

    r1dec74de r02c7c81  
    1414%files -n %{rpmprefix}%{gcc_target}-gcc -f build/files.gcc
    1515%defattr(-,root,root)
    16 %doc %{_prefix}/man/man1/%{gcc_target}-gcc.1*
     16%doc %{_mandir}/man1/%{gcc_target}-gcc.1*
    1717%if "%{gcc_version}" >= "3.4"
    18 %doc %{_prefix}/man/man1/%{gcc_target}-cpp.1*
    19 %doc %{_prefix}/man/man1/%{gcc_target}-gcov.1*
     18%doc %{_mandir}/man1/%{gcc_target}-cpp.1*
     19%doc %{_mandir}/man1/%{gcc_target}-gcov.1*
    2020%endif
    2121%{_prefix}/bin/%{gcc_target}-cpp%{_exeext}
  • scripts/gcc3newlib/target-gcj.add

    r1dec74de r02c7c81  
    2020%{_prefix}/bin/%{gcc_target}-jv-scan%{_exeext}
    2121%{_prefix}/bin/%{gcc_target}-gcjh%{_exeext}
    22 %doc %{_prefix}/man/man1/%{gcc_target}-gcj.1*
     22%doc %{_mandir}/man1/%{gcc_target}-gcj.1*
    2323
    2424%if "%{gcc_version}" >= "3.4"
    2525%{_prefix}/bin/%{gcc_target}-jar%{_exeext}
    2626%{_prefix}/bin/%{gcc_target}-grepjar%{_exeext}
    27 %doc %{_prefix}/man/man1/%{gcc_target}-jar.1*
    28 %doc %{_prefix}/man/man1/%{gcc_target}-grepjar.1*
    29 %doc %{_prefix}/man/man1/%{gcc_target}-rmic.1*
    30 %doc %{_prefix}/man/man1/%{gcc_target}-rmiregistry.1*
    31 %doc %{_prefix}/man/man1/%{gcc_target}-gcjh.1*
    32 %doc %{_prefix}/man/man1/%{gcc_target}-gij.1*
    33 %doc %{_prefix}/man/man1/%{gcc_target}-jcf-dump.1*
    34 %doc %{_prefix}/man/man1/%{gcc_target}-jv-convert.1*
    35 %doc %{_prefix}/man/man1/%{gcc_target}-jv-scan.1*
     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*
    3636%endif
    3737
Note: See TracChangeset for help on using the changeset viewer.