Changeset 82c123d in rtems


Ignore:
Timestamp:
Mar 18, 2004, 5:19:11 PM (16 years ago)
Author:
Ralf Corsepius <ralf.corsepius@…>
Branches:
4.10, 4.11, 4.8, 4.9, master
Children:
f91bbe64
Parents:
4ef10977
Message:

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

  • gcc3newlib/gccnewlib.add: Disable gnats. Further preparations for gcc-3.4.0
  • gcc3newlib/base-gcc.add, gcc3newlib/target-gnat.add, gcc3newlib/base-gcj.add, gcc3newlib/target-gcj.add: Reflect changes to gcc3newlib/gccnewlib.add.
Location:
scripts
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • scripts/ChangeLog

    r4ef10977 r82c123d  
     12004-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
    192004-03-18      Ralf Corsepius <corsepiu@faw.uni-ulm.de>
    210
  • scripts/gcc3newlib/base-gcc.add

    r4ef10977 r82c123d  
    2121%doc %{_prefix}/info/libm.info*
    2222%doc %{_prefix}/info/gccint.info*
    23 %if "%{gcc_version}" >= "3.4"
     23%if "%{gcc_version}" > "3.4.0"
    2424%doc %{_prefix}/info/gccinstall.info*
    2525%endif
  • scripts/gcc3newlib/base-gcj.add

    r4ef10977 r82c123d  
    1515%files -n %{rpmprefix}rtems@osversion@-base-gcj
    1616%defattr(-,root,root)
     17%if "%{gcc_version}" <= "3.4"
    1718%dir %{_prefix}/bin
    1819%{_prefix}/bin/jar%{_exeext}
    1920%{_prefix}/bin/grepjar%{_exeext}
     21%endif
    2022
    2123%dir %{_prefix}/info
    22 %doc %{_prefix}/info/gcj.info*.gz
     24%doc %{_prefix}/info/gcj.info*
    2325%if "%{gcc_version}" >= "3.3"
    24 %doc %{_prefix}/info/fastjar.info*gz
     26%doc %{_prefix}/info/fastjar.info*
    2527%endif
     28%if "%{gcc_version}" >= "3.3" && "%{gcc_version}" <= "3.4"
    2629%dir %{_prefix}/man/man1
    2730%doc %{_prefix}/man/man1/gcjh.1*
     
    3235%doc %{_prefix}/man/man1/rmic.1*
    3336%doc %{_prefix}/man/man1/rmiregistry.1*
    34 %if "%{gcc_version}" >= "3.3"
    3537%doc %{_prefix}/man/man1/jar.1*
    3638%doc %{_prefix}/man/man1/grepjar.1*
  • scripts/gcc3newlib/gccnewlib.add

    r4ef10977 r82c123d  
    4747# those targets wanting to support ada.
    4848
    49 %if "%{gcc_version}" >= "3.4"
     49%if "%{gcc_version}" > "3.4.0"
    5050# default to building gnat
    5151%define _gnat   %{?gnat:%gnat}%{!?gnat:1}
     
    5353# default to not building gnat
    5454# gcc-3.3: Doesn't support cross-building gnatlib
     55# gcc-3.4.0: Doesn't support cross-build gnattools
    5556%define _gnat   %{?gnat:%gnat}%{!?gnat:0}
    5657%endif
     
    211212
    212213%if %build_gnat
     214%if "%{gcc_version}" < "3.4"
    213215  cd ../gcc-%{gcc_version}/gcc/ada
    214216  touch treeprs.ads [es]info.h nmake.ad[bs]
    215217  cd ../../../build
    216218%endif
     219%endif
     220
    217221  make all
    218222%if %build_gnat
    219223# This gnat configuration is crap :(
    220224
    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
    223228  make -C gcc cross-gnattools
    224229  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
    245236# This is what gcc/ada/Makefile.in contains by default,
    246237# but what we override below
     
    257248  make -C gcc GNATLIBCFLAGS="${GNATLIBCFLAGS}" gnatlib
    258249%endif
    259 
     250%endif
    260251  make info
    261252
    262253%install
    263254  export PATH="%{_bindir}:${PATH}"
     255  test $RPM_BUILD_ROOT = "%{_defaultbuildroot}" && \
     256    rm -rf $RPM_BUILD_ROOT
     257
    264258  cd build
    265259# Bug in gcc-2.95.1: It doesn't build this installation directory
     
    300294  # Bug in gcc-3.4.0pre
    301295  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
    302300%endif
    303301
    304302%if "%{gcc_version}" >= "3.3"
    305   # Bug in gcc-3.3.x: Despite we don't need fixincludes, it installs
     303  # Bug in gcc-3.3.x/gcc-3.4.x: Despite we don't need fixincludes, it installs
    306304  # the fixinclude-install-tools
    307305  rm -rf ${RPM_BUILD_ROOT}%{gccexec}/%{gcc_target}/%{gcc_version}/install-tools
  • scripts/gcc3newlib/target-gcj.add

    r4ef10977 r82c123d  
    2020%{_prefix}/bin/%{gcc_target}-jv-scan%{_exeext}
    2121%{_prefix}/bin/%{gcc_target}-gcjh%{_exeext}
    22 %{_prefix}/man/man1/%{gcc_target}-gcj.1
     22%doc %{_prefix}/man/man1/%{gcc_target}-gcj.1*
    2323
    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}
    2640
    2741%endif
  • scripts/gcc3newlib/target-gnat.add

    r4ef10977 r82c123d  
    1818%{_prefix}/bin/%{gcc_target}-gnat*
    1919
    20 %{_prefix}/lib/gcc-lib/%{gcc_target}/%{gcc_version}/gnat1%{_exeext}
    21 %{_prefix}/lib/gcc-lib/%{gcc_target}/%{gcc_version}/adalib
    22 %{_prefix}/lib/gcc-lib/%{gcc_target}/%{gcc_version}/adainclude
     20%{gcclib}/%{gcc_target}/%{gcc_version}/gnat1%{_exeext}
     21%{gcclib}/%{gcc_target}/%{gcc_version}/adalib
     22%{gcclib}/%{gcc_target}/%{gcc_version}/adainclude
    2323%endif
Note: See TracChangeset for help on using the changeset viewer.