- add fix-build-on-non-x86.patch: fix build on non-x86

OBS-URL: https://build.opensuse.org/package/show/Base:System/sbc?expand=0&rev=12
This commit is contained in:
Dirk Mueller 2021-01-17 14:13:26 +00:00 committed by Git OBS Bridge
parent 1d93bf3c1b
commit 578f082373
3 changed files with 52 additions and 0 deletions

View File

@ -0,0 +1,45 @@
From 909a9bdf7ab143e1f0baaf9736baebd3cd79aacf Mon Sep 17 00:00:00 2001
From: Marius Bakke <marius@gnu.org>
Date: Tue, 22 Dec 2020 11:04:26 +0000
Subject: sbc_primitives: Fix build on non-x86.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Don't call __builtin_cpu_init unless targeting i386 or x86_64.
Otherwise we get an error at link time:
CC sbc/sbc_primitives.lo
sbc/sbc_primitives.c: In function sbc_init_primitives_x86:
sbc/sbc_primitives.c:596:2: warning: implicit declaration of function __builtin_cpu_init; did you mean __builtin_irint? [-Wimplicit-function-declaration]
[...]
CCLD src/sbcdec
ld: sbc/.libs/libsbc-private.a(sbc_primitives.o): in function `sbc_init_primitives':
sbc_primitives.c:(.text+0x3a30): undefined reference to `__builtin_cpu_init'
---
sbc/sbc_primitives.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/sbc/sbc_primitives.c b/sbc/sbc_primitives.c
index 97a75be..09c214a 100644
--- a/sbc/sbc_primitives.c
+++ b/sbc/sbc_primitives.c
@@ -593,6 +593,7 @@ static int sbc_calc_scalefactors_j(
static void sbc_init_primitives_x86(struct sbc_encoder_state *state)
{
+#if defined(__x86_64__) || defined(__i386__)
__builtin_cpu_init();
#ifdef SBC_BUILD_WITH_MMX_SUPPORT
@@ -604,6 +605,7 @@ static void sbc_init_primitives_x86(struct sbc_encoder_state *state)
if (__builtin_cpu_supports("sse4.2"))
sbc_init_primitives_sse(state);
#endif
+#endif
}
/*
--
cgit 1.2.3-1.el7

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Sun Jan 17 14:11:57 UTC 2021 - Dirk Müller <dmueller@suse.com>
- add fix-build-on-non-x86.patch: fix build on non-x86
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Jan 11 01:03:32 UTC 2021 - Dirk Müller <dmueller@suse.com> Mon Jan 11 01:03:32 UTC 2021 - Dirk Müller <dmueller@suse.com>

View File

@ -28,6 +28,7 @@ Group: Hardware/Mobile
URL: https://www.kernel.org/pub/linux/bluetooth URL: https://www.kernel.org/pub/linux/bluetooth
Source: https://www.kernel.org/pub/linux/bluetooth/%{name}-%{version}.tar.xz Source: https://www.kernel.org/pub/linux/bluetooth/%{name}-%{version}.tar.xz
Source1: baselibs.conf Source1: baselibs.conf
Patch1: https://git.kernel.org/pub/scm/bluetooth/sbc.git/patch/?id=909a9bdf7ab143e1f0baaf9736baebd3cd79aacf#/fix-build-on-non-x86.patch
BuildRequires: libsndfile-devel BuildRequires: libsndfile-devel
BuildRequires: pkg-config BuildRequires: pkg-config
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
@ -54,6 +55,7 @@ Development files for the SBC library
%prep %prep
%setup -q %setup -q
%patch1 -p1
%build %build
%global _lto_cflags %{_lto_cflags} -ffat-lto-objects %global _lto_cflags %{_lto_cflags} -ffat-lto-objects