Changeset c86d8e7f in rtems


Ignore:
Timestamp:
Jan 29, 2003, 2:06:02 PM (18 years ago)
Author:
Ralf Corsepius <ralf.corsepius@…>
Branches:
4.10, 4.11, 4.8, 4.9, 5, master
Children:
00b8107
Parents:
b36cca28
Message:

2003-01-29 Ralf Corsepius <corsepiu@…>

  • ChangeLog?: Fix yesterday's entry.
  • gdb/target-gdb.add: %defattr(-,root,root). Use %{_prefix} instead of /opt/rtems. Misc. minor changes.
  • gdb/gdb.add: Use %{_prefix} instead of /opt/rtems. Remove stray unpackaged files. Use %{_defaultbuildroot} instead of hard-coded values. configure --disable-nls. Misc. minor changes. Add BuildPreReq?: ncurses-devel.
  • gdb/base-gdb.add: %defattr(-,root,root). Use %{_prefix} instead of /opt/rtems. Misc. minor changes.
  • gdb/mkspec.in: New.
  • gdb/Makefile.am: Reflect addition of gdb/mkspec.in.
  • gcc3newlib/mkspec.in: Fix usage.
  • gcc3newlib/gccnewlib.add: Use %{_defaultbuildroot} instead of hard-coded values. Update copyright notice.
  • mkgdbspec.in: Removed.
  • Makefile.am: Remove mkgdbspec.
  • configure.ac: Remove mkgdbspec. Add gdb/mkspec.
Location:
scripts
Files:
9 edited
1 moved

Legend:

Unmodified
Added
Removed

  • scripts/ChangeLog

    rb36cca28 rc86d8e7f  
     12003-01-29      Ralf Corsepius <corsepiu@faw.uni-ulm.de>
     2
     3        * ChangeLog: Fix yesterday's entry.
     4        * gdb/target-gdb.add: %defattr(-,root,root).
     5        Use %{_prefix} instead of /opt/rtems.
     6        Misc. minor changes.
     7        * gdb/gdb.add: Use %{_prefix} instead of /opt/rtems.
     8        Remove stray unpackaged files.
     9        Use %{_defaultbuildroot} instead of hard-coded values.
     10        configure --disable-nls.
     11        Misc. minor changes.
     12        Add BuildPreReq: ncurses-devel.
     13        * gdb/base-gdb.add: %defattr(-,root,root).
     14        Use %{_prefix} instead of /opt/rtems.
     15        Misc. minor changes.
     16        * gdb/mkspec.in: New.
     17        * gdb/Makefile.am: Reflect addition of gdb/mkspec.in.
     18        * gcc3newlib/mkspec.in: Fix usage.
     19        * gcc3newlib/gccnewlib.add: Use %{_defaultbuildroot} instead of
     20        hard-coded values. Update copyright notice.
     21        * mkgdbspec.in: Removed.
     22        * Makefile.am: Remove mkgdbspec.
     23        * configure.ac: Remove mkgdbspec.
     24        Add gdb/mkspec.
     25
    1262003-01-28      Ralf Corsepius <corsepiu@faw.uni-ulm.de>
    227
    3         * gccnewlib.add: Add various BuildPreReq.
     28        * gcc3newlib/gccnewlib.add: Add various BuildPreReq.
    429        Add %defattr(-,root,root) to "dir".
    5         * base-g77.add: %defattr(-,root,root).
    6         * base-gcc.add %defattr(-,root,root).
    7         * base-gcj.add %defattr(-,root,root).
    8         * base-gnat.add %defattr(-,root,root).
    9         * target-c++.add %defattr(-,root,root).
    10         * target-g77.add %defattr(-,root,root).
    11         * target-gcc.add %defattr(-,root,root).
    12         * target-gcj.add %defattr(-,root,root).
    13         * target-gnat.add %defattr(-,root,root).
    14         * target-objc.add %defattr(-,root,root).
     30        * gcc3newlib/base-g77.add: %defattr(-,root,root).
     31        * gcc3newlib/base-gcc.add %defattr(-,root,root).
     32        * gcc3newlib/base-gcj.add %defattr(-,root,root).
     33        * gcc3newlib/base-gnat.add %defattr(-,root,root).
     34        * gcc3newlib/target-c++.add %defattr(-,root,root).
     35        * gcc3newlib/target-g77.add %defattr(-,root,root).
     36        * gcc3newlib/target-gcc.add %defattr(-,root,root).
     37        * gcc3newlib/target-gcj.add %defattr(-,root,root).
     38        * gcc3newlib/target-gnat.add %defattr(-,root,root).
     39        * gcc3newlib/target-objc.add %defattr(-,root,root).
    1540
    16412003-01-28      Ralf Corsepius <corsepiu@faw.uni-ulm.de>

  • scripts/Makefile.am

    rb36cca28 rc86d8e7f  
    99
    1010noinst_SCRIPTS = setup buildall buildalltar mkbinutilspec mkbspspec \
    11     mkgccnewlibspec mkgdbspec mkrpms mkspec
     11    mkgccnewlibspec mkrpms mkspec
    1212
    1313TEMPLATES =

  • scripts/configure.ac

    rb36cca28 rc86d8e7f  
    9393AC_CONFIG_FILES([buildalltar],[chmod +x buildalltar])
    9494AC_CONFIG_FILES([buildall],[chmod +x buildall])
    95 AC_CONFIG_FILES([mkgdbspec],[chmod +x mkgdbspec])
     95AC_CONFIG_FILES([gdb/mkspec],[chmod +x gdb/mkspec])
    9696AC_CONFIG_FILES([mkbinutilspec],[chmod +x mkbinutilspec])
    9797AC_CONFIG_FILES([mkgccnewlibspec],[chmod +x mkgccnewlibspec])

  • scripts/gcc3newlib/gccnewlib.add

    rb36cca28 rc86d8e7f  
    22# spec file for building gcc for rtems
    33#
    4 # Copyright  (c) 1999,2000,2001 OARCorp, Huntsville, AL
     4# Copyright  (c) 1999,2000,2001,2002,2003 OARCorp, Huntsville, AL
    55#
    66# please send bugfixes or comments to joel@OARcorp.com
    … …  
    88
    99%define _prefix @prefix@
     10%define _defaultbuildroot %{_tmppath}/%{name}-%{version}
    1011
    1112Vendor:       OAR Corporation
    … …  
    2930@PATCH1@
    3031@PATCH3@
    31 Buildroot:      %{_tmppath}/%{name}
     32Buildroot:      %{_defaultbuildroot}
    3233BuildPreReq:    texinfo >= 4.2
    3334BuildPreReq:    @target_alias@-binutils
    … …  
    331332%clean
    332333# let rpm --clean remove BuildRoot iif using the default BuildRoot
    333   test "$RPM_BUILD_ROOT" = "%{_tmppath}/%{name}" && \
     334  test "$RPM_BUILD_ROOT" = "%{_defaultbuildroot}" && \
    334335    rm -rf $RPM_BUILD_ROOT

  • scripts/gcc3newlib/mkspec.in

    rb36cca28 rc86d8e7f  
    11#!/bin/sh
    22#
    3 #  Usage: mktoolspec CPU
     3#  Usage: mkspec CPU
    44#
    55
    … …  
    1414  echo "  options:"
    1515  echo "    -cfg <setup.cache>"
    16   echo "    -o <rpm-spec-dir>"
     16  echo "    -a <alternate specs.in>"
    1717  exit 1 ;
    1818}

  • scripts/gdb/Makefile.am

    rb36cca28 rc86d8e7f  
    33##
    44
    5 
    6 MKGDBSPEC = $(SHELL) $(top_builddir)/mkgdbspec
     5MKSPEC = $(SHELL) ./mkspec
    76
    87SUBPACKAGES = gdb.add base-gdb.add target-gdb.add
     8
     9noinst_DATA = gdb.spec.in
    910
    1011gdb.spec.in: $(SUBPACKAGES)
    … …  
    1213CLEANFILES = gdb.spec.in
    1314
    14 MKGDBSPEC_DEPS = $(top_builddir)/mkgdbspec gdb.spec.in \
     15MKGDBSPEC_DEPS = $(top_builddir)/mkspec gdb.spec.in \
    1516    $(top_builddir)/setup.cache
    1617
    1718arm-rtems-$(GDBVERS).spec: $(MKGDBSPEC_DEPS)
    18         $(MKGDBSPEC) -cfg $(top_builddir)/setup.cache -o . arm-rtems
     19        $(MKSPEC) -cfg $(top_builddir)/setup.cache arm-rtems > $@
    1920
    2021c4x-rtems-$(GDBVERS).spec: $(MKGDBSPEC_DEPS)
    21         $(MKGDBSPEC) -cfg $(top_builddir)/setup.cache -o . c4x-rtems
     22        $(MKSPEC) -cfg $(top_builddir)/setup.cache c4x-rtems > $@
    2223
    2324h8300-rtems-$(GDBVERS).spec: $(MKGDBSPEC_DEPS)
    24         $(MKGDBSPEC) -cfg $(top_builddir)/setup.cache -o . h8300-rtems
     25        $(MKSPEC) -cfg $(top_builddir)/setup.cache h8300-rtems > $@
    2526
    2627hppa1.1-rtems-$(GDBVERS).spec: $(MKGDBSPEC_DEPS)
    27         $(MKGDBSPEC) -cfg $(top_builddir)/setup.cache -o . hppa1.1-rtems
     28        $(MKSPEC) -cfg $(top_builddir)/setup.cache hppa1.1-rtems > $@
    2829
    2930i386-rtems-$(GDBVERS).spec: $(MKGDBSPEC_DEPS)
    30         $(MKGDBSPEC) -cfg $(top_builddir)/setup.cache -o . i386-rtems
     31        $(MKSPEC) -cfg $(top_builddir)/setup.cache i386-rtems > $@
    3132
    3233i386-RTEMS-$(GDBVERS).spec: $(MKGDBSPEC_DEPS)
    33         $(MKGDBSPEC) -cfg $(top_builddir)/setup.cache -o . i386-RTEMS
     34        $(MKSPEC) -cfg $(top_builddir)/setup.cache i386-RTEMS > $@
    3435
    3536i960-rtems-$(GDBVERS).spec: $(MKGDBSPEC_DEPS)
    36         $(MKGDBSPEC) -cfg $(top_builddir)/setup.cache -o . i960-rtems
     37        $(MKSPEC) -cfg $(top_builddir)/setup.cache i960-rtems > $@
    3738
    3839m68k-rtems-$(GDBVERS).spec: $(MKGDBSPEC_DEPS)
    39         $(MKGDBSPEC) -cfg $(top_builddir)/setup.cache -o . m68k-rtems
     40        $(MKSPEC) -cfg $(top_builddir)/setup.cache m68k-rtems > $@
    4041
    4142mips64orion-rtems-$(GDBVERS).spec: $(MKGDBSPEC_DEPS)
    42         $(MKGDBSPEC) -cfg $(top_builddir)/setup.cache -o . mips64orion-rtems
     43        $(MKSPEC) -cfg $(top_builddir)/setup.cache mips64orion-rtems > $@
    4344
    4445mips-rtems-$(GDBVERS).spec: $(MKGDBSPEC_DEPS)
    45         $(MKGDBSPEC) -cfg $(top_builddir)/setup.cache -o . mips-rtems
     46        $(MKSPEC) -cfg $(top_builddir)/setup.cache mips-rtems > $@
    4647
    4748mipstx39-rtems-$(GDBVERS).spec: $(MKGDBSPEC_DEPS)
    48         $(MKGDBSPEC) -cfg $(top_builddir)/setup.cache -o . mipstx39-rtems
     49        $(MKSPEC) -cfg $(top_builddir)/setup.cache mipstx39-rtems > $@
    4950
    5051powerpc-RTEMS-$(GDBVERS).spec: $(MKGDBSPEC_DEPS)
    51         $(MKGDBSPEC) -cfg $(top_builddir)/setup.cache -o . powerpc-RTEMS
     52        $(MKSPEC) -cfg $(top_builddir)/setup.cache powerpc-RTEMS > $@
    5253
    5354powerpc-rtems-$(GDBVERS).spec: $(MKGDBSPEC_DEPS)
    54         $(MKGDBSPEC) -cfg $(top_builddir)/setup.cache -o . powerpc-rtems
     55        $(MKSPEC) -cfg $(top_builddir)/setup.cache powerpc-rtems > $@
    5556
    5657sh-rtems-$(GDBVERS).spec: $(MKGDBSPEC_DEPS)
    57         $(MKGDBSPEC) -cfg $(top_builddir)/setup.cache -o . sh-rtems
     58        $(MKSPEC) -cfg $(top_builddir)/setup.cache sh-rtems > $@
    5859
    5960sh-rtemself-$(GDBVERS).spec: $(MKGDBSPEC_DEPS)
    60         $(MKGDBSPEC) -cfg $(top_builddir)/setup.cache -o . sh-rtemself
     61        $(MKSPEC) -cfg $(top_builddir)/setup.cache sh-rtemself > $@
    6162
    6263sparc-rtems-$(GDBVERS).spec: $(MKGDBSPEC_DEPS)
    63         $(MKGDBSPEC) -cfg $(top_builddir)/setup.cache -o . sparc-rtems
     64        $(MKSPEC) -cfg $(top_builddir)/setup.cache sparc-rtems > $@
    6465
    6566RPM_SPECS_DATA = \

  • scripts/gdb/base-gdb.add

    rb36cca28 rc86d8e7f  
    1515
    1616%files -n rtems-base-gdb
     17%defattr(-,root,root)
    1718
    18 %dir /opt/rtems/info
    19 %doc /opt/rtems/info/gdb.info*
    20 %doc /opt/rtems/info/mmalloc.info*
     19%dir %{_prefix}/info
     20%doc %{_prefix}/info/gdb.info*
     21%doc %{_prefix}/info/mmalloc.info*
     22# FIXME: When had gdbint and stabs been introduced?
     23%if "@gdb_version@" >= "5.0"
     24%doc %{_prefix}/info/gdbint.info*
     25%doc %{_prefix}/info/stabs.info*
     26%endif
    2127# gdb 4.18 installed this, gdb 5.0 does not
    22 # %doc /opt/rtems/info/readline.info*
     28%if "@gdb_version@" < "5.0"
     29%doc %{_prefix}/info/readline.info*
     30%endif
    2331
    24 %dir /opt/rtems/man
    25 %dir /opt/rtems/man/man1
     32%dir %{_prefix}/man
     33%dir %{_prefix}/man/man1
    2634
    27 %dir /opt/rtems/include
     35%dir %{_prefix}/include
    2836# We install libbfd from binutils
    29 # /opt/rtems/include/bfd.h
    30 # /opt/rtems/include/bfdlink.h
     37# %{_prefix}/include/bfd.h
     38# %{_prefix}/include/bfdlink.h
    3139
    32 %dir /opt/rtems/lib
     40%dir %{_prefix}/lib
    3341# We install libbfd from binutils
    34 # /opt/rtems/lib/libbfd*
     42# %{_prefix}/lib/libbfd*
    3543# We use libiberty from gcc
    36 # /opt/rtems/lib/libiberty*
     44# %{_prefix}/lib/libiberty*
    3745
    3846%post -n rtems-base-gdb

  • scripts/gdb/gdb.add

    rb36cca28 rc86d8e7f  
    77#
    88
    9 # neededforbuild -- nothing
     9%define _prefix                 @prefix@
     10%define _defaultbuildroot       %{_tmppath}/%{name}-%{version}
    1011
    1112Vendor:       OAR Corporation
    … …  
    2526Patch1:       gdb-@gdb_version@-rtems-cg-@gdb_patch_version@.diff
    2627Patch2:       gdb-@gdb_version@-rtems-rdbg-@gdb_patch_version@.diff
    27 Buildroot:      /tmp/@target_alias@-gdb
     28Buildroot:    %{_defaultbuildroot}
     29
     30%if "%{_vendor}" == "redhat"
     31BuildPreReq:    ncurses-devel
     32%endif
    2833
    2934#
    … …  
    4752
    4853%prep
    49 echo RPM_BUILD_ROOT=${RPM_BUILD_ROOT}
    5054# untar the sources inside @target_alias@-gdb
    5155%setup -c -n @target_alias@-gdb -a 0
    … …  
    6064  cd build
    6165  ../gdb-@gdb_version@/configure --target=@target_alias@ \
    62     --verbose --prefix=/opt/rtems @extra_configure_arguments@
     66    --verbose --prefix=%{_prefix} @extra_configure_arguments@ \
     67    --disable-nls
    6368
    6469  make all
    … …  
    6772%install
    6873  cd build
    69   make prefix=$RPM_BUILD_ROOT/opt/rtems install
    70   make prefix=$RPM_BUILD_ROOT/opt/rtems install-info
     74  make prefix=$RPM_BUILD_ROOT%{_prefix} install
     75  make prefix=$RPM_BUILD_ROOT%{_prefix} install-info
    7176
     77  # host files
     78  rm -rf $RPM_BUILD_ROOT%{_prefix}/include/*.h
     79  rm -rf $RPM_BUILD_ROOT%{_prefix}/lib/lib*a
     80
     81  # These come from other packages
     82  rm -rf $RPM_BUILD_ROOT%{_prefix}/info/bfd*
     83  rm -rf $RPM_BUILD_ROOT%{_prefix}/info/configure*
     84  rm -rf $RPM_BUILD_ROOT%{_prefix}/info/standards*
     85 
    7286  # gzip info files
    73   gzip -f $RPM_BUILD_ROOT/opt/rtems/info/*.info 2>/dev/null
    74   gzip -f $RPM_BUILD_ROOT/opt/rtems/info/*.info-? 2>/dev/null
    75   gzip -f $RPM_BUILD_ROOT/opt/rtems/info/*.info-?? 2>/dev/null
     87  gzip -f $RPM_BUILD_ROOT%{_prefix}/info/*.info 2>/dev/null
     88  gzip -f $RPM_BUILD_ROOT%{_prefix}/info/*.info-? 2>/dev/null
     89  gzip -f $RPM_BUILD_ROOT%{_prefix}/info/*.info-?? 2>/dev/null
    7690
    7791%clean
    7892# let rpm --clean remove BuildRoot iif using the default BuildRoot
    79   test "$RPM_BUILD_ROOT" = "/tmp/@target_alias@-gdb" && \
     93  test "$RPM_BUILD_ROOT" = "%{_defaultbuildroot}" && \
    8094    rm -rf $RPM_BUILD_ROOT

  • scripts/gdb/mkspec.in

    rb36cca28 rc86d8e7f  
    11#!/bin/sh
    22#
    3 #  Usage: mkgdbspec CPU
     3#  Usage: mkspec CPU
    44#
    55
    66RTEMS_DIR=`dirname $0`/@top_srcdir@
    77
    8 CFG=setup.cache
    9 dst=@RPM_SPECSdir@
     8CFG=../setup.cache
    109exe_ext=@EXEEXT@
     10
     11specsrc=${RTEMS_DIR}/gdb/gdb.spec.in
    1112
    1213usage()
    … …  
    1516  echo "  options:"
    1617  echo "    -cfg <setup.cache>"
    17   echo "    -o <rpm-spec-dir>"
     18  echo "    -a <alternate specs.in>"
    1819  exit 1 ;
    1920}
    … …  
    2627  shift
    2728  ;;
    28 -o)
     29-a)        # alternate specs file
    2930  shift
    30   dst=$1
     31  specsrc=$1
    3132  shift
    3233  ;;
    … …  
    4950. ./$CFG
    5051
    51 specfile=${dst}/$target_alias-gdb-${gdb_version}.spec
    52 
    5352case ${target_alias} in
    5453  arm* | d10v* | d30v* | erc32* | fr30* | h8300* | h8500* | hppa1.1* | \
    … …  
    6968sed -e "s%@Release\@%${gdb_rpm_release}%g" \
    7069    -e "s,@rpm_build_root\@,${rpm_build_root},g" \
     70    -e "s%@prefix\@%@prefix@%g" \
    7171    -e "s%@target_alias\@%${target_alias}%g" \
    7272    -e "s%@gdb_version\@%${gdb_version}%g" \
    … …  
    7474    -e "s%@extra_configure_arguments\@%${extra_configure_arguments}%g" \
    7575    -e "s%@exe_ext\@%${exe_ext}%g" \
    76 < ${RTEMS_DIR}/gdb/gdb.spec.in \
    77 > ${specfile}
    78 
    79 case ${target_alias} in
    80   arm* | d10v* | d30v* | erc32* | fr30* | h8300* | h8500* | i960* | m32r* | \
    81   mcore* | mips* | mn10200* | mn10300* | powerpc* | sh* | v850* | w65* | z8k*)
    82      echo "/opt/rtems/bin/${target_alias}-run${exe_ext}"
    83      ;;
    84   sparc*)
    85      echo "/opt/rtems/bin/${target_alias}-run${exe_ext}"
    86      echo "/opt/rtems/bin/${target_alias}-sis${exe_ext}"
    87      ;;
    88   *) ;;
    89 esac >> ${specfile}
    90 
    91 echo Generated ${specfile}
     76< ${specsrc}

  • scripts/gdb/target-gdb.add

    rb36cca28 rc86d8e7f  
    1616
    1717%files -n @target_alias@-gdb
    18 %doc /opt/rtems/man/man1/@target_alias@-gdb.1
     18%defattr(-,attr,attr)
     19%doc %{_prefix}/man/man1/@target_alias@-gdb.1*
     20%doc %{_prefix}/man/man1/@target_alias@-run.1*
    1921
    20 %dir /opt/rtems/bin
    21 /opt/rtems/bin/@target_alias@-gdb@exe_ext@
     22%dir %{_prefix}/bin
     23%{_prefix}/bin/@target_alias@-gdb@exe_ext@
     24%{_prefix}/bin/@target_alias@-run@exe_ext@
     25%if "@target_alias@" == "sparc-rtems"
     26%{_prefix}/bin/@target_alias@-sis@exe_ext@
     27%endif
Note: See TracChangeset for help on using the changeset viewer.