From patchwork Wed Sep 13 20:54:36 2017 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: 813618 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.137; helo=fraxinus.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3xsv7B2xYKz9s7B for ; Thu, 14 Sep 2017 06:55:01 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 3C02584E28; Wed, 13 Sep 2017 20:54:56 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id pIyQOx-RYpmk; Wed, 13 Sep 2017 20:54:53 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 3B46B8065E; Wed, 13 Sep 2017 20:54:53 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id EFF011CEB3B for ; Wed, 13 Sep 2017 20:54:51 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id DF6FF8A010 for ; Wed, 13 Sep 2017 20:54:51 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id pVdJkq3z2Az3 for ; Wed, 13 Sep 2017 20:54:50 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from mout02.posteo.de (mout02.posteo.de [185.67.36.142]) by hemlock.osuosl.org (Postfix) with ESMTPS id 404C889FA1 for ; Wed, 13 Sep 2017 20:54:50 +0000 (UTC) Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 3xsv6t511qz10Hl for ; Wed, 13 Sep 2017 22:54:46 +0200 (CEST) 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 HhgCEnY5p4Wk; Wed, 13 Sep 2017 22:54:43 +0200 (CEST) Received: from nzxt.fritz.box (port-92-195-68-97.dynamic.qsc.de [92.195.68.97]) (Authenticated sender: joerg.krause@embedded.rocks) by mail.embedded.rocks (Postfix) with ESMTPSA; Wed, 13 Sep 2017 22:54:43 +0200 (CEST) From: =?utf-8?q?J=C3=B6rg_Krause?= To: buildroot@buildroot.org Date: Wed, 13 Sep 2017 22:54:36 +0200 Message-Id: <20170913205436.10052-1-joerg.krause@embedded.rocks> X-Mailer: git-send-email 2.14.1 MIME-Version: 1.0 Subject: [Buildroot] [PATCH 1/1] mpd: remove version 0.19 X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" MPD version 0.20 is affected by GCC bug 64735 and failes to build for some archictuctures (NIOSII, ARMv4, ARMv5 and SPARCv8) with a GCC toolchain less then version 7. We added a version choice between 0.19 and 0.20 in Buildroot version 2017.02 as GCC 7 was not yet available at that time. This way, mpd could still be build for those architectures. As GCC 7 is now available in Buildroot remove the version choice for 0.19. Signed-off-by: Jörg Krause --- package/mpd/Config.in | 24 ++++-------------------- package/mpd/mpd.hash | 1 - package/mpd/mpd.mk | 10 +--------- 3 files changed, 5 insertions(+), 30 deletions(-) diff --git a/package/mpd/Config.in b/package/mpd/Config.in index 0c73548fbb..ffeef9b02b 100644 --- a/package/mpd/Config.in +++ b/package/mpd/Config.in @@ -5,9 +5,8 @@ menuconfig BR2_PACKAGE_MPD depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_USE_MMU # fork depends on BR2_TOOLCHAIN_HAS_ATOMIC - # 0.19.x could be built with GCC 4.6, but for simplicity we require - # the same toolchain dependencies for all versions. depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # C++14 + depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # exception_ptr # ARC toolchain issue depends on !BR2_TOOLCHAIN_EXTERNAL_SYNOPSYS_ARC select BR2_PACKAGE_BOOST @@ -23,24 +22,6 @@ menuconfig BR2_PACKAGE_MPD if BR2_PACKAGE_MPD -# Hidden config symbols to select the branch 0.20 by default and fallback -# to branch 0.19 for toolchains affected by GCC bug PR 64735. This way we -# keep support for mpd on some architectures, like ARMv5, until GCC 7 is -# released, which will fix this issue. -config BR2_PACKAGE_MPD_VERSION_STRING - string - default "0.20" if !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 - default "0.19" - -config BR2_PACKAGE_MPD_VERSION_0_20 - bool - default y if BR2_PACKAGE_MPD_VERSION_STRING = "0.20" - -config BR2_PACKAGE_MPD_VERSION_0_19 - bool - default y if BR2_PACKAGE_MPD_VERSION_STRING = "0.19" - select BR2_PACKAGE_LIBGLIB2 - comment "Archive plugins" config BR2_PACKAGE_MPD_BZIP2 @@ -342,3 +323,6 @@ comment "mpd needs a toolchain w/ C++, threads, wchar, gcc >= 4.9" depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \ !BR2_TOOLCHAIN_HAS_THREADS || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 depends on !BR2_TOOLCHAIN_EXTERNAL_SYNOPSYS_ARC + +comment "mpd needs a toolchain not affected by GCC bug 64735" + depends on BR2_TOOLCHAIN_HAS_GCC_BUG_64735 diff --git a/package/mpd/mpd.hash b/package/mpd/mpd.hash index 873286cda9..9898c38c6e 100644 --- a/package/mpd/mpd.hash +++ b/package/mpd/mpd.hash @@ -1,3 +1,2 @@ # Locally calculated after checking pgp signature sha256 52fbc1125cdba41ba999add2820d45f3ce7cf493006bb04d8f0b2937204d3121 mpd-0.20.10.tar.xz -sha256 8305b8bc026f4b6bde28b8dd09bfdddbe5590acf36358eed4d083a396e301730 mpd-0.19.21.tar.xz diff --git a/package/mpd/mpd.mk b/package/mpd/mpd.mk index 692d402d35..ff22593981 100644 --- a/package/mpd/mpd.mk +++ b/package/mpd/mpd.mk @@ -4,12 +4,8 @@ # ################################################################################ -MPD_VERSION_MAJOR = $(call qstrip,$(BR2_PACKAGE_MPD_VERSION_STRING)) -ifeq ($(BR2_PACKAGE_MPD_VERSION_0_20),y) +MPD_VERSION_MAJOR = 0.20 MPD_VERSION = $(MPD_VERSION_MAJOR).10 -else -MPD_VERSION = $(MPD_VERSION_MAJOR).21 -endif MPD_SOURCE = mpd-$(MPD_VERSION).tar.xz MPD_SITE = http://www.musicpd.org/download/mpd/$(MPD_VERSION_MAJOR) MPD_DEPENDENCIES = host-pkgconf boost @@ -17,10 +13,6 @@ MPD_LICENSE = GPL-2.0+ MPD_LICENSE_FILES = COPYING MPD_AUTORECONF = YES -ifeq ($(BR2_PACKAGE_MPD_VERSION_0_19),y) -MPD_DEPENDENCIES += libglib2 -endif - # Some options need an explicit --disable or --enable # Zeroconf support depends on libdns_sd from avahi.