From patchwork Sat Jul 25 21:45:45 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabrice Fontaine X-Patchwork-Id: 1336342 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=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=R+rOCpz9; dkim-atps=neutral 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 4BDflH1sW7z9sRK for ; Sun, 26 Jul 2020 07:46:03 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 6866F204D8; Sat, 25 Jul 2020 21:46:00 +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 qyjopUus6CtY; Sat, 25 Jul 2020 21:45:58 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 24DDC204DD; Sat, 25 Jul 2020 21:45:58 +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 6073E1BF575 for ; Sat, 25 Jul 2020 21:45:57 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 58930885AD for ; Sat, 25 Jul 2020 21:45:57 +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 KJC--+djt3C4 for ; Sat, 25 Jul 2020 21:45:56 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr1-f52.google.com (mail-wr1-f52.google.com [209.85.221.52]) by hemlock.osuosl.org (Postfix) with ESMTPS id 6EAC088448 for ; Sat, 25 Jul 2020 21:45:56 +0000 (UTC) Received: by mail-wr1-f52.google.com with SMTP id y3so11331744wrl.4 for ; Sat, 25 Jul 2020 14:45:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=P7p4/mAfXwi3ukwAMWElVlYytXtB6He23xlY6vOrSm8=; b=R+rOCpz9bmC+tp+kO1iMf4H3dK9xyYSTnBaF1wGOHhSlZDjAgvkxs4GPk93YKkDoPu q5hFCMWBiQKg7q+QvRhGsK/2woy5OoAnznFzk/maxnrAHG+VUBRfPWeZgVs09dAgUyUy KIWQDR3DaCh722XrZ3hsAaaZbI+3fnX+J2BLLmAJlWXbw/UmMl15ZgXK7wvPBUBQVlpT 9cjuQDBb1N9MclwnY8xIr8d7j6wSLQb7mBElqBjG8odjHjhquIQxOlPLenqMvBcpE0Vq vvQAWRPfLK3Gz9Urvbj3eqamu1BXr/8VbKpsZPOIPGelyL9ZWTLCr0S2lJrxWWuj81eE UBXw== 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:mime-version :content-transfer-encoding; bh=P7p4/mAfXwi3ukwAMWElVlYytXtB6He23xlY6vOrSm8=; b=Mtf/t+jpwsx8K8lGfBIu7kZtoD+FZ2LXYq7/BvyOlQqzjk2DI99/NP/ZqjwGjzLq+v 1lK6YFj5LGx39QX3xZeF+eptvFN4M2SZml7DZ17jD9xB8d9hUB66dHXffkK6Ko73Izjr hmkJUslbcdqW4SHs0nAcXHB2KFcMcWvvqxOaUNlUg0jDp4HA4wlhEVfOeUsN3KoDQLBb 414VMTthxIw2v32x48DTTyBtDQdq+IgCL9hgyn1EdcayplAWKtOywT13UYEkM5DRGoKz d00K3/guQzYD9C6NDiDoLA1lr2UNy+RXOYx+9eW+WNMVE+IadCG2Z1V9YaGJC8I3c1z+ KGaQ== X-Gm-Message-State: AOAM533/z4BYExpfAVAqKkWSIlGp0MErMcjXKp3Td0mqcaMts6xi/+hx u7jluwRnID2EFFsdyFtBc4sCyL8h X-Google-Smtp-Source: ABdhPJwG6ZokB7WajwhsB41Uu10Z7DH2ZSclwbXaLiTRAMdswQSPqYZpsoWJaWQHci7GrmBGqY0WzA== X-Received: by 2002:adf:dcc9:: with SMTP id x9mr15274851wrm.153.1595713554644; Sat, 25 Jul 2020 14:45:54 -0700 (PDT) Received: from kali.home (lfbn-ren-1-2132-33.w92-167.abo.wanadoo.fr. [92.167.211.33]) by smtp.gmail.com with ESMTPSA id m16sm6295161wrr.71.2020.07.25.14.45.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 25 Jul 2020 14:45:53 -0700 (PDT) From: Fabrice Fontaine To: buildroot@buildroot.org Date: Sat, 25 Jul 2020 23:45:45 +0200 Message-Id: <20200725214545.866978-1-fontaine.fabrice@gmail.com> X-Mailer: git-send-email 2.27.0 MIME-Version: 1.0 Subject: [Buildroot] [PATCH 1/1] package/minizip: fix build with gcc 4.8 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: Fabrice Fontaine Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Fixes: - http://autobuild.buildroot.org/results/b8baff4b86923d29163ce5cc9e391904d81fc90c Signed-off-by: Fabrice Fontaine --- .../0002-mz.h-fix-build-with-gcc-4.8.patch | 60 +++++++++++++++++++ 1 file changed, 60 insertions(+) create mode 100644 package/minizip/0002-mz.h-fix-build-with-gcc-4.8.patch diff --git a/package/minizip/0002-mz.h-fix-build-with-gcc-4.8.patch b/package/minizip/0002-mz.h-fix-build-with-gcc-4.8.patch new file mode 100644 index 0000000000..f9d28a3c75 --- /dev/null +++ b/package/minizip/0002-mz.h-fix-build-with-gcc-4.8.patch @@ -0,0 +1,60 @@ +From d38254c2cfdfa2baceef9e4fa553b74ed2e0247e Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sat, 25 Jul 2020 14:36:11 +0200 +Subject: [PATCH] mz.h: fix build with gcc 4.8 + +gcc 4.8 does not support __has_include directive as a result the build +will fail on: + +/home/naourr/work/instance-1/output-1/build/minizip-2.10.0/mz.h:162:44: error: missing binary operator before token "(" + (defined(__has_include) && __has_include()) + ^ + +Fix it by appling: +https://gcc.gnu.org/onlinedocs/gcc-10.1.0/cpp/_005f_005fhas_005finclude.html + +Fix #510 + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/nmoinvaz/minizip/pull/515] +--- + mz.h | 14 ++++++++++---- + 1 file changed, 10 insertions(+), 4 deletions(-) + +diff --git a/mz.h b/mz.h +index 4d3732b..83662e0 100644 +--- a/mz.h ++++ b/mz.h +@@ -158,9 +158,12 @@ + #include /* memset, strncpy, strlen */ + #include + +-#if defined(HAVE_STDINT_H) || \ +- (defined(__has_include) && __has_include()) ++#if defined(HAVE_STDINT_H) + # include ++#elif defined(__has_include) ++# if __has_include() ++# include ++# endif + #endif + + #ifndef __INT8_TYPE__ +@@ -188,9 +191,12 @@ typedef unsigned int uint32_t; + typedef unsigned long long uint64_t; + #endif + +-#if defined(HAVE_INTTYPES_H) || \ +- (defined(__has_include) && __has_include()) ++#if defined(HAVE_INTTYPES_H) + # include ++#elif defined(__has_include) ++# if __has_include() ++# include ++# endif + #endif + + #ifndef PRId8 +-- +2.27.0 +