From patchwork Wed Feb 6 14:10:45 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Korsgaard X-Patchwork-Id: 1037549 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@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=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=korsgaard.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="dlhnaKG0"; dkim-atps=neutral Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 43vjzS5kj4z9sDL for ; Thu, 7 Feb 2019 01:11:16 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 29DC586A97; Wed, 6 Feb 2019 14:11: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 yguB0ZARD3Wp; Wed, 6 Feb 2019 14:11:06 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 0825886A54; Wed, 6 Feb 2019 14:11:06 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 8E68A1BF398 for ; Wed, 6 Feb 2019 14:11:04 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 8B480875CA for ; Wed, 6 Feb 2019 14:11:04 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id KZbsJ1Rgu-KT for ; Wed, 6 Feb 2019 14:11:03 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm1-f43.google.com (mail-wm1-f43.google.com [209.85.128.43]) by whitealder.osuosl.org (Postfix) with ESMTPS id 8956B877BF for ; Wed, 6 Feb 2019 14:11:03 +0000 (UTC) Received: by mail-wm1-f43.google.com with SMTP id g67so2872170wmd.2 for ; Wed, 06 Feb 2019 06:11:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=rUmfvJz5wFSqFcajnMHtPziqYnkj8NC0KvmfhAaEwZA=; b=dlhnaKG0eq6aX1ai2UlP0W0nxkJVF5QDv2a58bH74fMZyWJEpUiNLe4TYJIbrrA2M2 KrefsOV/6aWRJJA2+6w/TmxwEBJB5+5YQjghOn01nujiT6WEf2mHLfkeefCippLAxDbv BrWAROGUDo5FAMCpYkJcFxIbbLhDoKQ/plWsKzz4nHtwRauyX3rLl7STLaB520kns6jf W1Ku1kTE/xWkRww48KAE3FqpFlhsQeIqlsTmPfLmKkbdD0THzv6fCBquRTn+kudYT3Fw nc3M6B2KzNnI6jVVVNetcsA7SvOL7zt8bLU+cKNnSzCA36Sgh1zP9lCNejX0f6AEoDqx Mtlw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=rUmfvJz5wFSqFcajnMHtPziqYnkj8NC0KvmfhAaEwZA=; b=n/PcdzHIO6CuiFY+sSVFJ8rAPkpeGzEOYd6RfQu4OWU13bksZPpwz6BX3renv04syj lSEw/lTqIFvj2Rm27iMWXjFaIzMIWbf3kGGST0pBVidTh9jdYvxBGaj8r47cV9ix0sL4 m5AaROD6bGnyWljTuuJfMRKUVc5iVN66SACoE2abrME6nAaQsCauFN9nNMPp/otPU1jW ceJ8k3L0/fwMsTrSyublaWxv1iOudSrDW3AYAuGz72ded4XtiXr1sxN5KrSsB1M89ALi kHtF/b6wyOH+ubgJXNAPz0GWxzsFsoadfh5BpHqQYWDhe2+Hcsd0E44SD8/U1+jDHD3j cVRQ== X-Gm-Message-State: AHQUAuY4Dpgkr7XA7ZHow3eA+M1MbrLpaYjp5xyPZaAV/Co37IK7TZxz 6JNLuRv0xEjUmoo0Ric/hl7WLcZ0 X-Google-Smtp-Source: AHgI3IZPeaaNtDlfjJ2dhSEDV4oSJHRVMgaHx5EbIGK5x8IYX8rB57xLI/Cbu+NF/aCrXzGepippFg== X-Received: by 2002:a1c:494:: with SMTP id 142mr3344400wme.111.1549462261244; Wed, 06 Feb 2019 06:11:01 -0800 (PST) Received: from dell.be.48ers.dk ([2620:0:1055:fd00:ba8a:60ff:feb3:d607]) by smtp.gmail.com with ESMTPSA id l125sm4278128wml.18.2019.02.06.06.10.59 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 06 Feb 2019 06:11:00 -0800 (PST) Received: from peko by dell.be.48ers.dk with local (Exim 4.89) (envelope-from ) id 1grNul-0006IW-Q7; Wed, 06 Feb 2019 15:10:59 +0100 From: Peter Korsgaard To: buildroot@buildroot.org Date: Wed, 6 Feb 2019 15:10:45 +0100 Message-Id: <20190206141058.24155-3-peter@korsgaard.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20190206141058.24155-1-peter@korsgaard.com> References: <20190206141058.24155-1-peter@korsgaard.com> Subject: [Buildroot] [PATCH 03/16] package/python-sip: remove qt4 support 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: Peter Korsgaard , Gwenhael Goavec-Merou , Asaf Kahlon MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" python-pyqt has been removed and qt4 support is about to be dropped, so remove the support from python-sip as well. Adjust the dependencies to match the dependencies of qt5, and ensure that qt5base is selected. Signed-off-by: Peter Korsgaard --- package/python-sip/Config.in | 14 ++++++++------ package/python-sip/python-sip.mk | 4 ---- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/package/python-sip/Config.in b/package/python-sip/Config.in index 1f8961d0df..4ce4f89b2a 100644 --- a/package/python-sip/Config.in +++ b/package/python-sip/Config.in @@ -2,17 +2,19 @@ comment "python-sip needs a toolchain w/ C++, threads" depends on BR2_USE_MMU depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS -comment "python-sip needs qt or qt5" +comment "python-sip needs qt5" depends on BR2_USE_MMU depends on BR2_INSTALL_LIBSTDCPP && BR2_TOOLCHAIN_HAS_THREADS - depends on !BR2_PACKAGE_QT && !BR2_PACKAGE_QT5 + depends on !BR2_PACKAGE_QT5 config BR2_PACKAGE_PYTHON_SIP bool "python-sip" - depends on BR2_INSTALL_LIBSTDCPP # qt - depends on BR2_TOOLCHAIN_HAS_THREADS # qt - depends on BR2_USE_MMU # qt - depends on BR2_PACKAGE_QT || BR2_PACKAGE_QT5 + depends on BR2_INSTALL_LIBSTDCPP # qt5 + depends on BR2_USE_WCHAR # qt5 + depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # qt5 + depends on !BR2_STATIC_LIBS # qt5 + depends on BR2_PACKAGE_QT5 + select BR2_PACKAGE_QT5BASE help SIP is a tool that makes it very easy to create Python bindings for C and C++ libraries. It was originally diff --git a/package/python-sip/python-sip.mk b/package/python-sip/python-sip.mk index 76d7d04187..69019f5f19 100644 --- a/package/python-sip/python-sip.mk +++ b/package/python-sip/python-sip.mk @@ -10,11 +10,7 @@ PYTHON_SIP_SITE = http://downloads.sourceforge.net/project/pyqt/sip/sip-$(PYTHON PYTHON_SIP_LICENSE = SIP license or GPL-2.0 or GPL-3.0 PYTHON_SIP_LICENSE_FILES = LICENSE LICENSE-GPL2 LICENSE-GPL3 -ifeq ($(BR2_PACKAGE_QT5),y) PYTHON_SIP_DEPENDENCIES = qt5base -else -PYTHON_SIP_DEPENDENCIES = qt -endif ifeq ($(BR2_PACKAGE_PYTHON),y) PYTHON_SIP_DEPENDENCIES += python