From patchwork Tue Mar 23 16:30:51 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?J=C3=B6rg_Krause?= X-Patchwork-Id: 1457340 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.138; helo=smtp1.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="key not found in DNS" header.d=embedded.rocks header.i=@embedded.rocks header.a=rsa-sha256 header.s=default header.b=X15TKBPP; dkim-atps=neutral Received: from smtp1.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4F4cLx4s8Bz9sRf for ; Wed, 24 Mar 2021 03:31:21 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id 3B32083F78; Tue, 23 Mar 2021 16:31:20 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id RCiDSU3elYGy; Tue, 23 Mar 2021 16:31:19 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp1.osuosl.org (Postfix) with ESMTP id 7ED7183F69; Tue, 23 Mar 2021 16:31:18 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp1.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id AC3EE1BF228 for ; Tue, 23 Mar 2021 16:31:04 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id A947483EBE for ; Tue, 23 Mar 2021 16:31:04 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id XuAdwnGnmM7I for ; Tue, 23 Mar 2021 16:31:01 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.8.0 Received: from mout02.posteo.de (mout02.posteo.de [185.67.36.142]) by smtp1.osuosl.org (Postfix) with ESMTPS id C737583F69 for ; Tue, 23 Mar 2021 16:31:00 +0000 (UTC) Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id 84A7D2400FD for ; Tue, 23 Mar 2021 17:30:58 +0100 (CET) Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4F4cLT6RWcz6tmY; Tue, 23 Mar 2021 17:30:57 +0100 (CET) Authentication-Results: mail.embedded.rocks (amavisd-new); dkim=pass reason="pass (just generated, assumed good)" header.d=embedded.rocks DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=embedded.rocks; h=content-transfer-encoding:content-type:content-type :mime-version:references:in-reply-to:x-mailer:message-id:date :date:subject:subject:from:from:received:received; s=default; t= 1616517056; x=1617121857; bh=5+yPMDKEncqz1pGhiJq1a/k3lbPjrCokP9T KdtKzil8=; b=X15TKBPPMoVXkVAlpGNTYq9ETCrxAbEJnUdyQu0ppJGBjBgdr5r m2USl8PaTHwpblbiU9FXoKEiy4cJrN2EZIg7N4FnZINw60VdxBaV66oxoOLtZxY1 qHVgYKKXd0EB3WPlznVwqnZlai+t5BGHoF7Ne8L1eM9lcKs1sRXcBAmiFjRN32ez R2Ayam8ILpXeoYne5x6ZDBJhMY4dIfPfQsHqiRFZ6XACNce7DeVH42mvgSM7jtAa PPDTgFZB/koaDvwsKBg3eW6coP7yYfyC9xNHceYSvmQ1FX/FQ3B7k/OOfPAEW7Oy hvQ8XZzB+GX7jC2k5rALgPVs1d1ZUJHwoBw== Received: from mail.embedded.rocks ([127.0.0.1]) by localhost (mail.embedded.rocks [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id y_S1TOhVHKqE; Tue, 23 Mar 2021 17:30:56 +0100 (CET) Received: from nzxt.fritz.box (port-92-193-242-103.dynamic.as20676.net [92.193.242.103]) (Authenticated sender: joerg.krause@embedded.rocks) by mail.embedded.rocks (Postfix) with ESMTPSA; Tue, 23 Mar 2021 17:30:56 +0100 (CET) From: =?utf-8?q?J=C3=B6rg_Krause?= To: buildroot@buildroot.org Date: Tue, 23 Mar 2021 17:30:51 +0100 Message-Id: <20210323163051.1284416-2-joerg.krause@embedded.rocks> X-Mailer: git-send-email 2.31.0 In-Reply-To: <20210323163051.1284416-1-joerg.krause@embedded.rocks> References: <20210323163051.1284416-1-joerg.krause@embedded.rocks> MIME-Version: 1.0 Subject: [Buildroot] [PATCH 2/2] Revert "package/mpd: fix build of GenParseName" X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: "Yann E . MORIN" , Fabrice Fontaine Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" This reverts commit 9783c04aaf5e4fc94099772f1dc699a974ee6538. This commit is actually a workaround to get Meson passing `-libstdc++` to the C linker. The correct fix is to pass the host C++ compiler to Meson instead of the host C compiler using the `CXX_FOR_BUILD` variable. Signed-off-by: Jörg Krause --- ...meson.build-fix-GenParseName-linking.patch | 38 ------------------- 1 file changed, 38 deletions(-) delete mode 100644 package/mpd/0002-src-tag-meson.build-fix-GenParseName-linking.patch diff --git a/package/mpd/0002-src-tag-meson.build-fix-GenParseName-linking.patch b/package/mpd/0002-src-tag-meson.build-fix-GenParseName-linking.patch deleted file mode 100644 index e120b3e4ea..0000000000 --- a/package/mpd/0002-src-tag-meson.build-fix-GenParseName-linking.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 4c37d0b316a15213381bd7e07c5dee7526471fc8 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -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::pair > const, TagType>, std::_Select1st > const, TagType> >, std::less > >, std::allocator > const, TagType> > >::_M_erase(std::_Rb_tree_node > 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 -[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 -