Changeset 82c123d in rtems
- Timestamp:
- 03/18/04 17:19:11 (20 years ago)
- Branches:
- 4.10, 4.11, 4.8, 4.9, 5, master
- Children:
- f91bbe64
- Parents:
- 4ef10977
- Location:
- scripts
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
scripts/ChangeLog
r4ef10977 r82c123d 1 2004-03-18 Ralf Corsepius <corsepiu@faw.uni-ulm.de> 2 3 * gcc3newlib/gccnewlib.add: Disable gnats. 4 Further preparations for gcc-3.4.0 5 * gcc3newlib/base-gcc.add, gcc3newlib/target-gnat.add, 6 gcc3newlib/base-gcj.add, gcc3newlib/target-gcj.add: 7 Reflect changes to gcc3newlib/gccnewlib.add. 8 1 9 2004-03-18 Ralf Corsepius <corsepiu@faw.uni-ulm.de> 2 10 -
scripts/gcc3newlib/base-gcc.add
r4ef10977 r82c123d 21 21 %doc %{_prefix}/info/libm.info* 22 22 %doc %{_prefix}/info/gccint.info* 23 %if "%{gcc_version}" > = "3.4"23 %if "%{gcc_version}" > "3.4.0" 24 24 %doc %{_prefix}/info/gccinstall.info* 25 25 %endif -
scripts/gcc3newlib/base-gcj.add
r4ef10977 r82c123d 15 15 %files -n %{rpmprefix}rtems@osversion@-base-gcj 16 16 %defattr(-,root,root) 17 %if "%{gcc_version}" <= "3.4" 17 18 %dir %{_prefix}/bin 18 19 %{_prefix}/bin/jar%{_exeext} 19 20 %{_prefix}/bin/grepjar%{_exeext} 21 %endif 20 22 21 23 %dir %{_prefix}/info 22 %doc %{_prefix}/info/gcj.info* .gz24 %doc %{_prefix}/info/gcj.info* 23 25 %if "%{gcc_version}" >= "3.3" 24 %doc %{_prefix}/info/fastjar.info* gz26 %doc %{_prefix}/info/fastjar.info* 25 27 %endif 28 %if "%{gcc_version}" >= "3.3" && "%{gcc_version}" <= "3.4" 26 29 %dir %{_prefix}/man/man1 27 30 %doc %{_prefix}/man/man1/gcjh.1* … … 32 35 %doc %{_prefix}/man/man1/rmic.1* 33 36 %doc %{_prefix}/man/man1/rmiregistry.1* 34 %if "%{gcc_version}" >= "3.3"35 37 %doc %{_prefix}/man/man1/jar.1* 36 38 %doc %{_prefix}/man/man1/grepjar.1* -
scripts/gcc3newlib/gccnewlib.add
r4ef10977 r82c123d 47 47 # those targets wanting to support ada. 48 48 49 %if "%{gcc_version}" > = "3.4"49 %if "%{gcc_version}" > "3.4.0" 50 50 # default to building gnat 51 51 %define _gnat %{?gnat:%gnat}%{!?gnat:1} … … 53 53 # default to not building gnat 54 54 # gcc-3.3: Doesn't support cross-building gnatlib 55 # gcc-3.4.0: Doesn't support cross-build gnattools 55 56 %define _gnat %{?gnat:%gnat}%{!?gnat:0} 56 57 %endif … … 211 212 212 213 %if %build_gnat 214 %if "%{gcc_version}" < "3.4" 213 215 cd ../gcc-%{gcc_version}/gcc/ada 214 216 touch treeprs.ads [es]info.h nmake.ad[bs] 215 217 cd ../../../build 216 218 %endif 219 %endif 220 217 221 make all 218 222 %if %build_gnat 219 223 # This gnat configuration is crap :( 220 224 221 # This is what is documented, but it doesn't work for me (RC) 222 # make gnatlib_and_tools 225 %if "%{gcc_version}" >= "3.4" 226 # This is what is documented - Of cause it doesn't work. 227 make -C gcc gnatlib 223 228 make -C gcc cross-gnattools 224 229 make -C gcc ada.all.cross 225 226 # This should work, but doesn't. 227 # make -C gcc gnatlib 228 229 %if "%{gcc_version}" >= "3.3" 230 # gcc >= 3.3 231 rm -rf gnatlib 232 mkdir gnatlib 233 pushd gnatlib 234 ACC="../gcc/xgcc -B../gcc/ -B../%{gcc_target}/newlib/" 235 ACC="$ACC -isystem ../%{gcc_target}/newlib/targ-include" 236 ACC="$ACC -isystem ../../newlib-%{newlib_version}/newlib/libc/include" 237 CC="$ACC" ../../gcc-%{gcc_version}/gcc/configure --disable-nls \ 238 --host=%{gcc_target} --target=%{gcc_target} --enable-languages=ada 239 popd 240 make -C gcc/ada ../stamp-gnatlib1 LN_S="ln -s" 241 rm -f gcc/ada/rts/auto-target.h gcc/ada/rts/config.h 242 cp gnatlib/auto-host.h gcc/ada/rts/auto-target.h 243 sed -e 's,auto-host,auto-target,' < gcc/config.h > gcc/ada/rts/config.h 244 %endif 230 %endif 231 232 %if "%{gcc_version}" < "3.4" 233 # This is what had worked for some versions of gcc. 234 make -C gcc cross-gnattools 235 make -C gcc ada.all.cross 245 236 # This is what gcc/ada/Makefile.in contains by default, 246 237 # but what we override below … … 257 248 make -C gcc GNATLIBCFLAGS="${GNATLIBCFLAGS}" gnatlib 258 249 %endif 259 250 %endif 260 251 make info 261 252 262 253 %install 263 254 export PATH="%{_bindir}:${PATH}" 255 test $RPM_BUILD_ROOT = "%{_defaultbuildroot}" && \ 256 rm -rf $RPM_BUILD_ROOT 257 264 258 cd build 265 259 # Bug in gcc-2.95.1: It doesn't build this installation directory … … 300 294 # Bug in gcc-3.4.0pre 301 295 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 302 300 %endif 303 301 304 302 %if "%{gcc_version}" >= "3.3" 305 # Bug in gcc-3.3.x : Despite we don't need fixincludes, it installs303 # Bug in gcc-3.3.x/gcc-3.4.x: Despite we don't need fixincludes, it installs 306 304 # the fixinclude-install-tools 307 305 rm -rf ${RPM_BUILD_ROOT}%{gccexec}/%{gcc_target}/%{gcc_version}/install-tools -
scripts/gcc3newlib/target-gcj.add
r4ef10977 r82c123d 20 20 %{_prefix}/bin/%{gcc_target}-jv-scan%{_exeext} 21 21 %{_prefix}/bin/%{gcc_target}-gcjh%{_exeext} 22 % {_prefix}/man/man1/%{gcc_target}-gcj.122 %doc %{_prefix}/man/man1/%{gcc_target}-gcj.1* 23 23 24 %{_prefix}/lib/gcc-lib/%{gcc_target}/%{gcc_version}/jc1%{_exeext} 25 %{_prefix}/lib/gcc-lib/%{gcc_target}/%{gcc_version}/jvgenmain%{_exeext} 24 %if "%{gcc_version}" >= "3.4" 25 %{_prefix}/bin/%{gcc_target}-jar%{_exeext} 26 %{_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* 36 %endif 37 38 %{gccexec}/%{gcc_target}/%{gcc_version}/jc1%{_exeext} 39 %{gccexec}/%{gcc_target}/%{gcc_version}/jvgenmain%{_exeext} 26 40 27 41 %endif -
scripts/gcc3newlib/target-gnat.add
r4ef10977 r82c123d 18 18 %{_prefix}/bin/%{gcc_target}-gnat* 19 19 20 %{ _prefix}/lib/gcc-lib/%{gcc_target}/%{gcc_version}/gnat1%{_exeext}21 %{ _prefix}/lib/gcc-lib/%{gcc_target}/%{gcc_version}/adalib22 %{ _prefix}/lib/gcc-lib/%{gcc_target}/%{gcc_version}/adainclude20 %{gcclib}/%{gcc_target}/%{gcc_version}/gnat1%{_exeext} 21 %{gcclib}/%{gcc_target}/%{gcc_version}/adalib 22 %{gcclib}/%{gcc_target}/%{gcc_version}/adainclude 23 23 %endif
Note: See TracChangeset
for help on using the changeset viewer.