Changeset b96a7b1 in rtems


Ignore:
Timestamp:
Jan 24, 2002, 2:14:31 PM (19 years ago)
Author:
Joel Sherrill <joel.sherrill@…>
Branches:
4.10, 4.11, 4.8, 4.9, 5, master
Children:
d7aabb7
Parents:
59bcc90
Message:

2002-01-23 Ralf Corsepius <corsepiu@…>

  • configure.ac: Add AC_PREFIX_DEFAULT(opt/rtems).
  • mkbinutilsspec.in: Add propagation of @prefix@.
  • binutils/base-binutils.add: Let %post and %unpost apply %{_prefix}. Apply %{_prefix} instead of /opt/rtems.
  • binutils/binutils.add: Update copyright notice. Add _prefix. Apply %{_prefix} instead of /opt/rtems. Remove -a 0 in %setup. Rework hack to SuSE's rpm screwing up %{_target}. Replace ARGS with CONFIGURE_ARGS.
  • binutils/target-binutils.add: Apply %{_prefix} instead of /opt/rtems.
Location:
scripts
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • scripts/ChangeLog

    r59bcc90 rb96a7b1  
     12002-01-23      Ralf Corsepius <corsepiu@faw.uni-ulm.de>
     2
     3        * configure.ac: Add AC_PREFIX_DEFAULT([/opt/rtems]).
     4        * mkbinutilsspec.in: Add propagation of @prefix@.
     5        * binutils/base-binutils.add:
     6        Let %post and %unpost apply %{_prefix}.
     7        Apply %{_prefix} instead of /opt/rtems.
     8        * binutils/binutils.add: Update copyright notice.
     9        Add _prefix.
     10        Apply %{_prefix} instead of /opt/rtems.
     11        Remove -a 0 in %setup.
     12        Rework hack to SuSE's rpm screwing up %{_target}.
     13        Replace ARGS with CONFIGURE_ARGS.
     14        * binutils/target-binutils.add:
     15        Apply %{_prefix} instead of /opt/rtems.
     16
    1172002-01-22      Ralf Corsepius <corsepiu@faw.uni-ulm.de>
    218
  • scripts/binutils/base-binutils.add

    r59bcc90 rb96a7b1  
    1414
    1515%post -n rtems-base-binutils
    16   if test -d $RPM_INSTALL_PREFIX/rtems/info;
     16  if test -d $RPM_INSTALL_PREFIX%{_prefix}/info;
    1717  then
    18     rm -f $RPM_INSTALL_PREFIX/rtems/info/dir
    19     f=`find $RPM_INSTALL_PREFIX/rtems/info -name '*.info.gz'`
     18    rm -f $RPM_INSTALL_PREFIX%{_prefix}/info/dir
     19    f=`find $RPM_INSTALL_PREFIX%{_prefix}/info -name '*.info.gz'`
    2020    test x"$f" != x"" && for i in $f; do
    21       install-info $i $RPM_INSTALL_PREFIX/rtems/info/dir
     21      install-info $i $RPM_INSTALL_PREFIX%{_prefix}/info/dir
    2222    done
    2323  fi
    2424
    2525%postun -n rtems-base-binutils
    26   if test -d $RPM_INSTALL_PREFIX/rtems/info;
     26  if test -d $RPM_INSTALL_PREFIX%{_prefix}/info;
    2727  then
    28     rm -f $RPM_INSTALL_PREFIX/rtems/info/dir
    29     f=`find $RPM_INSTALL_PREFIX/rtems/info -name '*.info.gz'`
     28    rm -f $RPM_INSTALL_PREFIX%{_prefix}/info/dir
     29    f=`find $RPM_INSTALL_PREFIX%{_prefix}/info -name '*.info.gz'`
    3030    test x"$f" != x"" && for i in $f; do
    31       install-info $i $RPM_INSTALL_PREFIX/rtems/info/dir
     31      install-info $i $RPM_INSTALL_PREFIX%{_prefix}/info/dir
    3232    done
    3333  fi
    3434
    3535%files -n rtems-base-binutils -f files
    36 %dir /opt/rtems/info
    37 %doc /opt/rtems/info/dir
    38 %doc /opt/rtems/info/as.info.gz
    39 %doc /opt/rtems/info/as.info-?.gz
    40 %doc /opt/rtems/info/bfd.info.gz
    41 %doc /opt/rtems/info/bfd.info-?.gz
    42 %doc /opt/rtems/info/binutils.info.gz
    43 %doc /opt/rtems/info/binutils.info-?.gz
    44 %doc /opt/rtems/info/ld.info.gz
    45 %doc /opt/rtems/info/ld.info-?.gz
    46 %doc /opt/rtems/info/gasp.info.gz
    47 %doc /opt/rtems/info/standards.info.gz
     36%dir %{_prefix}/info
     37%doc %{_prefix}/info/dir
     38%doc %{_prefix}/info/as.info.gz
     39%doc %{_prefix}/info/as.info-?.gz
     40%doc %{_prefix}/info/bfd.info.gz
     41%doc %{_prefix}/info/bfd.info-?.gz
     42%doc %{_prefix}/info/binutils.info.gz
     43%doc %{_prefix}/info/binutils.info-?.gz
     44%doc %{_prefix}/info/ld.info.gz
     45%doc %{_prefix}/info/ld.info-?.gz
     46%doc %{_prefix}/info/gasp.info.gz
     47%doc %{_prefix}/info/standards.info.gz
    4848
    49 %dir /opt/rtems/man
    50 %dir /opt/rtems/man/man1
     49%dir %{_prefix}/man
     50%dir %{_prefix}/man/man1
    5151
    52 %dir /opt/rtems/include
    53 /opt/rtems/include/bfd.h
    54 /opt/rtems/include/ansidecl.h
    55 /opt/rtems/include/bfdlink.h
     52%dir %{_prefix}/include
     53%{_prefix}/include/bfd.h
     54%{_prefix}/include/ansidecl.h
     55%{_prefix}/include/bfdlink.h
    5656
    57 %dir /opt/rtems/lib
    58 /opt/rtems/lib/libbfd*
    59 /opt/rtems/lib/libiberty*
    60 /opt/rtems/lib/libopcodes*
     57%dir %{_prefix}/lib
     58%{_prefix}/lib/libbfd*
     59%{_prefix}/lib/libiberty*
     60%{_prefix}/lib/libopcodes*
    6161
    62 %dir /opt/rtems/share
    63 %dir /opt/rtems/share/locale
     62%dir %{_prefix}/share
     63%dir %{_prefix}/share/locale
    6464
  • scripts/binutils/binutils.add

    r59bcc90 rb96a7b1  
    22# spec file for binutils package targetting rtems
    33#
    4 # Copyright  (c)  1999,2000 OARCorp, Huntsville, AL
     4# Copyright  (c)  1999,2000,2002 OARCorp, Huntsville, AL
    55#
    66# please send bugfixes or comments to joel@OARcorp.com
    77#
     8
     9%define _prefix @prefix@
    810
    911Vendor:       OAR Corporation
     
    1719Autoreqprov:    off
    1820Packager:       corsepiu@faw.uni-ulm.de and joel@OARcorp.com
    19 Prefix:         /opt
     21Prefix:         %{_prefix}
    2022BuildRoot:      %{_tmppath}/@target_alias@-binutils
    2123
     
    4446%prep
    4547# untar the sources inside @target_alias@-binutils
    46 %setup -c -n @target_alias@-binutils -a 0
     48%setup -c -n @target_alias@-binutils
    4749
    4850%patch0 -p0
     
    5052
    5153%build
     54# HACK: This should be %{target} != %{build}, but SuSE's rpm screws it.
     55%if "%{target_os}" != "%{build_os}"
     56  CONFIGURE_ARGS="--build=%{_build} --host=%{_target}"
     57%endif
     58
    5259  cd build
    53 # Ugly hack to work around a bug in SuSE's rpm
    54 %if "${_build_cpu}-%{_build_os}" != "%{_target_cpu}-%{_target_os}"
    55   ARGS="--build=%{_build} --host=%{_target}"   
    56 %endif
    57   ../binutils-@binutils_version@/configure $ARGS --target=@target_alias@ \
    58     --verbose --prefix=/opt/rtems
     60  ../binutils-@binutils_version@/configure ${CONFIGURE_ARGS} --target=@target_alias@ \
     61    --verbose --prefix=%{_prefix}
    5962
    6063  make all
     
    6467%install
    6568  cd build
    66   make prefix=$RPM_BUILD_ROOT/opt/rtems install
    67   make prefix=$RPM_BUILD_ROOT/opt/rtems install-info
     69  make prefix=$RPM_BUILD_ROOT%{_prefix} install
     70  make prefix=$RPM_BUILD_ROOT%{_prefix} install-info
    6871# A bug in binutils: binutils does not install share/locale
    6972# however it uses it
    7073  ../binutils-@binutils_version@/mkinstalldirs \
    71     $RPM_BUILD_ROOT/opt/rtems/share/locale
     74    $RPM_BUILD_ROOT%{_prefix}/share/locale
    7275
    7376# gzip info files
    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
     77  gzip -f $RPM_BUILD_ROOT%{_prefix}/info/*.info 2>/dev/null
     78  gzip -f $RPM_BUILD_ROOT%{_prefix}/info/*.info-? 2>/dev/null
    7679
    77   if test -f $RPM_BUILD_ROOT/opt/rtems/info/configure.info.gz;
     80  if test -f $RPM_BUILD_ROOT%{_prefix}/info/configure.info.gz;
    7881  then
    7982# These are only present in binutils >= 2.9.5
    80     find $RPM_BUILD_ROOT/opt/rtems/info -name 'configure.*' | \
     83    find $RPM_BUILD_ROOT%{_prefix}/info -name 'configure.*' | \
    8184      sed -e "s,^$RPM_BUILD_ROOT,,g" > ../files
    8285  else
     
    8588
    8689# We assume that info/dir exists when building the RPMs
    87   rm -f $RPM_BUILD_ROOT/opt/rtems/info/dir
    88   f=`find $RPM_BUILD_ROOT/opt/rtems/info -name '*.info.gz'`
     90  rm -f $RPM_BUILD_ROOT%{_prefix}/info/dir
     91  f=`find $RPM_BUILD_ROOT%{_prefix}/info -name '*.info.gz'`
    8992  test x"$f" != x"" && for i in $f; do
    90     install-info $i $RPM_BUILD_ROOT/opt/rtems/info/dir
     93    install-info $i $RPM_BUILD_ROOT%{_prefix}/info/dir
    9194  done
    9295
  • scripts/binutils/target-binutils.add

    r59bcc90 rb96a7b1  
    1616
    1717%files -n @target_alias@-binutils
    18 %doc /opt/rtems/man/man1/@target_alias@-*.1
     18%doc %{_prefix}/man/man1/@target_alias@-*.1
    1919
    20 %dir /opt/rtems/bin
    21 /opt/rtems/bin/@target_alias@-addr2line@exe_ext@
    22 /opt/rtems/bin/@target_alias@-ar@exe_ext@
    23 /opt/rtems/bin/@target_alias@-as@exe_ext@
    24 /opt/rtems/bin/@target_alias@-c++filt@exe_ext@
    25 /opt/rtems/bin/@target_alias@-gasp@exe_ext@
    26 /opt/rtems/bin/@target_alias@-ld@exe_ext@
    27 /opt/rtems/bin/@target_alias@-nm@exe_ext@
    28 /opt/rtems/bin/@target_alias@-objcopy@exe_ext@
    29 /opt/rtems/bin/@target_alias@-objdump@exe_ext@
    30 /opt/rtems/bin/@target_alias@-ranlib@exe_ext@
    31 /opt/rtems/bin/@target_alias@-readelf@exe_ext@
    32 /opt/rtems/bin/@target_alias@-size@exe_ext@
    33 /opt/rtems/bin/@target_alias@-strings@exe_ext@
    34 /opt/rtems/bin/@target_alias@-strip@exe_ext@
     20%dir %{_prefix}/bin
     21%{_prefix}/bin/@target_alias@-addr2line@exe_ext@
     22%{_prefix}/bin/@target_alias@-ar@exe_ext@
     23%{_prefix}/bin/@target_alias@-as@exe_ext@
     24%{_prefix}/bin/@target_alias@-c++filt@exe_ext@
     25%{_prefix}/bin/@target_alias@-gasp@exe_ext@
     26%{_prefix}/bin/@target_alias@-ld@exe_ext@
     27%{_prefix}/bin/@target_alias@-nm@exe_ext@
     28%{_prefix}/bin/@target_alias@-objcopy@exe_ext@
     29%{_prefix}/bin/@target_alias@-objdump@exe_ext@
     30%{_prefix}/bin/@target_alias@-ranlib@exe_ext@
     31%{_prefix}/bin/@target_alias@-readelf@exe_ext@
     32%{_prefix}/bin/@target_alias@-size@exe_ext@
     33%{_prefix}/bin/@target_alias@-strings@exe_ext@
     34%{_prefix}/bin/@target_alias@-strip@exe_ext@
    3535
    36 %dir /opt/rtems/@target_alias@
    37 %dir /opt/rtems/@target_alias@/bin
    38 /opt/rtems/@target_alias@/bin/ar@exe_ext@
    39 /opt/rtems/@target_alias@/bin/as@exe_ext@
    40 /opt/rtems/@target_alias@/bin/ld@exe_ext@
    41 /opt/rtems/@target_alias@/bin/nm@exe_ext@
    42 /opt/rtems/@target_alias@/bin/ranlib@exe_ext@
    43 /opt/rtems/@target_alias@/bin/strip@exe_ext@
     36%dir %{_prefix}/@target_alias@
     37%dir %{_prefix}/@target_alias@/bin
     38%{_prefix}/@target_alias@/bin/ar@exe_ext@
     39%{_prefix}/@target_alias@/bin/as@exe_ext@
     40%{_prefix}/@target_alias@/bin/ld@exe_ext@
     41%{_prefix}/@target_alias@/bin/nm@exe_ext@
     42%{_prefix}/@target_alias@/bin/ranlib@exe_ext@
     43%{_prefix}/@target_alias@/bin/strip@exe_ext@
    4444
    45 %dir /opt/rtems/@target_alias@/lib
    46 /opt/rtems/@target_alias@/lib/ldscripts
     45%dir %{_prefix}/@target_alias@/lib
     46%{_prefix}/@target_alias@/lib/ldscripts
  • scripts/configure.ac

    r59bcc90 rb96a7b1  
    44AC_INIT
    55AC_CONFIG_SRCDIR([binutils])
    6 
     6AC_PREFIX_DEFAULT([/opt/rtems])
    77AM_INIT_AUTOMAKE(rtems-scripts,20010516,no)
    88
Note: See TracChangeset for help on using the changeset viewer.