From patchwork Thu Feb 9 17:47:59 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: 726277 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3vK5D133Btz9s7q for ; Fri, 10 Feb 2017 04:48:49 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="key not found in DNS" (0-bit key; unprotected) header.d=embedded.rocks header.i=@embedded.rocks header.b="CAR+7aZs"; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id D8D6A308F7; Thu, 9 Feb 2017 17:48:46 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id c7evrpP6emNT; Thu, 9 Feb 2017 17:48:43 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 4DA3631143; Thu, 9 Feb 2017 17:48:43 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id 9AEAC1BFB22 for ; Thu, 9 Feb 2017 17:48:15 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 978ED85C54 for ; Thu, 9 Feb 2017 17:48:15 +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 MLItBl1Q45Ll for ; Thu, 9 Feb 2017 17:48:13 +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 fraxinus.osuosl.org (Postfix) with ESMTPS id A058AC1D6C for ; Thu, 9 Feb 2017 17:48:13 +0000 (UTC) Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 3vK5CG5FRnz1063 for ; Thu, 9 Feb 2017 18:48:10 +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= 1486662489; x=1487267290; bh=rW6/TuyaClNt4UOy6ho0fLAN6Ws8WrneG8u 4xDKvoI4=; b=CAR+7aZs/4hzqECswnmu2NOXnfVbMRTcbzBvFO/VCiSkIcIu0NF p/UeGssOaIggCrRRH6q3YInUDkKvGU6eXtfMRZlyFm+QiAa/buN24DCjVdjZXUgb Idfy5O2ws7bGYd8Se/tWCI2iQiWFiWiQBF1odz526Y9b5JKeMjcdyiREqGf+4lwi WI3EL/FaYajqicvk7bEWyCC8KCwsvIIABuyBpRGCEiFmLcTzYvdLRjQr0DRm2RVj KbzAaZzakbqI5rqcOnirmw4xIP8BCtk7GBSFwZZLdEmlKZ7Tb3ff4f/NqiO6tGKg RBU1vCIfJvl+1FiJhYmIlv09bm/WqTOzwrA== 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 uU4ygJtXVsBp; Thu, 9 Feb 2017 18:48:09 +0100 (CET) Received: from nzxt.fritz.box (x4d0cc25b.dyn.telefonica.de [77.12.194.91]) (Authenticated sender: joerg.krause@embedded.rocks) by mail.embedded.rocks (Postfix) with ESMTPSA; Thu, 9 Feb 2017 18:48:09 +0100 (CET) From: =?UTF-8?q?J=C3=B6rg=20Krause?= To: buildroot@buildroot.org Date: Thu, 9 Feb 2017 18:47:59 +0100 Message-Id: <20170209174759.15819-7-joerg.krause@embedded.rocks> X-Mailer: git-send-email 2.11.1 In-Reply-To: <20170209174759.15819-1-joerg.krause@embedded.rocks> References: <20170209174759.15819-1-joerg.krause@embedded.rocks> MIME-Version: 1.0 Subject: [Buildroot] [PATCH 6/6] package/mpd: add choice between version 0.19 and 0.20 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 being affected by GCC PR libstdc++/64735 means no mpd package available in Buildroot for the architectures NIOSII, ARMv4, ARMv5 and SPARCv8 until GCC 7 is released. As the next Buildroot release is in 2017.02 which is before GCC 7 is expected to be released add a choise between version 0.19 and 0.20, so that there is still an mpd package available for the affected architectures. Note, that we bumped the version from 0.19 to 0.20 within the current Buildroot release cycle. Note, that for the version 0.19 MPD requires libglib2. Signed-off-by: Jörg Krause --- package/mpd/Config.in | 31 +++++++++++++++++++++++++------ package/mpd/mpd.mk | 9 +++++++++ 2 files changed, 34 insertions(+), 6 deletions(-) diff --git a/package/mpd/Config.in b/package/mpd/Config.in index 8a28b4f1a..2f993737f 100644 --- a/package/mpd/Config.in +++ b/package/mpd/Config.in @@ -4,8 +4,6 @@ menuconfig BR2_PACKAGE_MPD depends on BR2_USE_WCHAR # flac depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_USE_MMU # fork - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # C++14 - depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 depends on BR2_TOOLCHAIN_HAS_ATOMIC select BR2_PACKAGE_BOOST select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE @@ -20,6 +18,30 @@ menuconfig BR2_PACKAGE_MPD if BR2_PACKAGE_MPD +choice + prompt "MPD version" + +config BR2_MPD_VERSION_0_20 + bool "0.20" + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # C++14 + depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 + +comment "version 0.20 needs toolchain w/ gcc >= 4.9" + depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 + +comment "version 0.20 needs a toolchain not affected by GCC bug 64735" + depends on BR2_TOOLCHAIN_HAS_GCC_BUG_64735 + +config BR2_MPD_VERSION_0_19 + bool "0.19" + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_6 + select BR2_PACKAGE_LIBGLIB2 + +comment "version 0.19 needs toolchain w/ gcc >= 4.6" + depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_4_6 + +endchoice + comment "Archive plugins" config BR2_PACKAGE_MPD_BZIP2 @@ -319,7 +341,4 @@ comment "mpd needs a toolchain w/ C++, threads, wchar, gcc >= 4.9" 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_4_9 - -comment "mpd needs a toolchain not affected by GCC bug 64735" - depends on BR2_TOOLCHAIN_HAS_GCC_BUG_64735 + !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/mpd/mpd.mk b/package/mpd/mpd.mk index 0efc8685f..ad5d2a678 100644 --- a/package/mpd/mpd.mk +++ b/package/mpd/mpd.mk @@ -4,8 +4,13 @@ # ################################################################################ +ifeq ($(BR2_MPD_VERSION_0_20),y) MPD_VERSION_MAJOR = 0.20 MPD_VERSION = $(MPD_VERSION_MAJOR).4 +else +MPD_VERSION_MAJOR = 0.19 +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 @@ -13,6 +18,10 @@ MPD_LICENSE = GPLv2+ MPD_LICENSE_FILES = COPYING MPD_AUTORECONF = YES +ifeq ($(BR2_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.