Changeset 1eb65053 in rtems
- Timestamp:
- 04/22/05 05:15:44 (19 years ago)
- Branches:
- 4.10, 4.11, 4.8, 4.9, 5, master
- Children:
- b898358c
- Parents:
- 6d4ad173
- Location:
- scripts
- Files:
-
- 12 edited
Legend:
- Unmodified
- Added
- Removed
-
scripts/ChangeLog
r6d4ad173 r1eb65053 1 2005-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 1 15 2005-04-20 Ralf Corsepius <ralf.corsepius@rtems.org> 2 16 -
scripts/gccnewlib/Makefile.am
r6d4ad173 r1eb65053 11 11 SUBPACKAGES += gccnewlib.add 12 12 SUBPACKAGES += $(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 13 SUBPACKAGES += base-gcc.add target-gcc.add 14 SUBPACKAGES += base-g77.add target-g77.add 15 SUBPACKAGES += base-gcj.add target-gcj.add 16 SUBPACKAGES += base-gfortran.add target-gfortran.add 17 SUBPACKAGES += target-objc.add 18 SUBPACKAGES += target-c++.add 19 SUBPACKAGES += base-gnat.add target-gnat.add 16 20 17 21 noinst_DATA = gccnewlib.spec.in -
scripts/gccnewlib/base-g77.add
r6d4ad173 r1eb65053 16 16 %defattr(-,root,root) 17 17 %dir %{_infodir} 18 % doc %{_infodir}/g77.info*.gz18 %{_infodir}/g77.info*.gz 19 19 20 20 %dir %{_mandir} 21 21 %dir %{_mandir}/man1 22 % doc %{_mandir}/man1/%{gcc_target}-g77.1*22 %{_mandir}/man1/%{gcc_target}-g77.1* 23 23 24 24 %post -n %{rpmprefix}rtems@osversion@-base-g77 25 if test -d $RPM_INSTALL_PREFIX%{_infodir};25 if test -d %{_infodir}; 26 26 then 27 rm -f $RPM_INSTALL_PREFIX%{_infodir}/dir28 f=`find $RPM_INSTALL_PREFIX%{_infodir} -name '*.info.gz'`27 rm -f %{_infodir}/dir 28 f=`find %{_infodir} -name '*.info.gz'` 29 29 test -n "$f" && for i in $f; do 30 install-info $i $RPM_INSTALL_PREFIX%{_infodir}/dir30 install-info $i %{_infodir}/dir 31 31 done 32 32 fi 33 33 34 34 %postun -n %{rpmprefix}rtems@osversion@-base-g77 35 if test -d $RPM_INSTALL_PREFIX%{_infodir};35 if test -d %{_infodir}; 36 36 then 37 rm -f $RPM_INSTALL_PREFIX%{_infodir}/dir38 f=`find $RPM_INSTALL_PREFIX%{_infodir} -name '*.info.gz'`37 rm -f %{_infodir}/dir 38 f=`find %{_infodir} -name '*.info.gz'` 39 39 test -n "$f" && for i in $f; do 40 install-info $i $RPM_INSTALL_PREFIX%{_infodir}/dir40 install-info $i %{_infodir}/dir 41 41 done 42 42 fi -
scripts/gccnewlib/base-gcc.add
r6d4ad173 r1eb65053 15 15 %defattr(-,root,root) 16 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*17 %{_infodir}/cpp.info* 18 %{_infodir}/cppinternals.info* 19 %{_infodir}/gcc.info* 20 %{_infodir}/libc.info* 21 %{_infodir}/libm.info* 22 %{_infodir}/gccint.info* 23 23 %if "%{gcc_version}" >= "3.4" 24 % doc %{_infodir}/gccinstall.info*24 %{_infodir}/gccinstall.info* 25 25 %endif 26 26 … … 28 28 %if "%{gcc_version}" < "3.4" 29 29 %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* 32 32 %endif 33 33 %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* 37 37 38 %dir %{_ prefix}/include38 %dir %{_includedir} 39 39 40 40 %post -n %{rpmprefix}rtems@osversion@-base-gcc 41 if test -d $RPM_INSTALL_PREFIX%{_infodir};41 if test -d %{_infodir}; 42 42 then 43 rm -f $RPM_INSTALL_PREFIX%{_infodir}/dir44 f=`find $RPM_INSTALL_PREFIX%{_infodir} -name '*.info.gz'`43 rm -f %{_infodir}/dir 44 f=`find %{_infodir} -name '*.info.gz'` 45 45 test -n "$f" && for i in $f; do 46 install-info $i $RPM_INSTALL_PREFIX%{_infodir}/dir46 install-info $i %{_infodir}/dir 47 47 done 48 48 fi 49 49 50 50 %postun -n %{rpmprefix}rtems@osversion@-base-gcc 51 if test -d $RPM_INSTALL_PREFIX%{_infodir};51 if test -d %{_infodir}; 52 52 then 53 rm -f $RPM_INSTALL_PREFIX%{_infodir}/dir54 f=`find $RPM_INSTALL_PREFIX%{_infodir} -name '*.info.gz'`53 rm -f %{_infodir}/dir 54 f=`find %{_infodir} -name '*.info.gz'` 55 55 test -n "$f" && for i in $f; do 56 install-info $i $RPM_INSTALL_PREFIX%{_infodir}/dir56 install-info $i %{_infodir}/dir 57 57 done 58 58 fi -
scripts/gccnewlib/base-gcj.add
r6d4ad173 r1eb65053 16 16 %defattr(-,root,root) 17 17 %if "%{gcc_version}" <= "3.4" 18 %dir %{_ prefix}/bin19 %{_ prefix}/bin/jar%{_exeext}20 %{_ prefix}/bin/grepjar%{_exeext}18 %dir %{_bindir} 19 %{_bindir}/jar%{_exeext} 20 %{_bindir}/grepjar%{_exeext} 21 21 %endif 22 22 23 23 %dir %{_infodir} 24 % doc %{_infodir}/gcj.info*24 %{_infodir}/gcj.info* 25 25 %if "%{gcc_version}" >= "3.3" 26 % doc %{_infodir}/fastjar.info*26 %{_infodir}/fastjar.info* 27 27 %endif 28 28 %if "%{gcc_version}" >= "3.3" && "%{gcc_version}" <= "3.4" 29 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*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* 39 39 %endif 40 40 -
scripts/gccnewlib/base-gnat.add
r6d4ad173 r1eb65053 14 14 %files -n %{rpmprefix}rtems@osversion@-base-gnat 15 15 %defattr(-,root,root) 16 %dir %{_ prefix}/bin16 %dir %{_bindir} 17 17 18 18 %if "%{gcc_version}" >= "3.3" … … 22 22 %if "%{gcc_version}" >= "3.3" 23 23 %post -n %{rpmprefix}rtems@osversion@-base-gnat 24 if test -d $RPM_INSTALL_PREFIX%{_infodir};24 if test -d %{_infodir}; 25 25 then 26 rm -f $RPM_INSTALL_PREFIX%{_infodir}/dir27 f=`find $RPM_INSTALL_PREFIX%{_infodir} -name '*.info.gz'`26 rm -f %{_infodir}/dir 27 f=`find %{_infodir} -name '*.info.gz'` 28 28 test -n "$f" && for i in $f; do 29 install-info $i $RPM_INSTALL_PREFIX%{_infodir}/dir29 install-info $i %{_infodir}/dir 30 30 done 31 31 fi 32 32 33 33 %postun -n %{rpmprefix}rtems@osversion@-base-gnat 34 if test -d $RPM_INSTALL_PREFIX%{_infodir};34 if test -d %{_infodir}; 35 35 then 36 rm -f $RPM_INSTALL_PREFIX%{_infodir}/dir37 f=`find $RPM_INSTALL_PREFIX%{_infodir} -name '*.info.gz'`36 rm -f %{_infodir}/dir 37 f=`find %{_infodir} -name '*.info.gz'` 38 38 test -n "$f" && for i in $f; do 39 install-info $i $RPM_INSTALL_PREFIX%{_infodir}/dir39 install-info $i %{_infodir}/dir 40 40 done 41 41 fi -
scripts/gccnewlib/gccnewlib.add
r6d4ad173 r1eb65053 57 57 58 58 %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 59 64 %define build_g77 %{?g77:%g77}%{!?g77:0} 65 %endif 60 66 %define build_objc %{?objc:%objc}%{!?objc:0} 61 67 %define build_gcj 0 … … 116 122 %endif 117 123 124 %if "%_vendor" == "redhat" 118 125 %if %build_gnat 119 126 # Building gnat requires gnat 120 %if "%_vendor" == "redhat"121 127 # This really isn't available until RedHat 8.0. How to conditionalize this? 122 # BuildPreReq: gcc-gnat 128 BuildRequires: gcc-gnat 129 %endif 130 %if %build_f95 131 BuildRequires: gmp-devel 123 132 %endif 124 133 %endif … … 159 168 160 169 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@)/' \ 162 171 gcc/version.c > gcc/version.c~ 163 172 mv gcc/version.c~ gcc/version.c … … 184 193 %if %build_g77 185 194 languages="$languages,g77" 195 %endif 196 %if %build_f95 197 languages="$languages,f95" 186 198 %endif 187 199 %if %build_gcj … … 262 274 # If it doesn't find it, gcc doesn't install %{gcc_target}/bin/gcc 263 275 %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 266 277 %endif 267 278 … … 294 305 295 306 # 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} 297 308 298 309 # We don't ship info/dir 299 310 rm -f $RPM_BUILD_ROOT%{_infodir}/dir 300 311 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 301 317 %if "%{gcc_version}" >= "3.4" 302 318 # 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} 304 320 %endif 305 321 … … 307 323 # Bug in gcc-3.3.x/gcc-3.4.x: Despite we don't need fixincludes, it installs 308 324 # the fixinclude-install-tools 325 rm -rf ${RPM_BUILD_ROOT}%{gcclib}/%{gcc_target}/%{gcc_version}/install-tools 309 326 rm -rf ${RPM_BUILD_ROOT}%{gccexec}/%{gcc_target}/%{gcc_version}/install-tools 310 327 %endif … … 313 330 # Bug in gcc-2.95.x: It bogusly tries to share cpp for all targets. 314 331 # 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}; 316 333 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} 319 336 fi 320 337 %endif … … 363 380 cp dirs files.gcc 364 381 cp dirs files.g77 382 cp dirs files.gfortran 365 383 cp dirs files.objc 366 384 cp dirs files.gcj … … 373 391 *lib*.la) rm ${RPM_BUILD_ROOT}/$i ;; # ignore: gcc produces bogus libtool libs 374 392 *f771) ;; 393 *f951) ;; 375 394 *cc1) ;; 376 395 *cc1obj) ;; … … 386 405 *jc1) ;; 387 406 *jvgenmain) ;; 407 *libgfortran*.a) echo "$i" >> files.gfortran ;; 388 408 *libstdc++.a) echo "$i" >> files.g++ ;; 389 409 *libsupc++.a) echo "$i" >> files.g++ ;; -
scripts/gccnewlib/target-c++.add
r6d4ad173 r1eb65053 15 15 %files -n %{rpmprefix}%{gcc_target}-c++ -f build/files.g++ 16 16 %defattr(-,root,root) 17 % doc %{_mandir}/man1/%{gcc_target}-g++.1*17 %{_mandir}/man1/%{gcc_target}-g++.1* 18 18 19 %dir %{_ prefix}/bin20 %{_ 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} 22 22 23 23 %{gccexec}/%{gcc_target}/%{gcc_version}/cc1plus%{_exeext} -
scripts/gccnewlib/target-g77.add
r6d4ad173 r1eb65053 15 15 %files -n %{rpmprefix}%{gcc_target}-g77 -f build/files.g77 16 16 %defattr(-,root,root) 17 %dir %{_ prefix}/bin18 %{_ prefix}/bin/%{gcc_target}-g77%{_exeext}17 %dir %{_bindir} 18 %{_bindir}/%{gcc_target}-g77%{_exeext} 19 19 20 20 %{gcclib}/%{gcc_target}/%{gcc_version}/f771%{_exeext} -
scripts/gccnewlib/target-gcc.add
r6d4ad173 r1eb65053 14 14 %files -n %{rpmprefix}%{gcc_target}-gcc -f build/files.gcc 15 15 %defattr(-,root,root) 16 % doc %{_mandir}/man1/%{gcc_target}-gcc.1*16 %{_mandir}/man1/%{gcc_target}-gcc.1* 17 17 %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* 20 20 %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} 23 23 %if "%{gcc_version}" >= "3.3" 24 %{_ prefix}/bin/%{gcc_target}-gcc-%{gcc_version}%{_exeext}24 %{_bindir}/%{gcc_target}-gcc-%{gcc_version}%{_exeext} 25 25 %endif 26 %{_ prefix}/bin/%{gcc_target}-gcov%{_exeext}27 %{_ prefix}/bin/%{gcc_target}-gccbug26 %{_bindir}/%{gcc_target}-gcov%{_exeext} 27 %{_bindir}/%{gcc_target}-gccbug 28 28 %{_prefix}/%{gcc_target}/include 29 29 -
scripts/gccnewlib/target-gcj.add
r6d4ad173 r1eb65053 15 15 %files -n %{rpmprefix}%{gcc_target}-gcj -f build/files.gcj 16 16 %defattr(-,root,root) 17 %dir %{_ prefix}/bin18 %{_ 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* 23 23 24 24 %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* 36 36 %endif 37 37 -
scripts/gccnewlib/target-gnat.add
r6d4ad173 r1eb65053 15 15 %files -n %{rpmprefix}%{gcc_target}-gnat 16 16 %defattr(-,root,root) 17 %dir %{_ prefix}/bin18 %{_ prefix}/bin/%{gcc_target}-gnat*17 %dir %{_bindir} 18 %{_bindir}/%{gcc_target}-gnat* 19 19 20 20 %{gccexec}/%{gcc_target}/%{gcc_version}/cc1plus%{_exeext}
Note: See TracChangeset
for help on using the changeset viewer.