mirror of
https://gitlab.rtems.org/rtems/rtos/rtems.git
synced 2025-12-09 09:03:33 +00:00
Sync with CVS-HEAD.
This commit is contained in:
@@ -5,7 +5,7 @@
|
|||||||
mkdir -p build
|
mkdir -p build
|
||||||
|
|
||||||
cd build
|
cd build
|
||||||
../rtems-%{cpukit_pkgvers}/configure \
|
../rtems-%{cpukit_version}/configure \
|
||||||
--prefix=%{_prefix} \
|
--prefix=%{_prefix} \
|
||||||
--target=@tool_target@ \
|
--target=@tool_target@ \
|
||||||
--enable-multilib \
|
--enable-multilib \
|
||||||
|
|||||||
@@ -1,20 +1,20 @@
|
|||||||
|
|
||||||
%define cpukit_pkgvers @CPUKIT_PKGVERS@
|
%define cpukit_pkgvers @CPUKIT_PKGVERS@
|
||||||
%define cpukit_version @CPUKIT_VERS@
|
%define cpukit_version @CPUKIT_VERS@
|
||||||
%define cpukit_rpmvers %{expand:%(echo "@CPUKIT_VERS@" | tr - _ )}
|
%define cpukit_rpmvers %{expand:%(echo "@CPUKIT_PKGVERS@" | tr - . )}
|
||||||
|
|
||||||
Name: @rpmprefix@@tool_target@-cpukit
|
Name: @rpmprefix@@tool_target@-cpukit
|
||||||
Summary: @tool_target@ cpukit
|
Summary: @tool_target@ cpukit
|
||||||
|
|
||||||
Group: Development/Tools
|
Group: Development/Tools
|
||||||
Version: %{cpukit_rpmvers}
|
Version: %{cpukit_rpmvers}
|
||||||
Release: @CPUKIT_RPMREL@%{?dist}
|
Release: @CPUKIT_RPMREL@
|
||||||
License: GPL
|
License: GPL
|
||||||
URL: http://cpukit.gnu.org
|
URL: http://cpukit.gnu.org
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||||
BuildArch: noarch
|
BuildArch: noarch
|
||||||
|
|
||||||
%define _use_internal_dependency_generator 0
|
%define debug_package %{nil}
|
||||||
|
|
||||||
BuildRequires: @rpmprefix@@tool_target@-gcc
|
BuildRequires: @rpmprefix@@tool_target@-gcc
|
||||||
|
|
||||||
|
|||||||
@@ -31,19 +31,19 @@ sed -e 's,^[ ]*/usr/lib/rpm.*/brp-strip,./brp-strip,' \
|
|||||||
%define __os_install_post . ./os_install_post
|
%define __os_install_post . ./os_install_post
|
||||||
|
|
||||||
|
|
||||||
cat << EOF > %{_builddir}/%{name}-%{cpukit_rpmvers}/find-provides
|
cat << EOF > %{_builddir}/%{name}-%{version}/find-provides
|
||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/@tool_target@/(lib|include|sys-root)' \
|
grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/@tool_target@/(lib|include|sys-root)' \
|
||||||
| grep -v '^${RPM_BUILD_ROOT}%{cpukitlib}/@tool_target@/' | %__find_provides
|
| grep -v '^${RPM_BUILD_ROOT}%{cpukitlib}/@tool_target@/' | %__find_provides
|
||||||
EOF
|
EOF
|
||||||
chmod +x %{_builddir}/%{name}-%{cpukit_rpmvers}/find-provides
|
chmod +x %{_builddir}/%{name}-%{version}/find-provides
|
||||||
%define __find_provides %{_builddir}/%{name}-%{cpukit_rpmvers}/find-provides
|
%define __find_provides %{_builddir}/%{name}-%{version}/find-provides
|
||||||
|
|
||||||
cat << EOF > %{_builddir}/%{name}-%{cpukit_rpmvers}/find-requires
|
cat << EOF > %{_builddir}/%{name}-%{version}/find-requires
|
||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/@tool_target@/(lib|include|sys-root)' \
|
grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/@tool_target@/(lib|include|sys-root)' \
|
||||||
| grep -v '^${RPM_BUILD_ROOT}%{cpukitlib}/@tool_target@/' | %__find_requires
|
| grep -v '^${RPM_BUILD_ROOT}%{cpukitlib}/@tool_target@/' | %__find_requires
|
||||||
EOF
|
EOF
|
||||||
chmod +x %{_builddir}/%{name}-%{cpukit_rpmvers}/find-requires
|
chmod +x %{_builddir}/%{name}-%{version}/find-requires
|
||||||
%define __find_requires %{_builddir}/%{name}-%{cpukit_rpmvers}/find-requires
|
%define __find_requires %{_builddir}/%{name}-%{version}/find-requires
|
||||||
|
|
||||||
|
|||||||
@@ -1,7 +1,8 @@
|
|||||||
%description -n @rpmprefix@@tool_target@-cpukit
|
%description -n @rpmprefix@@tool_target@-cpukit
|
||||||
GNU cc compiler for @tool_target@.
|
RTEMS cpukit for target @tool_target@.
|
||||||
|
|
||||||
%files -n @rpmprefix@@tool_target@-cpukit
|
%files -n @rpmprefix@@tool_target@-cpukit
|
||||||
|
%defattr(-,root,root)
|
||||||
%sysdir %{_prefix}
|
%sysdir %{_prefix}
|
||||||
%{_prefix}/@tool_target@
|
%{_prefix}/@tool_target@
|
||||||
# Violates the FHS
|
# Violates the FHS
|
||||||
|
|||||||
@@ -7,6 +7,7 @@
|
|||||||
Summary: Base package for RTEMS newlib C Library
|
Summary: Base package for RTEMS newlib C Library
|
||||||
Group: Development/Tools
|
Group: Development/Tools
|
||||||
Version: %{newlib_version}
|
Version: %{newlib_version}
|
||||||
|
Release: @NEWLIB_RPMREL@
|
||||||
License: Distributable
|
License: Distributable
|
||||||
|
|
||||||
Requires(post): /sbin/install-info
|
Requires(post): /sbin/install-info
|
||||||
|
|||||||
@@ -4,8 +4,8 @@
|
|||||||
%define gcc_rpmvers %{expand:%(echo "@GCC_VERS@" | tr - _ )}
|
%define gcc_rpmvers %{expand:%(echo "@GCC_VERS@" | tr - _ )}
|
||||||
|
|
||||||
%if %build_newlib
|
%if %build_newlib
|
||||||
|
%define newlib_pkgvers @NEWLIB_PKGVERS@
|
||||||
%define newlib_version @NEWLIB_VERS@
|
%define newlib_version @NEWLIB_VERS@
|
||||||
%define gccnewlib_version gcc%{gcc_version}newlib%{newlib_version}
|
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%define mpfr_version 2.3.1
|
%define mpfr_version 2.3.1
|
||||||
@@ -38,12 +38,11 @@ BuildRequires: mpfr-devel >= 2.3.0
|
|||||||
%endif
|
%endif
|
||||||
# These distros ship an insufficient mpfr
|
# These distros ship an insufficient mpfr
|
||||||
%{?el4:%define _build_mpfr 1}
|
%{?el4:%define _build_mpfr 1}
|
||||||
%{?suse10_2:%define _build_mpfr 1}
|
|
||||||
%{?suse10_3:%define _build_mpfr 1}
|
%{?suse10_3:%define _build_mpfr 1}
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%if "%{_build}" != "%{_host}"
|
%if "%{_build}" != "%{_host}"
|
||||||
BuildRequires: @rpmprefix@@tool_target@-gcc
|
BuildRequires: @rpmprefix@@tool_target@-gcc = %{gcc_rpmvers}
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%if "%{gcc_version}" >= "4.2.0"
|
%if "%{gcc_version}" >= "4.2.0"
|
||||||
@@ -73,7 +72,7 @@ Requires: @rpmprefix@@tool_target@-binutils
|
|||||||
Requires: @rpmprefix@@tool_target@-sys-root
|
Requires: @rpmprefix@@tool_target@-sys-root
|
||||||
Requires: @rpmprefix@@tool_target@-w32api-sys-root
|
Requires: @rpmprefix@@tool_target@-w32api-sys-root
|
||||||
%if %build_newlib
|
%if %build_newlib
|
||||||
Requires: @rpmprefix@@tool_target@-newlib = %{newlib_version}-%{release}
|
Requires: @rpmprefix@@tool_target@-newlib = %{newlib_version}-@NEWLIB_RPMREL@
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%if %build_gcj
|
%if %build_gcj
|
||||||
@@ -83,7 +82,7 @@ BuildRequires: zlib-devel
|
|||||||
# Building gnat requires gnat
|
# Building gnat requires gnat
|
||||||
# This really isn't available until RedHat 8.0. How to conditionalize this?
|
# This really isn't available until RedHat 8.0. How to conditionalize this?
|
||||||
BuildRequires: gcc-gnat
|
BuildRequires: gcc-gnat
|
||||||
BuildRequires: @rpmprefix@@tool_target@-newlib < %{newlib_version}-%{release}
|
BuildRequires: @rpmprefix@@tool_target@-newlib < %{newlib_version}-@NEWLIB_RPMREL@
|
||||||
%endif
|
%endif
|
||||||
%if %build_f95
|
%if %build_f95
|
||||||
BuildRequires: gmp-devel
|
BuildRequires: gmp-devel
|
||||||
|
|||||||
@@ -9,7 +9,7 @@ Version: %{gcc_rpmvers}
|
|||||||
License: GPL
|
License: GPL
|
||||||
|
|
||||||
%if "%{_build}" != "%{_host}"
|
%if "%{_build}" != "%{_host}"
|
||||||
BuildRequires: @rpmprefix@@tool_target@-gcc-c++
|
BuildRequires: @rpmprefix@@tool_target@-gcc-c++ = %{gcc_rpmvers}
|
||||||
%endif
|
%endif
|
||||||
Provides: @rpmprefix@@tool_target@-c++ = %{gcc_rpmvers}-%{release}
|
Provides: @rpmprefix@@tool_target@-c++ = %{gcc_rpmvers}-%{release}
|
||||||
Obsoletes: @rpmprefix@@tool_target@-c++ < %{gcc_rpmvers}-%{release}
|
Obsoletes: @rpmprefix@@tool_target@-c++ < %{gcc_rpmvers}-%{release}
|
||||||
@@ -35,10 +35,6 @@ GCC c++ compiler for @tool_target@.
|
|||||||
%{gccexec}/@tool_target@/%{gcc_version}/cc1plus%{_exeext}
|
%{gccexec}/@tool_target@/%{gcc_version}/cc1plus%{_exeext}
|
||||||
|
|
||||||
%dir %{gcclib}/@tool_target@/%{gcc_version}/include
|
%dir %{gcclib}/@tool_target@/%{gcc_version}/include
|
||||||
%if "%{gcc_version}" >= "3.2"
|
|
||||||
%{gcclib}/@tool_target@/%{gcc_version}/include/c++
|
%{gcclib}/@tool_target@/%{gcc_version}/include/c++
|
||||||
%else
|
|
||||||
%{gcclib}/@tool_target@/%{gcc_version}/include/g++
|
|
||||||
%endif
|
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
|
|||||||
@@ -6,7 +6,7 @@
|
|||||||
# Group: Development/Tools
|
# Group: Development/Tools
|
||||||
# Version: %{gcc_rpmvers}
|
# Version: %{gcc_rpmvers}
|
||||||
# Requires: @rpmprefix@@tool_target@-binutils
|
# Requires: @rpmprefix@@tool_target@-binutils
|
||||||
# Requires: @rpmprefix@@tool_target@-newlib = %{newlib_version}-%{release}
|
# Requires: @rpmprefix@@tool_target@-newlib = %{newlib_version}-@NEWLIB_RPMREL@
|
||||||
# License: GPL
|
# License: GPL
|
||||||
|
|
||||||
# %if %build_infos
|
# %if %build_infos
|
||||||
|
|||||||
@@ -7,9 +7,7 @@ Summary: C Library (newlib) for @tool_target@
|
|||||||
Group: Development/Tools
|
Group: Development/Tools
|
||||||
License: Distributable
|
License: Distributable
|
||||||
Version: %{newlib_version}
|
Version: %{newlib_version}
|
||||||
|
Release: @NEWLIB_RPMREL@
|
||||||
Provides: @rpmprefix@@tool_target@-libc = %{newlib_version}-%{release}
|
|
||||||
Obsoletes: @rpmprefix@@tool_target@-libc < %{newlib_version}-%{release}
|
|
||||||
|
|
||||||
%if %build_infos
|
%if %build_infos
|
||||||
Requires: @rpmprefix@newlib-common
|
Requires: @rpmprefix@newlib-common
|
||||||
|
|||||||
Reference in New Issue
Block a user