Accepting request 900731 from home:dirkmueller:Factory

- disable all but the arm dependencies for ring

OBS-URL: https://build.opensuse.org/request/show/900731
OBS-URL: https://build.opensuse.org/package/show/devel:gcc/newlib?expand=0&rev=26
This commit is contained in:
Richard Biener 2021-07-15 08:39:46 +00:00 committed by Git OBS Bridge
parent 37401cea37
commit 7084d6939f
2 changed files with 14 additions and 8 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Wed Jun 9 20:13:14 UTC 2021 - Dirk Müller <dmueller@suse.com>
- disable all but the arm dependencies for ring
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Mar 8 13:24:30 UTC 2021 - Richard Biener <rguenther@suse.com> Mon Mar 8 13:24:30 UTC 2021 - Richard Biener <rguenther@suse.com>

View File

@ -1,5 +1,5 @@
# #
# spec file for package newlib # spec file
# #
# Copyright (c) 2021 SUSE LLC # Copyright (c) 2021 SUSE LLC
# #
@ -23,7 +23,6 @@
%define cross_arch %{flavor} %define cross_arch %{flavor}
%define pname cross-%{cross_arch}-newlib-devel %define pname cross-%{cross_arch}-newlib-devel
%endif %endif
%if "%{flavor}" == "riscv64" %if "%{flavor}" == "riscv64"
%define gcc_cross_arch %{cross_arch}-elf %define gcc_cross_arch %{cross_arch}-elf
%define target %{cross_arch}-elf %define target %{cross_arch}-elf
@ -31,7 +30,6 @@
%define gcc_cross_arch %{cross_arch} %define gcc_cross_arch %{cross_arch}
%define target %{cross_arch} %define target %{cross_arch}
%endif %endif
%if "%{cross_arch}" == "epiphany" || "%{cross_arch}" == "riscv32" || "%{cross_arch}" == "rl78" || "%{cross_arch}" == "rx" %if "%{cross_arch}" == "epiphany" || "%{cross_arch}" == "riscv32" || "%{cross_arch}" == "rl78" || "%{cross_arch}" == "rx"
%define target %{cross_arch}-elf %define target %{cross_arch}-elf
%endif %endif
@ -39,11 +37,12 @@
%define target %{cross_arch}-eabi %define target %{cross_arch}-eabi
%endif %endif
%if "%{cross_arch}" == "spu" %if "%{cross_arch}" == "spu"
%define sysroot /usr/spu %define sysroot %{_prefix}/spu
%else %else
%define sysroot %{_prefix}/%{target}/sys-root %define sysroot %{_prefix}/%{target}/sys-root
%endif %endif
# In the staging/ring projects, we don't want to build the unneeded packages
%bcond_with ringdisabled
Name: %{pname} Name: %{pname}
Version: 4.1.0 Version: 4.1.0
Release: 0 Release: 0
@ -53,12 +52,14 @@ Group: Development/Libraries/Cross
URL: https://sourceware.org/newlib/ URL: https://sourceware.org/newlib/
Source0: ftp://sourceware.org/pub/newlib/newlib-%{version}.tar.gz Source0: ftp://sourceware.org/pub/newlib/newlib-%{version}.tar.gz
Patch1: epiphany-fixes.diff Patch1: epiphany-fixes.diff
%if "%{flavor}" == "" %if "%{flavor}" == ""
BuildArch: noarch BuildArch: noarch
%else %else
BuildRequires: cross-%{gcc_cross_arch}-gcc%{gcc_version}-bootstrap BuildRequires: cross-%{gcc_cross_arch}-gcc%{gcc_version}-bootstrap
BuildRequires: fdupes BuildRequires: fdupes
%if "%{cross_arch}" != "arm-none" && "%{cross_arch}" != "arm" && %{with ringdisabled}
ExclusiveArch: do-not-build
%endif
%endif %endif
%description %description
@ -80,7 +81,7 @@ cd build-dir
--prefix=%{_prefix} --libdir=%{_libdir} --mandir=%{_mandir} --infodir=%{_infodir} \ --prefix=%{_prefix} --libdir=%{_libdir} --mandir=%{_mandir} --infodir=%{_infodir} \
--target=%{target} \ --target=%{target} \
--with-build-sysroot=%{sysroot} --with-build-sysroot=%{sysroot}
%ifarch %ix86 %ifarch %{ix86}
%if 0 %if 0
--with-newlib \ --with-newlib \
%endif %endif
@ -101,7 +102,7 @@ export NO_DEBUGINFO_STRIP_DEBUG=true
: >debugsources.list : >debugsources.list
cd build-dir cd build-dir
make install DESTDIR=%{buildroot} %make_install
%fdupes %{buildroot} %fdupes %{buildroot}
%endif %endif