From 93c179932a1a282bb56823ee202e387ced41f388 Mon Sep 17 00:00:00 2001 From: Max Krummenacher Date: Mon, 7 Sep 2020 15:57:36 +0200 Subject: bluez-alsa: fix linking with gcc 10 GCC 10 by default compiles with -fno-common which results in linker erros. | ld: bluez-a2dp.o:...git/src/bluez-a2dp.h:20: multiple definition of `bluez_a2dp_sbc'; .../git/src/bluez-a2dp.h:20: first defined here | ld: bluez-iface.o:...git/src/bluez-iface.h:17: multiple definition of `bluez_iface_profile'; .../git/src/bluez-iface.h:17: first defined here | ld: bluez-iface.o:...git/src/bluez-iface.h:16: multiple definition of `bluez_iface_endpoint'; .../git/src/bluez-iface.h:16: first defined here Declare with 'extern' fixes the linkage. Signed-off-by: Max Krummenacher --- recipes-connectivity/bluez-alsa/bluez-alsa_git.bb | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) (limited to 'recipes-connectivity/bluez-alsa/bluez-alsa_git.bb') diff --git a/recipes-connectivity/bluez-alsa/bluez-alsa_git.bb b/recipes-connectivity/bluez-alsa/bluez-alsa_git.bb index 6025981..085792d 100644 --- a/recipes-connectivity/bluez-alsa/bluez-alsa_git.bb +++ b/recipes-connectivity/bluez-alsa/bluez-alsa_git.bb @@ -5,7 +5,11 @@ SECTION = "libs" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=bb3e99e80c5d718213f35ae1def4c106" -SRC_URI = "git://github.com/Arkq/bluez-alsa.git;protocol=https;branch=master" +SRC_URI = " \ + git://github.com/Arkq/bluez-alsa.git;protocol=https;branch=master \ + file://0001-Fix-linkage-mark-external-variable-as-extern.patch \ +" + SRCREV = "9045edb436ea755f395a2e09e4525b5defad286a" SRC_URI += "file://bluez-alsa.service" @@ -32,12 +36,12 @@ do_install_append () { } FILES_${PN} += "\ - ${datadir}/alsa/alsa.conf.d/20-bluealsa.conf\ - ${libdir}/alsa-lib/libasound_module_ctl_bluealsa.so\ - ${libdir}/alsa-lib/libasound_module_pcm_bluealsa.so\ + ${datadir}/alsa/alsa.conf.d/20-bluealsa.conf\ + ${libdir}/alsa-lib/libasound_module_ctl_bluealsa.so\ + ${libdir}/alsa-lib/libasound_module_pcm_bluealsa.so\ " FILES_${PN}-staticdev += "\ - ${libdir}/alsa-lib/libasound_module_ctl_bluealsa.a\ - ${libdir}/alsa-lib/libasound_module_pcm_bluealsa.a\ + ${libdir}/alsa-lib/libasound_module_ctl_bluealsa.a\ + ${libdir}/alsa-lib/libasound_module_pcm_bluealsa.a\ " -- cgit v1.2.3