Changeset 0973a00 in rtems


Ignore:
Timestamp:
Jul 26, 2009, 6:09:18 AM (11 years ago)
Author:
Ralf Corsepius <ralf.corsepius@…>
Branches:
4.8
Children:
f8589f0
Parents:
cdeed5a6
Message:

Sync with rtems-4.9.

Location:
contrib/crossrpms/autotools
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • contrib/crossrpms/autotools/autoconf.add

    rcdeed5a6 r0973a00  
    3232Requires(preun):        /sbin/install-info
    3333
    34 Source0:        ftp://ftp.gnu.org/gnu/autoconf/autoconf-%{srcvers}.tar.bz2
     34@SOURCES@
    3535
    3636%description
     
    4949%prep
    5050%setup -q -n autoconf-%{srcvers}
     51%{?PATCH0:%patch0 -p1}
    5152
    5253# Work around rpm inserting bogus perl-module deps
  • contrib/crossrpms/autotools/autoconf.am

    rcdeed5a6 r0973a00  
    55AUTOCONF_SUBPACKAGES += $(top_srcdir)/autotools/target-autoconf.add
    66
    7 autoconf.spec.in: $(AUTOCONF_SUBPACKAGES) Makefile.in
     7autoconf.spec.in: $(AUTOCONF_SUBPACKAGES) Makefile.in $(srcdir)/autoconf-sources.add
    88        cat $(AUTOCONF_SUBPACKAGES) | sed \
     9          -e "/[@]SOURCES[@]/r $(srcdir)/autoconf-sources.add" \
     10          -e "/[@]SOURCES[@]/d" \
    911          -e "s/[@]AUTOCONF_VERS[@]/$(AUTOCONF_VERS)/" \
    10           -e "s/[@]AUTOCONF_RPMREL[@]/$(AUTOCONF_RPMREL)/" > $@
     12          -e "s/[@]AUTOCONF_RPMREL[@]/$(AUTOCONF_RPMREL)%{?dist}/" > $@
    1113CLEANFILES += autoconf.spec.in
    1214
  • contrib/crossrpms/autotools/automake.add

    rcdeed5a6 r0973a00  
    2626BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
    2727BuildArch:      noarch
    28 BuildRequires:  %{requirements} perl help2man
     28BuildRequires:  %{requirements} perl
     29%if "%{version}" < "1.11"
     30# automake >= 1.11 ships man-pages
     31BuildRequires:  help2man
     32%endif
    2933Requires:       %{requirements}
    3034Requires(post): /sbin/install-info
    3135Requires(preun):/sbin/install-info
    3236
    33 Source0: ftp://ftp.gnu.org/gnu/automake/automake-%{srcvers}.tar.bz2
     37@SOURCES@
    3438
    3539%description
     
    4246%prep
    4347%setup -q -n automake-%{srcvers}
     48%{?PATCH0:%patch0 -p1}
    4449
    4550# Work around rpm inserting bogus perl-module deps
     
    7479make DESTDIR=${RPM_BUILD_ROOT} install
    7580
     81%if "%{version}" < "1.11"
     82# automake >= 1.11 ships man-pages
    7683install -m 755 -d $RPM_BUILD_ROOT/%{_mandir}/man1
    7784for i in $RPM_BUILD_ROOT%{_bindir}/aclocal \
     
    8289  install -m 644 `basename $i`.1 $RPM_BUILD_ROOT/%{_mandir}/man1
    8390done
     91%endif
    8492
    8593%if "%{_prefix}" != "/usr"
  • contrib/crossrpms/autotools/automake.am

    rcdeed5a6 r0973a00  
    55AUTOMAKE_SUBPACKAGES += $(top_srcdir)/autotools/target-automake.add
    66
    7 automake.spec.in: $(AUTOMAKE_SUBPACKAGES) Makefile.in
     7automake.spec.in: $(AUTOMAKE_SUBPACKAGES) Makefile.am $(srcdir)/automake-sources.add
    88        cat $(AUTOMAKE_SUBPACKAGES) | sed \
    9           -e "s/[@]AUTOMAKE_VERS[@]/$(AUTOMAKE_VERS)/" \
    10           -e "s/[@]AUTOMAKE_RPMREL[@]/$(AUTOMAKE_RPMREL)/" > $@
     9          -e "/[@]SOURCES[@]/r $(srcdir)/automake-sources.add" \
     10          -e "/[@]SOURCES[@]/d" \
     11          -e "s/[@]AUTOMAKE_VERS[@]/$(AUTOMAKE_VERS)/g" \
     12          -e "s/[@]AUTOMAKE_RPMREL[@]/$(AUTOMAKE_RPMREL)%{?dist}/g" > $@
    1113CLEANFILES += automake.spec.in
    1214
  • contrib/crossrpms/autotools/rtems-4.8-autoconf.spec

    rcdeed5a6 r0973a00  
    44#
    55
    6 %define _prefix                 /opt/rtems-4.8
    7 %define _infodir                %{_prefix}/info
    8 %define _mandir                 %{_prefix}/man
     6%define _prefix                 /opt/rtems-4.8
     7%define _exec_prefix            %{_prefix}
     8%define _bindir                 %{_exec_prefix}/bin
     9%define _sbindir                %{_exec_prefix}/sbin
     10%define _libexecdir             %{_exec_prefix}/libexec
     11%define _datarootdir            %{_prefix}/share
     12%define _datadir                %{_datarootdir}
     13%define _sysconfdir             %{_prefix}/etc
     14%define _sharedstatedir         %{_prefix}/com
     15%define _localstatedir          %{_prefix}/var
     16%define _includedir             %{_prefix}/include
     17%define _libdir                 %{_exec_prefix}/%{_lib}
     18%define _mandir                 %{_datarootdir}/man
     19%define _infodir                %{_datarootdir}/info
     20%define _localedir              %{_datarootdir}/locale
    921
    1022%ifos cygwin cygwin32 mingw mingw32
    1123%define _exeext .exe
     24%define debug_package           %{nil}
     25%define _libdir                 %{_exec_prefix}/lib
    1226%else
    1327%define _exeext %{nil}
     
    1630%ifos cygwin cygwin32
    1731%define optflags -O3 -pipe -march=i486 -funroll-loops
    18 %define _libdir                 %{_exec_prefix}/lib
    19 %define debug_package           %{nil}
     32%endif
     33
     34%ifos mingw mingw32
     35%if %{defined _mingw32_cflags}
     36%define optflags %{_mingw32_cflags}
     37%else
     38%define optflags -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4 -mms-bitfields
     39%endif
    2040%endif
    2141
    2242%if "%{_build}" != "%{_host}"
    23 %define _host_rpmprefix rtems-4.8-%{_host}-
     43%define _host_rpmprefix %{_host}-
    2444%else
    2545%define _host_rpmprefix %{nil}
     
    3757Group:          Development/Tools
    3858Version:        %{rpmvers}
    39 Release:        6%{?dist}
     59Release:        7%{?dist}
    4060Summary:        Tool for automatically generating GNU style Makefile.in's
    4161
     
    5373Requires(preun):        /sbin/install-info
    5474
    55 Source0:        ftp://ftp.gnu.org/gnu/autoconf/autoconf-%{srcvers}.tar.bz2
     75Source0: ftp://ftp.gnu.org/gnu/autoconf/autoconf-%{srcvers}.tar.bz2
     76
    5677
    5778%description
     
    7091%prep
    7192%setup -q -n autoconf-%{srcvers}
     93%{?PATCH0:%patch0 -p1}
    7294
    7395# Work around rpm inserting bogus perl-module deps
  • contrib/crossrpms/autotools/rtems-4.8-automake.spec

    rcdeed5a6 r0973a00  
    44#
    55
    6 %define _prefix                 /opt/rtems-4.8
    7 %define _infodir                %{_prefix}/info
    8 %define _mandir                 %{_prefix}/man
     6%define _prefix                 /opt/rtems-4.8
     7%define _exec_prefix            %{_prefix}
     8%define _bindir                 %{_exec_prefix}/bin
     9%define _sbindir                %{_exec_prefix}/sbin
     10%define _libexecdir             %{_exec_prefix}/libexec
     11%define _datarootdir            %{_prefix}/share
     12%define _datadir                %{_datarootdir}
     13%define _sysconfdir             %{_prefix}/etc
     14%define _sharedstatedir         %{_prefix}/com
     15%define _localstatedir          %{_prefix}/var
     16%define _includedir             %{_prefix}/include
     17%define _libdir                 %{_exec_prefix}/%{_lib}
     18%define _mandir                 %{_datarootdir}/man
     19%define _infodir                %{_datarootdir}/info
     20%define _localedir              %{_datarootdir}/locale
    921
    1022%ifos cygwin cygwin32 mingw mingw32
    1123%define _exeext .exe
     24%define debug_package           %{nil}
     25%define _libdir                 %{_exec_prefix}/lib
    1226%else
    1327%define _exeext %{nil}
     
    1630%ifos cygwin cygwin32
    1731%define optflags -O3 -pipe -march=i486 -funroll-loops
    18 %define _libdir                 %{_exec_prefix}/lib
    19 %define debug_package           %{nil}
     32%endif
     33
     34%ifos mingw mingw32
     35%if %{defined _mingw32_cflags}
     36%define optflags %{_mingw32_cflags}
     37%else
     38%define optflags -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4 -mms-bitfields
     39%endif
    2040%endif
    2141
    2242%if "%{_build}" != "%{_host}"
    23 %define _host_rpmprefix rtems-4.8-%{_host}-
     43%define _host_rpmprefix %{_host}-
    2444%else
    2545%define _host_rpmprefix %{nil}
     
    3858Group:          Development/Tools
    3959Version:        %{rpmvers}
    40 Release:        6%{?dist}
     60Release:        7%{?dist}
    4161Summary:        Tool for automatically generating GNU style Makefile.in's
    4262
     
    4666BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
    4767BuildArch:      noarch
    48 BuildRequires:  %{requirements} perl help2man
     68BuildRequires:  %{requirements} perl
     69%if "%{version}" < "1.11"
     70# automake >= 1.11 ships man-pages
     71BuildRequires:  help2man
     72%endif
    4973Requires:       %{requirements}
    5074Requires(post): /sbin/install-info
     
    5276
    5377Source0: ftp://ftp.gnu.org/gnu/automake/automake-%{srcvers}.tar.bz2
     78
    5479
    5580%description
     
    6287%prep
    6388%setup -q -n automake-%{srcvers}
     89%{?PATCH0:%patch0 -p1}
    6490
    6591# Work around rpm inserting bogus perl-module deps
     
    94120make DESTDIR=${RPM_BUILD_ROOT} install
    95121
     122%if "%{version}" < "1.11"
     123# automake >= 1.11 ships man-pages
    96124install -m 755 -d $RPM_BUILD_ROOT/%{_mandir}/man1
    97125for i in $RPM_BUILD_ROOT%{_bindir}/aclocal \
     
    102130  install -m 644 `basename $i`.1 $RPM_BUILD_ROOT/%{_mandir}/man1
    103131done
     132%endif
    104133
    105134mkdir -p $RPM_BUILD_ROOT%{_datadir}/aclocal
Note: See TracChangeset for help on using the changeset viewer.