package/mpd: disable documentation
PATCH 1/2 package/mpd: disable documentation
Disable documentation which is enabled by default since version 0.22 and
https://github.com/MusicPlayerDaemon/MPD/commit/2e73e605f78d2e6488e34465a8bfa9e4989a057f
--- package/mpd/mpd.mk | 1 + 1 file changed, 1 insertion(+)
package/mpd/mpd.mk +1 -0
@@ -11,6 +11,7 @@ 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 = -Ddocumentation=disabled ifeq ($(BR2_USE_MMU),y) MPD_CONF_OPTS += \
Signature · 1 line
2.29.2
PATCH 2/2 package/mpd: fix build of GenParseName
Fix build of GenParseName which has been added in version 0.22:
https://github.com/MusicPlayerDaemon/MPD/commit/fa45a8adfa44f6bc815ae7428770112c15c76d73
Fixes:
- http://autobuild.buildroot.org/results/871e1362c44e5b68a149e6a5dd3caf99ea0d904a
--- ...-src-tag-meson.build-link-with-lstdc.patch | 37 +++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 package/mpd/0002-src-tag-meson.build-link-with-lstdc.patch
package/mpd/0002-src-tag-meson.build-link-with-lstdc.patch new file +37 -0
@@ -0,0 +1,37 @@ +From cbe479fa76809af16efff7b699952403f306e3c8 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine <[email protected]> +Date: Sat, 30 Jan 2021 12:12:46 +0100 +Subject: [PATCH] src/tag/meson.build: link with -lstdc++ + +Link with -lstdc++ when building GenParseName to avoid the following +build failure: + +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 <[email protected]> +--- + src/tag/meson.build | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/tag/meson.build b/src/tag/meson.build +index 064eada18..a98c8983c 100644 +--- a/src/tag/meson.build ++++ b/src/tag/meson.build +@@ -3,6 +3,7 @@ generate_parse_name = executable( + 'GenParseName.cxx', + 'Names.c', + native: true, ++ link_args: '-lstdc++' + ) + + parse_name_cxx = custom_target( +-- +2.29.2 +
Signature · 1 line
2.29.2
PATCH 2/2 package/mpd: fix build of GenParseName
Quoted 18 lines · On Sat, 30 Jan 2021 12:26:47 +0100 Fabrice Fontaine…
Fix build of GenParseName which has been added in version 0.22:
https://github.com/MusicPlayerDaemon/MPD/commit/fa45a8adfa44f6bc815ae7428770112c15c76d73Fixes:
- http://autobuild.buildroot.org/results/871e1362c44e5b68a149e6a5dd3caf99ea0d904aSigned-off-by Fabrice Fontaine <[email protected]>--- ...-src-tag-meson.build-link-with-lstdc.patch | 37 +++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 package/mpd/0002-src-tag-meson.build-link-with-lstdc.patchpackage/mpd/0002-src-tag-meson.build-link-with-lstdc.patch new file +0
-0
package/mpd/0002-src-tag-meson.build-link-with-lstdc.patch line 10
Quoted 10 lines
package/mpd/0002-src-tag-meson.build-link-with-lstdc.patch new file +10
-0@@ -0,0 +1,37 @@ +From cbe479fa76809af16efff7b699952403f306e3c8 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine <[email protected]> +Date: Sat, 30 Jan 2021 12:12:46 +0100 +Subject: [PATCH] src/tag/meson.build: link with -lstdc++ + +Link with -lstdc++ when building GenParseName to avoid the following +build failure: + +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
So, one of the object files was compiled with a C++ compiler, and it uses "gcc" at link time. This is the issue, and it should instead use g++ at link time.
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com
Thomas Petazzoni
AppliedPATCH 1/2 package/mpd: disable documentation
In reply to Fabrice FontaineQuoted 7 lines · On Sat, 30 Jan 2021 12:26:46 +0100 Fabrice Fontaine…
Disable documentation which is enabled by default since version 0.22 and
https://github.com/MusicPlayerDaemon/MPD/commit/2e73e605f78d2e6488e34465a8bfa9e4989a057fSigned-off-by Fabrice Fontaine <[email protected]>--- package/mpd/mpd.mk | 1 + 1 file changed, 1 insertion(+)
Applied to master, thanks.
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com