From patchwork Tue Apr 7 15:15:16 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartosz Bilas X-Patchwork-Id: 1267460 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.136; helo=silver.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=grinn-global.com Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 48xWF13yl6z9sSj for ; Wed, 8 Apr 2020 01:15:31 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id B7D18204B5; Tue, 7 Apr 2020 15:15:29 +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 f0kA41lUk0Tr; Tue, 7 Apr 2020 15:15:26 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 3CC8620035; Tue, 7 Apr 2020 15:15:26 +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 9CBB91BF2C7 for ; Tue, 7 Apr 2020 15:15:24 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 97FD686E71 for ; Tue, 7 Apr 2020 15:15:24 +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 5j+KRsKOIT5M for ; Tue, 7 Apr 2020 15:15:23 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from smtp.megiteam.pl (smtp.megiteam.pl [31.186.83.105]) by whitealder.osuosl.org (Postfix) with ESMTPS id 2342E86E68 for ; Tue, 7 Apr 2020 15:15:22 +0000 (UTC) Received: from host-81-161-192-57.oxylion.net.pl ([81.161.192.57] helo=bartekk-pc.lan) by smtp.megiteam.pl with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86.2_XX) (envelope-from ) id 1jLpwd-0001NV-Jt; Tue, 07 Apr 2020 17:15:19 +0200 From: Bartosz Bilas To: buildroot@buildroot.org Date: Tue, 7 Apr 2020 17:15:16 +0200 Message-Id: <20200407151516.120770-1-b.bilas@grinn-global.com> X-Mailer: git-send-email 2.26.0 MIME-Version: 1.0 Subject: [Buildroot] [PATCH] package/cegui: disable minizip 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: Bartosz Bilas Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Disable support for minizip since cegui is not compatible with the existing buildroot's version due to lack of necessary header. It will be restored when upstream will switch to the new version. Fixes: - http://autobuild.buildroot.net/results/65fa719e8b2466409a12eb103a8938e1488efc0c - http://autobuild.buildroot.net/results/ef37a0cc16daacb7206d736c86b511c7d90eefe0 and many more. Signed-off-by: Bartosz Bilas --- package/cegui/cegui.mk | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/package/cegui/cegui.mk b/package/cegui/cegui.mk index 134b222362..434201b1f8 100644 --- a/package/cegui/cegui.mk +++ b/package/cegui/cegui.mk @@ -9,7 +9,8 @@ CEGUI_SITE = $(call github,cegui,cegui,v$(CEGUI_VERSION)) CEGUI_LICENSE = MIT CEGUI_LICENSE_FILES = COPYING CEGUI_INSTALL_STAGING = YES -CEGUI_CONF_OPTS += -DCEGUI_BUILD_XMLPARSER_XERCES=OFF +CEGUI_CONF_OPTS += -DCEGUI_BUILD_XMLPARSER_XERCES=OFF \ + -DCEGUI_HAS_MINIZIP_RESOURCE_PROVIDER=OFF CEGUI_DEPENDENCIES = glm \ $(if $(BR2_PACKAGE_LIBGLFW),libglfw) \ $(if $(BR2_PACKAGE_HAS_LIBGL),libgl) \ @@ -66,13 +67,6 @@ else CEGUI_CONF_OPTS += -DCEGUI_HAS_FREETYPE=OFF endif -ifeq ($(BR2_PACKAGE_MINIZIP),y) -CEGUI_DEPENDENCIES += minizip -CEGUI_CONF_OPTS += -DCEGUI_HAS_MINIZIP_RESOURCE_PROVIDER=ON -else -CEGUI_CONF_OPTS += -DCEGUI_HAS_MINIZIP_RESOURCE_PROVIDER=OFF -endif - ifeq ($(BR2_PACKAGE_LIBXML2),y) CEGUI_DEPENDENCIES += libxml2 CEGUI_CONF_OPTS += -DCEGUI_BUILD_XMLPARSER_LIBXML2=ON