From patchwork Sat May 9 15:24:26 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dirk Neukirchen X-Patchwork-Id: 470329 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from arrakis.dune.hu (arrakis.dune.hu [78.24.191.176]) (using TLSv1.1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3B9341402D2 for ; Sun, 10 May 2015 01:26:26 +1000 (AEST) Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP id 5AEB22845AF; Sat, 9 May 2015 17:25:04 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on arrakis.dune.hu X-Spam-Level: X-Spam-Status: No, score=-1.5 required=5.0 tests=BAYES_00,FREEMAIL_FROM, T_RP_MATCHES_RCVD autolearn=unavailable version=3.3.2 Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP id 23AB428428E for ; Sat, 9 May 2015 17:24:41 +0200 (CEST) X-policyd-weight: using cached result; rate: -8.5 Received: from mout.web.de (mout.web.de [212.227.17.11]) by arrakis.dune.hu (Postfix) with ESMTPS for ; Sat, 9 May 2015 17:24:36 +0200 (CEST) Received: from [192.168.3.157] ([91.64.206.248]) by smtp.web.de (mrweb101) with ESMTPSA (Nemesis) id 0MMEmv-1YsVGq09nR-007ydy for ; Sat, 09 May 2015 17:25:49 +0200 Message-ID: <554E26AA.1040306@web.de> Date: Sat, 09 May 2015 17:24:26 +0200 From: Dirk Neukirchen User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.6.0 MIME-Version: 1.0 To: OpenWrt Development List X-Provags-ID: V03:K0:chjmp3GfejotHDnImLYYI3LVceH76mGifLmF/S625jugq8CZkzb EtdG6p/CCKjU8VlHwtFDRdsbP4P0pOQKGBpm0DD9hXplEMlVgGQT8FzfzwabAXsfxko4w2A Vgod4TdDfT5AnNacTTkS1Ybm8UPzNlgZrMs4Ecoy0z2mGCC2whHBxzt35H2UbaZTQsRwi4u 7s72ckBtdQcTwhtABHPRA== X-UI-Out-Filterresults: notjunk:1; Subject: [OpenWrt-Devel] [PATCH] fuse: fix build on arm64 X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: OpenWrt Development List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: openwrt-devel-bounces@lists.openwrt.org Sender: "openwrt-devel" error: ../include/fuse_kernel.h:93:15: error: conflicting types for 'int64_t' ../include/fuse_kernel.h:92:15: error: conflicting types for 'uint64_t' reported by buildbot fix by adopting upstream patch: http://git.baserock.org/cgi-bin/cgit.cgi/delta/fuse.git/commit/include/fuse_kernel.h?id=914871b20a901e3e1e981c92bc42b1c93b7ab81b Signed-off-by: Dirk Neukirchen --- ...ckport_arm64_fuse_kernel_h_clean_includes.patch | 34 ++++++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 package/utils/fuse/patches/200-backport_arm64_fuse_kernel_h_clean_includes.patch diff --git a/package/utils/fuse/patches/200-backport_arm64_fuse_kernel_h_clean_includes.patch b/package/utils/fuse/patches/200-backport_arm64_fuse_kernel_h_clean_includes.patch new file mode 100644 index 0000000..8436224 --- /dev/null +++ b/package/utils/fuse/patches/200-backport_arm64_fuse_kernel_h_clean_includes.patch @@ -0,0 +1,34 @@ +From 914871b20a901e3e1e981c92bc42b1c93b7ab81b Mon Sep 17 00:00:00 2001 +From: Riku Voipio +Date: Thu, 07 Feb 2013 11:04:21 +0000 +Subject: fuse_kernel.h: clean includes + +Use for linux and define types used for other operating systems +using types. +--- +(limited to 'include/fuse_kernel.h') + +diff --git a/include/fuse_kernel.h b/include/fuse_kernel.h +index 501450c..df8e9b9 100644 +--- a/include/fuse_kernel.h ++++ b/include/fuse_kernel.h +@@ -91,12 +91,16 @@ + #ifndef _LINUX_FUSE_H + #define _LINUX_FUSE_H + +-#include ++#ifdef __linux__ ++#include ++#else ++#include + #define __u64 uint64_t + #define __s64 int64_t + #define __u32 uint32_t + #define __s32 int32_t + #define __u16 uint16_t ++#endif + + /* + * Version negotiation: +-- +cgit v0.9.0.3-67-gacbf