d-two/operating-system
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bump Buildroot to 2021.02-rc3 (#1260)

Browse Source 
* Rebase patches to Buildroot 2021.02-rc3

* Update Buildroot to 2021.02-rc3

* Declare Kernel headers to be Linux version 5.10 (since they are, and new Buildroot knows about 5.10)
This commit is contained in:
Stefan Agner
2021-03-04 00:50:33 +01:00
committed by GitHub
parent b77d633382
commit f358f322da
2130 changed files with 23612 additions and 21038 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
buildroot/package/mpd/0002-src-tag-meson.build-fix-GenParseName-linking.patch Normal file
View File

@@ -0,0 +1,38 @@
From 4c37d0b316a15213381bd7e07c5dee7526471fc8 Mon Sep 17 00:00:00 2001
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Date: Mon, 1 Feb 2021 08:10:45 +0100
Subject: [PATCH] src/tag/meson.build: fix GenParseName linking
Set link_language to cpp for GenParseName to avoid the following build
failure due to gcc being used to link a C and C++ source file:
FAILED: src/tag/GenParseName
/usr/bin/gcc -o src/tag/GenParseName src/tag/GenParseName.p/GenParseName.cxx.o src/tag/GenParseName.p/Names.c.o -Wl,--as-needed -Wl,--no-undefined -Wl,-O1
/usr/bin/ld: src/tag/GenParseName.p/GenParseName.cxx.o: in function `std::_Rb_tree<std::basic_string_view<char, std::char_traits<char> >, std::pair<std::basic_string_view<char, std::char_traits<char> > const, TagType>, std::_Select1st<std::pair<std::basic_string_view<char, std::char_traits<char> > const, TagType> >, std::less<std::basic_string_view<char, std::char_traits<char> > >, std::allocator<std::pair<std::basic_string_view<char, std::char_traits<char> > const, TagType> > >::_M_erase(std::_Rb_tree_node<std::pair<std::basic_string_view<char, std::char_traits<char> > const, TagType> >*)':
GenParseName.cxx:
(.text._ZNSt8_Rb_treeISt17basic_string_viewIcSt11char_traitsIcEESt4pairIKS3_7TagTypeESt10_Select1stIS7_ESt4lessIS3_ESaIS7_EE8_M_eraseEPSt13_Rb_tree_nodeIS7_E[_ZNSt8_Rb_treeISt17basic_string_viewIcSt11char_traitsIcEESt4pairIKS3_7TagTypeESt10_Select1stIS7_ESt4lessIS3_ESaIS7_EE8_M_eraseEPSt13_Rb_tree_nodeIS7_E]+0x23): undefined reference to `operator delete(void*)'
Fixes:
- http://autobuild.buildroot.org/results/871e1362c44e5b68a149e6a5dd3caf99ea0d904a
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
[Upstream status: https://github.com/MusicPlayerDaemon/MPD/pull/1068]
---
src/tag/meson.build | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/tag/meson.build b/src/tag/meson.build
index 064eada18..4fda35e52 100644
--- a/src/tag/meson.build
+++ b/src/tag/meson.build
@@ -2,6 +2,7 @@ generate_parse_name = executable(
'GenParseName',
'GenParseName.cxx',
'Names.c',
+ link_language: 'cpp',
native: true,
)
--
2.29.2

20
buildroot/package/mpd/Config.in
View File

@@ -5,8 +5,8 @@ menuconfig BR2_PACKAGE_MPD
depends on BR2_TOOLCHAIN_HAS_THREADS
depends on BR2_USE_MMU # fork
depends on BR2_TOOLCHAIN_HAS_ATOMIC
depends on BR2_TOOLCHAIN_GCC_AT_LEAST_6 # C++14
depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # exception_ptr
depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7 # C++17
depends on BR2_HOST_GCC_AT_LEAST_7 # C++17
select BR2_PACKAGE_BOOST
select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE
help
@@ -84,13 +84,6 @@ config BR2_PACKAGE_MPD_LIBSOXR
comment "Decoder plugins"
config BR2_PACKAGE_MPD_AUDIOFILE
bool "audiofile"
select BR2_PACKAGE_AUDIOFILE
help
Enable audiofile input/streaming support.
Select this if you want to play back WAV files.
config BR2_PACKAGE_MPD_DSD
bool "dsd"
help
@@ -405,11 +398,10 @@ config BR2_PACKAGE_MPD_ID3TAG
endif
comment "mpd needs a toolchain w/ C++, threads, wchar, gcc >= 6"
comment "mpd needs a toolchain w/ C++, threads, wchar, gcc >= 7, host gcc >= 7"
depends on BR2_USE_MMU
depends on BR2_TOOLCHAIN_HAS_ATOMIC
depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \
!BR2_TOOLCHAIN_HAS_THREADS || !BR2_TOOLCHAIN_GCC_AT_LEAST_6
comment "mpd needs a toolchain not affected by GCC bug 64735"
depends on BR2_TOOLCHAIN_HAS_GCC_BUG_64735
!BR2_TOOLCHAIN_HAS_THREADS || \
!BR2_TOOLCHAIN_GCC_AT_LEAST_7 || \
!BR2_HOST_GCC_AT_LEAST_7

2
buildroot/package/mpd/mpd.hash
View File

@@ -1,3 +1,3 @@
# Locally calculated after checking pgp signature
sha256 20a0ad01bf327b2dbeb6ae8e1af952cb0de83d2d63fab0fa4b7183a74765c201 mpd-0.21.25.tar.xz
sha256 338012037b5e67730529187c555a54cc567a85b15a7e8ddb3a807b1971566ccf mpd-0.22.3.tar.xz
sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING

14
buildroot/package/mpd/mpd.mk
View File

@@ -4,13 +4,16 @@
#
################################################################################
MPD_VERSION_MAJOR = 0.21
MPD_VERSION = $(MPD_VERSION_MAJOR).25
MPD_VERSION_MAJOR = 0.22
MPD_VERSION = $(MPD_VERSION_MAJOR).3
MPD_SOURCE = mpd-$(MPD_VERSION).tar.xz
MPD_SITE = http://www.musicpd.org/download/mpd/$(MPD_VERSION_MAJOR)
MPD_DEPENDENCIES = host-pkgconf boost
MPD_LICENSE = GPL-2.0+
MPD_LICENSE_FILES = COPYING
MPD_CONF_OPTS = \
-Daudiofile=disabled \
-Ddocumentation=disabled
# Zeroconf support depends on libdns_sd from avahi.
ifeq ($(BR2_PACKAGE_MPD_AVAHI_SUPPORT),y)
@@ -42,13 +45,6 @@ else
MPD_CONF_OPTS += -Dao=disabled
endif
ifeq ($(BR2_PACKAGE_MPD_AUDIOFILE),y)
MPD_DEPENDENCIES += audiofile
MPD_CONF_OPTS += -Daudiofile=enabled
else
MPD_CONF_OPTS += -Daudiofile=disabled
endif
ifeq ($(BR2_PACKAGE_MPD_BZIP2),y)
MPD_DEPENDENCIES += bzip2
MPD_CONF_OPTS += -Dbzip2=enabled