From 13501927ccdbde00a74efaa20e77afd21af854ae Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Fri, 10 Mar 2006 13:44:30 +0000 Subject: Use %build_infos --- contrib/crossrpms/binutils/base-binutils.add | 2 +- contrib/crossrpms/binutils/binutils.add | 4 +++- contrib/crossrpms/binutils/build.add | 2 +- contrib/crossrpms/binutils/install.add | 11 +++++------ contrib/crossrpms/gcc/base-g77.add | 2 +- contrib/crossrpms/gcc/base-gcc.add | 2 +- contrib/crossrpms/gcc/base-gcj.add | 2 +- contrib/crossrpms/gcc/base-gfortran.add | 2 +- contrib/crossrpms/gcc/base-gnat.add | 2 +- contrib/crossrpms/gcc/base-newlib.add | 2 +- contrib/crossrpms/gcc/build.add | 2 +- contrib/crossrpms/gcc/gccnewlib.add | 1 + contrib/crossrpms/gcc/install.add | 3 +-- contrib/crossrpms/gdb/base-gdb.add | 2 +- contrib/crossrpms/gdb/build.add | 4 ++-- contrib/crossrpms/gdb/gdb.add | 7 ++++--- contrib/crossrpms/gdb/install.add | 10 +++++----- 17 files changed, 31 insertions(+), 29 deletions(-) (limited to 'contrib') diff --git a/contrib/crossrpms/binutils/base-binutils.add b/contrib/crossrpms/binutils/base-binutils.add index 5f807be546..4a805aefb6 100644 --- a/contrib/crossrpms/binutils/base-binutils.add +++ b/contrib/crossrpms/binutils/base-binutils.add @@ -1,4 +1,4 @@ -%if "%{_prefix}" != "/usr" +%if %{build_infos} # ============================================================== # rtems-base-binutils # ============================================================== diff --git a/contrib/crossrpms/binutils/binutils.add b/contrib/crossrpms/binutils/binutils.add index 19757afd5a..4a91d34bcc 100644 --- a/contrib/crossrpms/binutils/binutils.add +++ b/contrib/crossrpms/binutils/binutils.add @@ -1,6 +1,8 @@ %define binutils_version @BINUTILS_VERS@ %define binutils_rpmvers %{expand:%(echo @BINUTILS_VERS@ | tr - _)} +%define build_infos @build_infos@ + Name: @rpmprefix@@tool_target@-binutils Summary: Binutils for target @tool_target@ Group: Development/Tools @@ -10,7 +12,7 @@ License: GPL/LGPL URL: http://sources.redhat.com/binutils BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -%if "%{_prefix}" != "/usr" +%if %{build_infos} # Required for building the infos BuildRequires: /sbin/install-info BuildRequires: texinfo >= 4.2 diff --git a/contrib/crossrpms/binutils/build.add b/contrib/crossrpms/binutils/build.add index 17251094f1..ef001fc1ba 100644 --- a/contrib/crossrpms/binutils/build.add +++ b/contrib/crossrpms/binutils/build.add @@ -15,7 +15,7 @@ --mandir=%{_mandir} --infodir=%{_infodir} make all -%if "%{_prefix}" != "/usr" +%if %{build_infos} make info %endif cd .. diff --git a/contrib/crossrpms/binutils/install.add b/contrib/crossrpms/binutils/install.add index 3d395e3422..93c4a3a387 100644 --- a/contrib/crossrpms/binutils/install.add +++ b/contrib/crossrpms/binutils/install.add @@ -10,7 +10,7 @@ mandir=$RPM_BUILD_ROOT%{_mandir} \ install -%if "%{_prefix}" != "/usr" +%if %{build_infos} make prefix=$RPM_BUILD_ROOT%{_prefix} \ bindir=$RPM_BUILD_ROOT%{_bindir} \ includedir=$RPM_BUILD_ROOT%{_includedir} \ @@ -20,11 +20,7 @@ install-info %endif -%if "%{_prefix}" == "/usr" -# Conflict with a native binutils' infos - rm -rf $RPM_BUILD_ROOT%{_infodir} -%else - +%if %{build_infos} # Dropped in FSF-binutils-2.9.5, but Cygwin still ships it. rm -rf $RPM_BUILD_ROOT%{_infodir}/configure.info* @@ -33,6 +29,9 @@ # binutils does not install share/locale, however it uses it mkdir -p $RPM_BUILD_ROOT%{_prefix}/share/locale +%else +# Conflict with a native binutils' infos + rm -rf $RPM_BUILD_ROOT%{_infodir} %endif # We don't ship host files diff --git a/contrib/crossrpms/gcc/base-g77.add b/contrib/crossrpms/gcc/base-g77.add index 649fa125e3..42e9703585 100644 --- a/contrib/crossrpms/gcc/base-g77.add +++ b/contrib/crossrpms/gcc/base-g77.add @@ -1,4 +1,4 @@ -%if "%{_prefix}" != "/usr" +%if %{build_infos} %if %build_g77 # ============================================================== # rtems-base-g77 diff --git a/contrib/crossrpms/gcc/base-gcc.add b/contrib/crossrpms/gcc/base-gcc.add index a35eae3e43..a60a983328 100644 --- a/contrib/crossrpms/gcc/base-gcc.add +++ b/contrib/crossrpms/gcc/base-gcc.add @@ -1,4 +1,4 @@ -%if "%{_prefix}" != "/usr" +%if %{build_infos} # ============================================================== # @rpmprefix@rtems@osversion@-base-gcc # ============================================================== diff --git a/contrib/crossrpms/gcc/base-gcj.add b/contrib/crossrpms/gcc/base-gcj.add index 2db8f1e772..91dfb63890 100644 --- a/contrib/crossrpms/gcc/base-gcj.add +++ b/contrib/crossrpms/gcc/base-gcj.add @@ -1,4 +1,4 @@ -%if "%{_prefix}" != "/usr" +%if %{build_infos} %if %build_gcj # ============================================================== # rtems-base-gcj diff --git a/contrib/crossrpms/gcc/base-gfortran.add b/contrib/crossrpms/gcc/base-gfortran.add index 6b7b270271..4c03bb05dc 100644 --- a/contrib/crossrpms/gcc/base-gfortran.add +++ b/contrib/crossrpms/gcc/base-gfortran.add @@ -1,4 +1,4 @@ -%if "%{_prefix}" != "/usr" +%if %{build_infos} %if %build_f95 # ============================================================== # @rpmprefix@rtems@osversion@-base-gfortran diff --git a/contrib/crossrpms/gcc/base-gnat.add b/contrib/crossrpms/gcc/base-gnat.add index 827dd6180e..2c75d1261b 100644 --- a/contrib/crossrpms/gcc/base-gnat.add +++ b/contrib/crossrpms/gcc/base-gnat.add @@ -1,4 +1,4 @@ -%if "%{_prefix}" != "/usr" +%if %{build_infos} %if %build_gnat # ============================================================== # rtems-base-gnat diff --git a/contrib/crossrpms/gcc/base-newlib.add b/contrib/crossrpms/gcc/base-newlib.add index 5851c11f7f..4ee8a1799a 100644 --- a/contrib/crossrpms/gcc/base-newlib.add +++ b/contrib/crossrpms/gcc/base-newlib.add @@ -1,4 +1,4 @@ -%if "%{_prefix}" != "/usr" +%if %{build_infos} %if %build_newlib # ============================================================== # @rpmprefix@rtems@osversion@-base-newlib diff --git a/contrib/crossrpms/gcc/build.add b/contrib/crossrpms/gcc/build.add index a3ef041460..d714d8fff8 100644 --- a/contrib/crossrpms/gcc/build.add +++ b/contrib/crossrpms/gcc/build.add @@ -57,7 +57,7 @@ %endif make all -%if "%{_prefix}" != "/usr" +%if %{build_infos} make info %endif cd .. diff --git a/contrib/crossrpms/gcc/gccnewlib.add b/contrib/crossrpms/gcc/gccnewlib.add index 8ee6e3dd23..5e39bf9f0a 100644 --- a/contrib/crossrpms/gcc/gccnewlib.add +++ b/contrib/crossrpms/gcc/gccnewlib.add @@ -4,6 +4,7 @@ %define gcc_rpmvers %{expand:%(echo "@GCC_VERS@" | tr - _ )} %define build_newlib 1 +%define build_infos @build_infos@ %if %build_newlib %define newlib_version @NEWLIB_VERS@ diff --git a/contrib/crossrpms/gcc/install.add b/contrib/crossrpms/gcc/install.add index d1a954cbc2..5482730a1d 100644 --- a/contrib/crossrpms/gcc/install.add +++ b/contrib/crossrpms/gcc/install.add @@ -7,7 +7,6 @@ cd build make DESTDIR=$RPM_BUILD_ROOT install - # cd back to build/ cd .. %if %build_newlib @@ -35,7 +34,7 @@ rm -f $RPM_BUILD_ROOT%{_bindir}/vxaddr2line%{_exeext} %endif -%if "%{_prefix}" != "/usr" +%if %{build_infos} # We don't ship info/dir rm -f $RPM_BUILD_ROOT%{_infodir}/dir touch $RPM_BUILD_ROOT%{_infodir}/dir diff --git a/contrib/crossrpms/gdb/base-gdb.add b/contrib/crossrpms/gdb/base-gdb.add index dcb9e9f238..79bffb16d9 100644 --- a/contrib/crossrpms/gdb/base-gdb.add +++ b/contrib/crossrpms/gdb/base-gdb.add @@ -1,4 +1,4 @@ -%if "%{_prefix}" != "/usr" +%if %{build_infos} # ============================================================== # rtems-base-gdb # ============================================================== diff --git a/contrib/crossrpms/gdb/build.add b/contrib/crossrpms/gdb/build.add index 9452637127..b2831d465b 100644 --- a/contrib/crossrpms/gdb/build.add +++ b/contrib/crossrpms/gdb/build.add @@ -15,8 +15,8 @@ --mandir=%{_mandir} --infodir=%{_infodir} make all -#%if "%{_prefix}" != "/usr" +%if %{build_infos} make info -#%endif +%endif cd .. diff --git a/contrib/crossrpms/gdb/gdb.add b/contrib/crossrpms/gdb/gdb.add index ae65a13839..20037d115e 100644 --- a/contrib/crossrpms/gdb/gdb.add +++ b/contrib/crossrpms/gdb/gdb.add @@ -1,6 +1,8 @@ %define gdb_version @GDB_VERS@ %define gdb_rpmvers %{expand:%(echo @GDB_VERS@ | tr - _)} +%define build_infos @build_infos@ + Name: @rpmprefix@@tool_target@-gdb Summary: Gdb for target @tool_target@ Group: Development/Tools @@ -10,13 +12,12 @@ License: GPL/LGPL URL: http://sources.redhat.com/gdb BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -%if "%{_prefix}" != "/usr" +%if %{build_infos} # Required for building the infos BuildRequires: /sbin/install-info BuildRequires: texinfo >= 4.2 %endif -BuildRequires: flex -BuildRequires: bison +BuildRequires: ncurses-devel @SOURCES@ diff --git a/contrib/crossrpms/gdb/install.add b/contrib/crossrpms/gdb/install.add index 9236903741..c125190c8a 100644 --- a/contrib/crossrpms/gdb/install.add +++ b/contrib/crossrpms/gdb/install.add @@ -10,7 +10,7 @@ mandir=$RPM_BUILD_ROOT%{_mandir} \ install -%if "%{_prefix}" != "/usr" +%if %{build_infos} make prefix=$RPM_BUILD_ROOT%{_prefix} \ bindir=$RPM_BUILD_ROOT%{_bindir} \ includedir=$RPM_BUILD_ROOT%{_includedir} \ @@ -20,10 +20,7 @@ install-info %endif -%if "%{_prefix}" == "/usr" -# Conflict with a native gdb's infos - rm -rf $RPM_BUILD_ROOT%{_infodir} -%else +%if %{build_infos} rm -f $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}/configure* rm -rf $RPM_BUILD_ROOT%{_infodir}/standards* +%else +# Conflict with a native gdb's infos + rm -rf $RPM_BUILD_ROOT%{_infodir} %endif # We don't ship host files -- cgit v1.2.3