From patchwork Sun Oct 21 15:39:10 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yann Diorcet X-Patchwork-Id: 193040 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from hugin.dotsrc.org (hugin.dotsrc.org [130.225.254.102]) by ozlabs.org (Postfix) with ESMTP id A3F562C008D for ; Mon, 22 Oct 2012 02:39:19 +1100 (EST) Received: from hugin.dotsrc.org (localhost [127.0.0.1]) by hugin.dotsrc.org (Postfix) with ESMTP id 6BAAB3FBAE for ; Sun, 21 Oct 2012 17:39:18 +0200 (CEST) X-Original-To: dev@oe-lite.org Delivered-To: dev@oe-lite.org Received: from mail-wg0-f47.google.com (mail-wg0-f47.google.com [74.125.82.47]) by hugin.dotsrc.org (Postfix) with ESMTPS id 6E0123FBAE for ; Sun, 21 Oct 2012 17:39:16 +0200 (CEST) Received: by mail-wg0-f47.google.com with SMTP id ge7so1153477wgb.16 for ; Sun, 21 Oct 2012 08:39:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=8ean0tyQoa3yXmQMI6U7c/hCxdR3st83yB1Kdkfu1TU=; b=wn83v1KUDPMkTfDeCQmQ9B6+bYlMV0j34m/kft8R7cKKxMwhOfpFgcj1beju1pq2cN 2/qnHo6Xj8jodVmFY/7r3A//SjBuPeGL6RuFXWaRwMHcS/8m/e4qJBDm/u/Bj2Mmn1l7 bO6H7K7H8Wo/cmdxHP0qjn/zT3pvoELxX4aNsCWbNUI83WKfjTwzWJ23qkJcFbtXF0HK yza+ia/fyGwzASVHyd6dwF4Rj7Hle267hUy7jy+po8hW9WcoSpW6479l0LT6+8WjBnqO /JedRgYHkZNOg733rdnuaVlLAVFoTEkj/0AFAHPKG2dFWl622Q3M0gHG3gZa4ePINpCT KWGA== Received: by 10.180.97.35 with SMTP id dx3mr15405902wib.14.1350833955959; Sun, 21 Oct 2012 08:39:15 -0700 (PDT) Received: from localhost.localdomain (dom38-1-82-236-154-183.fbx.proxad.net. [82.236.154.183]) by mx.google.com with ESMTPS id ei1sm16526211wid.7.2012.10.21.08.39.14 (version=TLSv1/SSLv3 cipher=OTHER); Sun, 21 Oct 2012 08:39:15 -0700 (PDT) From: Yann Diorcet To: dev@oe-lite.org Subject: [PATCH 1/2] u-boot-omap: compilable on osx Date: Sun, 21 Oct 2012 17:39:10 +0200 Message-Id: <1350833951-9560-1-git-send-email-diorcet.yann@gmail.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: References: Cc: Yann Diorcet X-BeenThere: dev@oe-lite.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: OE-lite development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: dev-bounces@oe-lite.org Errors-To: dev-bounces@oe-lite.org From: Yann Diorcet --- recipes/u-boot/u-boot-omap.inc | 1 + recipes/u-boot/u-boot-omap/osx.patch | 46 ++++++++++++++++++++++++++++++++++ 2 files changed, 47 insertions(+) create mode 100644 recipes/u-boot/u-boot-omap/osx.patch diff --git a/recipes/u-boot/u-boot-omap.inc b/recipes/u-boot/u-boot-omap.inc index 5041ebf..7ccda86 100644 --- a/recipes/u-boot/u-boot-omap.inc +++ b/recipes/u-boot/u-boot-omap.inc @@ -5,6 +5,7 @@ COMPATIBLE_MACHINES = "pandaboard beagleboard" inherit u-boot SRC_URI = "git://git.denx.de/u-boot.git;tag=v${PV}" +SRC_URI += "file://osx.patch" S = "${SRCDIR}/u-boot" SRC_URI += "file://${BOOT_SCRIPT}" diff --git a/recipes/u-boot/u-boot-omap/osx.patch b/recipes/u-boot/u-boot-omap/osx.patch new file mode 100644 index 0000000..70389ee --- /dev/null +++ b/recipes/u-boot/u-boot-omap/osx.patch @@ -0,0 +1,46 @@ +diff -urN u-boot-2011.09/tools/env/fw_env.c u-boot-2011.09.2/tools/env/fw_env.c +--- u-boot-2011.09/tools/env/fw_env.c 2011-09-29 21:11:15.000000000 +0200 ++++ u-boot-2011.09.2/tools/env/fw_env.c 2012-10-04 15:10:59.000000000 +0200 +@@ -38,6 +38,11 @@ + #ifdef MTD_OLD + # include + # include ++#elif __APPLE__ ++# include ++#define ulong unsigned long ++#include ++typedef long long loff_t; + #else + # define __user /* nothing */ + # include +diff -urN u-boot-2011.09/tools/getline.h u-boot-2011.09.2/tools/getline.h +--- u-boot-2011.09/tools/getline.h 2011-09-29 21:11:15.000000000 +0200 ++++ u-boot-2011.09.2/tools/getline.h 2012-10-04 15:08:24.000000000 +0200 +@@ -1 +1,4 @@ ++#ifdef __APPLE__ ++#undef getline ++#endif + int getline(char **lineptr, size_t *n, FILE *stream); +diff -urN u-boot-2011.09/tools/os_support.c u-boot-2011.09.2/tools/os_support.c +--- u-boot-2011.09/tools/os_support.c 2011-09-29 21:11:15.000000000 +0200 ++++ u-boot-2011.09.2/tools/os_support.c 2012-10-04 15:10:59.000000000 +0200 +@@ -23,6 +23,6 @@ + #ifdef __MINGW32__ + #include "mingw_support.c" + #endif +-#ifdef __APPLE__ ++#if defined(__APPLE__) && __DARWIN_C_LEVEL < 200809L + #include "getline.c" + #endif +diff -urN u-boot-2011.09/tools/os_support.h u-boot-2011.09.2/tools/os_support.h +--- u-boot-2011.09/tools/os_support.h 2011-09-29 21:11:15.000000000 +0200 ++++ u-boot-2011.09.2/tools/os_support.h 2012-10-04 15:10:59.000000000 +0200 +@@ -28,7 +28,7 @@ + #include "mingw_support.h" + #endif + +-#ifdef __APPLE__ ++#if defined(__APPLE__) && __DARWIN_C_LEVEL < 200809L + #include "getline.h" + #endif +