From patchwork Wed Jun 17 17:28:48 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Angelo Compagnucci X-Patchwork-Id: 1311363 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.137; helo=fraxinus.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=amarulasolutions.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=amarulasolutions.com header.i=@amarulasolutions.com header.a=rsa-sha256 header.s=google header.b=XWlM7Ld4; 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 49nBrR6hNFz9sRR for ; Thu, 18 Jun 2020 03:29:11 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 79D8387604; Wed, 17 Jun 2020 17:29:10 +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 n-gYFZIMOCb3; Wed, 17 Jun 2020 17:29:10 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id F3A5D87629; Wed, 17 Jun 2020 17:29:09 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id 5D3091BF278 for ; Wed, 17 Jun 2020 17:29:04 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 5A8C520C45 for ; Wed, 17 Jun 2020 17:29:04 +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 x925fJONV3t4 for ; Wed, 17 Jun 2020 17:29:02 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm1-f67.google.com (mail-wm1-f67.google.com [209.85.128.67]) by silver.osuosl.org (Postfix) with ESMTPS id 2197F20409 for ; Wed, 17 Jun 2020 17:29:02 +0000 (UTC) Received: by mail-wm1-f67.google.com with SMTP id r9so2653570wmh.2 for ; Wed, 17 Jun 2020 10:29:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amarulasolutions.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=vxqnclL+X5gXnsZAqo+6XcDXePO+cDYr/bb98I+mTlI=; b=XWlM7Ld4N3uJD/lrakBUy4D503/ft11hKIzbWsx9/fpHGgmccU72fDWddlrab5Go5M kwcEXtJ4GNVww2qeqtBW/aay0XR0lUJDxQlN8mlObrZu1nzk4HgwukdLSwZjNtqg7j5l Aocpn1mpa+0JvAmuBSvUV42B+fyqsxM+3sSQU= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=vxqnclL+X5gXnsZAqo+6XcDXePO+cDYr/bb98I+mTlI=; b=PfpHed2TcAUTkyPp/sm1+2R/bdLbkuWImKMcK3dxy1oxK7LWBFB1bTlCVYn6i5o77K a7Ji4IXuSSGItKdQoksyU3FVNXNt7atoc+rHehlybzc/sQ1gaA1meYvzern37SbcQ1Aw pnFnkPUFggzFoNlrXwPLQkVXYbm6/2tvnZ0i0whupKWSMneFTfDnoCeIwV5Jn6hxslnG j41ItH0sAcJn+VTfsvpn27YJcBuz3G4aR0Dn56ssCyaO494xB53flLLIy4uYddvOo97k 4/kcX8ENsp2Y6Acy/TrvVFWYQdKetStw9DxO6Yapms0FRTqGMGV7gdqSB3hk9Uwf9HPf SMvg== X-Gm-Message-State: AOAM531vFfaP/uBl/nd/sXthgn+yrvzNdsCGhc3vjvIZNSW1T7WjTVNi ex9VdtBbK7hqWod+4OH1O6AzdjJjxdkztw== X-Google-Smtp-Source: ABdhPJxFmHL6yLyh9r5hKWXB3jVGRZMRLCPfExMS1YUBkp+EO6JOAajEpyFOAn6KrvW+JgnoLEm9Eg== X-Received: by 2002:a1c:4d0a:: with SMTP id o10mr9779773wmh.150.1592414940248; Wed, 17 Jun 2020 10:29:00 -0700 (PDT) Received: from localhost.localdomain (host194055151123.static.fidoka.tech. [194.55.151.123]) by smtp.gmail.com with ESMTPSA id n189sm406305wmb.43.2020.06.17.10.28.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 17 Jun 2020 10:28:59 -0700 (PDT) From: Angelo Compagnucci To: buildroot@buildroot.org Date: Wed, 17 Jun 2020 19:28:48 +0200 Message-Id: <20200617172848.2601-7-angelo@amarulasolutions.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200617172848.2601-1-angelo@amarulasolutions.com> References: <20200617172848.2601-1-angelo@amarulasolutions.com> MIME-Version: 1.0 Subject: [Buildroot] [PATCH 6/6] package/qt5: Enable cups support when BR2_PACKAGE_CUPS 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: Michael Trimarchi , Angelo Compagnucci Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Cups support should be enabled in Qt if CUPS is available system wide. Signed-off-by: Michael Trimarchi Signed-off-by: Angelo Compagnucci --- package/qt5/qt5base/qt5base.mk | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk index 42d77306cc..c6b459a0e1 100644 --- a/package/qt5/qt5base/qt5base.mk +++ b/package/qt5/qt5base/qt5base.mk @@ -23,7 +23,6 @@ QT5BASE_INSTALL_STAGING = YES # feature enabled QT5BASE_CONFIGURE_OPTS += \ -optimized-qmake \ - -no-cups \ -no-iconv \ -system-zlib \ -system-pcre \ @@ -108,6 +107,13 @@ ifeq ($(BR2_PACKAGE_HAS_UDEV),y) QT5BASE_DEPENDENCIES += udev endif +ifeq ($(BR2_PACKAGE_CUPS), y) +QT5BASE_DEPENDENCIES += cups +QT5BASE_CONFIGURE_OPTS += -cups +else +QT5BASE_CONFIGURE_OPTS += -no-cups +endif + # Qt5 SQL Plugins ifeq ($(BR2_PACKAGE_QT5BASE_SQL),y) ifeq ($(BR2_PACKAGE_QT5BASE_MYSQL),y)