Use %build_infos

This commit is contained in:
Ralf Corsepius
2006-03-10 13:44:30 +00:00
parent a56035b779
commit 13501927cc
17 changed files with 31 additions and 29 deletions

View File

@@ -1,4 +1,4 @@
%if "%{_prefix}" != "/usr" %if %{build_infos}
# ============================================================== # ==============================================================
# rtems-base-binutils # rtems-base-binutils
# ============================================================== # ==============================================================

View File

@@ -1,6 +1,8 @@
%define binutils_version @BINUTILS_VERS@ %define binutils_version @BINUTILS_VERS@
%define binutils_rpmvers %{expand:%(echo @BINUTILS_VERS@ | tr - _)} %define binutils_rpmvers %{expand:%(echo @BINUTILS_VERS@ | tr - _)}
%define build_infos @build_infos@
Name: @rpmprefix@@tool_target@-binutils Name: @rpmprefix@@tool_target@-binutils
Summary: Binutils for target @tool_target@ Summary: Binutils for target @tool_target@
Group: Development/Tools Group: Development/Tools
@@ -10,7 +12,7 @@ License: GPL/LGPL
URL: http://sources.redhat.com/binutils URL: http://sources.redhat.com/binutils
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
%if "%{_prefix}" != "/usr" %if %{build_infos}
# Required for building the infos # Required for building the infos
BuildRequires: /sbin/install-info BuildRequires: /sbin/install-info
BuildRequires: texinfo >= 4.2 BuildRequires: texinfo >= 4.2

View File

@@ -15,7 +15,7 @@
--mandir=%{_mandir} --infodir=%{_infodir} --mandir=%{_mandir} --infodir=%{_infodir}
make all make all
%if "%{_prefix}" != "/usr" %if %{build_infos}
make info make info
%endif %endif
cd .. cd ..

View File

@@ -10,7 +10,7 @@
mandir=$RPM_BUILD_ROOT%{_mandir} \ mandir=$RPM_BUILD_ROOT%{_mandir} \
install install
%if "%{_prefix}" != "/usr" %if %{build_infos}
make prefix=$RPM_BUILD_ROOT%{_prefix} \ make prefix=$RPM_BUILD_ROOT%{_prefix} \
bindir=$RPM_BUILD_ROOT%{_bindir} \ bindir=$RPM_BUILD_ROOT%{_bindir} \
includedir=$RPM_BUILD_ROOT%{_includedir} \ includedir=$RPM_BUILD_ROOT%{_includedir} \
@@ -20,11 +20,7 @@
install-info install-info
%endif %endif
%if "%{_prefix}" == "/usr" %if %{build_infos}
# Conflict with a native binutils' infos
rm -rf $RPM_BUILD_ROOT%{_infodir}
%else
# Dropped in FSF-binutils-2.9.5, but Cygwin still ships it. # Dropped in FSF-binutils-2.9.5, but Cygwin still ships it.
rm -rf $RPM_BUILD_ROOT%{_infodir}/configure.info* rm -rf $RPM_BUILD_ROOT%{_infodir}/configure.info*
@@ -33,6 +29,9 @@
# binutils does not install share/locale, however it uses it # binutils does not install share/locale, however it uses it
mkdir -p $RPM_BUILD_ROOT%{_prefix}/share/locale mkdir -p $RPM_BUILD_ROOT%{_prefix}/share/locale
%else
# Conflict with a native binutils' infos
rm -rf $RPM_BUILD_ROOT%{_infodir}
%endif %endif
# We don't ship host files # We don't ship host files

View File

@@ -1,4 +1,4 @@
%if "%{_prefix}" != "/usr" %if %{build_infos}
%if %build_g77 %if %build_g77
# ============================================================== # ==============================================================
# rtems-base-g77 # rtems-base-g77

View File

@@ -1,4 +1,4 @@
%if "%{_prefix}" != "/usr" %if %{build_infos}
# ============================================================== # ==============================================================
# @rpmprefix@rtems@osversion@-base-gcc # @rpmprefix@rtems@osversion@-base-gcc
# ============================================================== # ==============================================================

View File

@@ -1,4 +1,4 @@
%if "%{_prefix}" != "/usr" %if %{build_infos}
%if %build_gcj %if %build_gcj
# ============================================================== # ==============================================================
# rtems-base-gcj # rtems-base-gcj

View File

@@ -1,4 +1,4 @@
%if "%{_prefix}" != "/usr" %if %{build_infos}
%if %build_f95 %if %build_f95
# ============================================================== # ==============================================================
# @rpmprefix@rtems@osversion@-base-gfortran # @rpmprefix@rtems@osversion@-base-gfortran

View File

@@ -1,4 +1,4 @@
%if "%{_prefix}" != "/usr" %if %{build_infos}
%if %build_gnat %if %build_gnat
# ============================================================== # ==============================================================
# rtems-base-gnat # rtems-base-gnat

View File

@@ -1,4 +1,4 @@
%if "%{_prefix}" != "/usr" %if %{build_infos}
%if %build_newlib %if %build_newlib
# ============================================================== # ==============================================================
# @rpmprefix@rtems@osversion@-base-newlib # @rpmprefix@rtems@osversion@-base-newlib

View File

@@ -57,7 +57,7 @@
%endif %endif
make all make all
%if "%{_prefix}" != "/usr" %if %{build_infos}
make info make info
%endif %endif
cd .. cd ..

View File

@@ -4,6 +4,7 @@
%define gcc_rpmvers %{expand:%(echo "@GCC_VERS@" | tr - _ )} %define gcc_rpmvers %{expand:%(echo "@GCC_VERS@" | tr - _ )}
%define build_newlib 1 %define build_newlib 1
%define build_infos @build_infos@
%if %build_newlib %if %build_newlib
%define newlib_version @NEWLIB_VERS@ %define newlib_version @NEWLIB_VERS@

View File

@@ -7,7 +7,6 @@
cd build cd build
make DESTDIR=$RPM_BUILD_ROOT install make DESTDIR=$RPM_BUILD_ROOT install
# cd back to build/
cd .. cd ..
%if %build_newlib %if %build_newlib
@@ -35,7 +34,7 @@
rm -f $RPM_BUILD_ROOT%{_bindir}/vxaddr2line%{_exeext} rm -f $RPM_BUILD_ROOT%{_bindir}/vxaddr2line%{_exeext}
%endif %endif
%if "%{_prefix}" != "/usr" %if %{build_infos}
# We don't ship info/dir # We don't ship info/dir
rm -f $RPM_BUILD_ROOT%{_infodir}/dir rm -f $RPM_BUILD_ROOT%{_infodir}/dir
touch $RPM_BUILD_ROOT%{_infodir}/dir touch $RPM_BUILD_ROOT%{_infodir}/dir

View File

@@ -1,4 +1,4 @@
%if "%{_prefix}" != "/usr" %if %{build_infos}
# ============================================================== # ==============================================================
# rtems-base-gdb # rtems-base-gdb
# ============================================================== # ==============================================================

View File

@@ -15,8 +15,8 @@
--mandir=%{_mandir} --infodir=%{_infodir} --mandir=%{_mandir} --infodir=%{_infodir}
make all make all
#%if "%{_prefix}" != "/usr" %if %{build_infos}
make info make info
#%endif %endif
cd .. cd ..

View File

@@ -1,6 +1,8 @@
%define gdb_version @GDB_VERS@ %define gdb_version @GDB_VERS@
%define gdb_rpmvers %{expand:%(echo @GDB_VERS@ | tr - _)} %define gdb_rpmvers %{expand:%(echo @GDB_VERS@ | tr - _)}
%define build_infos @build_infos@
Name: @rpmprefix@@tool_target@-gdb Name: @rpmprefix@@tool_target@-gdb
Summary: Gdb for target @tool_target@ Summary: Gdb for target @tool_target@
Group: Development/Tools Group: Development/Tools
@@ -10,13 +12,12 @@ License: GPL/LGPL
URL: http://sources.redhat.com/gdb URL: http://sources.redhat.com/gdb
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
%if "%{_prefix}" != "/usr" %if %{build_infos}
# Required for building the infos # Required for building the infos
BuildRequires: /sbin/install-info BuildRequires: /sbin/install-info
BuildRequires: texinfo >= 4.2 BuildRequires: texinfo >= 4.2
%endif %endif
BuildRequires: flex BuildRequires: ncurses-devel
BuildRequires: bison
@SOURCES@ @SOURCES@

View File

@@ -10,7 +10,7 @@
mandir=$RPM_BUILD_ROOT%{_mandir} \ mandir=$RPM_BUILD_ROOT%{_mandir} \
install install
%if "%{_prefix}" != "/usr" %if %{build_infos}
make prefix=$RPM_BUILD_ROOT%{_prefix} \ make prefix=$RPM_BUILD_ROOT%{_prefix} \
bindir=$RPM_BUILD_ROOT%{_bindir} \ bindir=$RPM_BUILD_ROOT%{_bindir} \
includedir=$RPM_BUILD_ROOT%{_includedir} \ includedir=$RPM_BUILD_ROOT%{_includedir} \
@@ -20,10 +20,7 @@
install-info install-info
%endif %endif
%if "%{_prefix}" == "/usr" %if %{build_infos}
# Conflict with a native gdb's infos
rm -rf $RPM_BUILD_ROOT%{_infodir}
%else
rm -f $RPM_BUILD_ROOT%{_infodir}/dir rm -f $RPM_BUILD_ROOT%{_infodir}/dir
touch $RPM_BUILD_ROOT%{_infodir}/dir touch $RPM_BUILD_ROOT%{_infodir}/dir
@@ -31,6 +28,9 @@
rm -rf $RPM_BUILD_ROOT%{_infodir}/bfd* rm -rf $RPM_BUILD_ROOT%{_infodir}/bfd*
rm -rf $RPM_BUILD_ROOT%{_infodir}/configure* rm -rf $RPM_BUILD_ROOT%{_infodir}/configure*
rm -rf $RPM_BUILD_ROOT%{_infodir}/standards* rm -rf $RPM_BUILD_ROOT%{_infodir}/standards*
%else
# Conflict with a native gdb's infos
rm -rf $RPM_BUILD_ROOT%{_infodir}
%endif %endif
# We don't ship host files # We don't ship host files