From patchwork Sun Aug 3 15:06:53 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Delta Tatham X-Patchwork-Id: 376064 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4F23214009B for ; Mon, 4 Aug 2014 01:07:31 +1000 (EST) DomainKey-Signature: a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:cc:subject:date:message-id:in-reply-to :references; q=dns; s=default; b=i3/20GodPbQHNeJlw6yhRnVYS7KDWDb n3zMsk2k7zUxBz7Q5bY0HRJP57Pf/S4W6SWv1JCIFMJpdEiM6mom0a0O/7ltlBtB Oh+a2hFaoDYxRS2rf6jBTHEnZ5G2ypOvWX6YpHxoVK0sw7UWzhp8YCVB0kn0pAyK 3qELaCmFuEN4= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:cc:subject:date:message-id:in-reply-to :references; s=default; bh=k7fQGXk8bxbVyDxoU8csczeez3I=; b=deaKm QCPmz1jvI1YOFn4lqhmRrapx/S58N0JHpvLtN3cMZBhtmNLX/8tsFaSYmO8rHqDD FcBG2Jxj5a3jhYsFiCZVHpd9cmaYX8I9JDn5smwC4ZlZgwmH9bprhN3QnedrdN9K 6OSdMG2eeuFrFAzR8pGIg0WiyxSE57URRZ9nBs= Received: (qmail 10753 invoked by alias); 3 Aug 2014 15:07:07 -0000 Mailing-List: contact crossgcc-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: crossgcc-owner@sourceware.org Delivered-To: mailing list crossgcc@sourceware.org Received: (qmail 10715 invoked by uid 89); 3 Aug 2014 15:07:03 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-0.9 required=5.0 tests=AWL, BAYES_00, NO_DNS_FOR_FROM, RCVD_IN_SORBS_DUL, RDNS_DYNAMIC autolearn=no version=3.3.2 X-HELO: BigMac.local Received: from cpc13-papw6-2-0-cust700.5-3.cable.virginm.net (HELO BigMac.local) (86.9.146.189) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Sun, 03 Aug 2014 15:07:01 +0000 Received: by BigMac.local (Postfix, from userid 501) id 6BAA1B49984; Sun, 3 Aug 2014 16:06:59 +0100 (BST) From: Delta Tatham To: crossgcc@sourceware.org Cc: Daniel Zauner , yann.morin.1998@free.fr Subject: [PATCH 2/2] Patches to enable compilation on OSX 10.10 Date: Sun, 3 Aug 2014 16:06:53 +0100 Message-Id: <1407078413-21972-3-git-send-email-delta.tatham@me.com> In-Reply-To: <1407078413-21972-1-git-send-email-delta.tatham@me.com> References: <1407078413-21972-1-git-send-email-delta.tatham@me.com> From: Daniel Zauner PPL 0.11.2: Fixed clang-compat Pulled from https://www.cs.unipr.it/mantis/view.php?id=596 eGlibc 2_18: - removed libintl.h from sunrpc files as not necessary in OSX - Workaround for types (see https://coderwall.com/p/k1wqdw) Signed-off-by: Daniel Zauner aka Delta Tatham --- patches/eglibc/2_18/0-osx-libintl_h-fixup.patch | 286 +++++++++++++++++++++ .../eglibc/2_18/1-osx-sunrpc-types_h-fixup.patch | 14 + patches/ppl/0.11.2/401-flexible-array-clang.patch | 21 ++ 3 files changed, 321 insertions(+) create mode 100644 patches/eglibc/2_18/0-osx-libintl_h-fixup.patch create mode 100644 patches/eglibc/2_18/1-osx-sunrpc-types_h-fixup.patch create mode 100644 patches/ppl/0.11.2/401-flexible-array-clang.patch diff --git a/patches/eglibc/2_18/0-osx-libintl_h-fixup.patch b/patches/eglibc/2_18/0-osx-libintl_h-fixup.patch new file mode 100644 index 0000000..40e5b07 --- /dev/null +++ b/patches/eglibc/2_18/0-osx-libintl_h-fixup.patch @@ -0,0 +1,286 @@ +diff -rup a.eglibc-2_18/sunrpc/auth_unix.c eglibc-2_18/sunrpc/auth_unix.c +--- eglibc-2_18/sunrpc/auth_unix.c 2014-08-03 14:33:45.000000000 +0100 ++++ eglibc-2_18/sunrpc/auth_unix.c 2014-08-03 14:45:19.000000000 +0100 +@@ -43,7 +43,9 @@ + #include + #include + #include ++#ifndef __APPLE__ + #include ++#endif + #include + #include + +diff -rup a.eglibc-2_18/sunrpc/clnt_perr.c eglibc-2_18/sunrpc/clnt_perr.c +--- eglibc-2_18/sunrpc/clnt_perr.c 2014-08-03 14:33:45.000000000 +0100 ++++ eglibc-2_18/sunrpc/clnt_perr.c 2014-08-03 14:45:19.000000000 +0100 +@@ -32,7 +32,9 @@ + */ + #include + #include ++#ifndef __APPLE__ + #include ++#endif + #include + #include + #include +diff -rup a.eglibc-2_18/sunrpc/clnt_raw.c eglibc-2_18/sunrpc/clnt_raw.c +--- eglibc-2_18/sunrpc/clnt_raw.c 2014-08-03 14:33:45.000000000 +0100 ++++ eglibc-2_18/sunrpc/clnt_raw.c 2014-08-03 14:45:19.000000000 +0100 +@@ -39,7 +39,9 @@ + #include + #include + #include ++#ifndef __APPLE__ + #include ++#endif + + #define MCALL_MSG_SIZE 24 + +diff -rup a.eglibc-2_18/sunrpc/clnt_tcp.c eglibc-2_18/sunrpc/clnt_tcp.c +--- eglibc-2_18/sunrpc/clnt_tcp.c 2014-08-03 14:33:45.000000000 +0100 ++++ eglibc-2_18/sunrpc/clnt_tcp.c 2014-08-03 14:45:19.000000000 +0100 +@@ -48,7 +48,9 @@ + #include + #include + #include ++#ifndef __APPLE__ + #include ++#endif + #include + #include + #include +diff -rup a.eglibc-2_18/sunrpc/clnt_udp.c eglibc-2_18/sunrpc/clnt_udp.c +--- eglibc-2_18/sunrpc/clnt_udp.c 2014-08-03 14:33:45.000000000 +0100 ++++ eglibc-2_18/sunrpc/clnt_udp.c 2014-08-03 14:45:19.000000000 +0100 +@@ -33,7 +33,9 @@ + + #include + #include ++#ifndef __APPLE__ + #include ++#endif + #include + #include + #include +diff -rup a.eglibc-2_18/sunrpc/clnt_unix.c eglibc-2_18/sunrpc/clnt_unix.c +--- eglibc-2_18/sunrpc/clnt_unix.c 2014-08-03 14:33:45.000000000 +0100 ++++ eglibc-2_18/sunrpc/clnt_unix.c 2014-08-03 14:45:19.000000000 +0100 +@@ -48,7 +48,9 @@ + #include + #include + #include ++#ifndef __APPLE__ + #include ++#endif + #include + #include + #include +diff -rup a.eglibc-2_18/sunrpc/get_myaddr.c eglibc-2_18/sunrpc/get_myaddr.c +--- eglibc-2_18/sunrpc/get_myaddr.c 2014-08-03 14:33:45.000000000 +0100 ++++ eglibc-2_18/sunrpc/get_myaddr.c 2014-08-03 14:45:19.000000000 +0100 +@@ -38,7 +38,9 @@ + #include + #include + #include ++#ifndef __APPLE__ + #include ++#endif + #include + #include + #include +diff -rup a.eglibc-2_18/sunrpc/pm_getmaps.c eglibc-2_18/sunrpc/pm_getmaps.c +--- eglibc-2_18/sunrpc/pm_getmaps.c 2014-08-03 14:33:45.000000000 +0100 ++++ eglibc-2_18/sunrpc/pm_getmaps.c 2014-08-03 14:45:20.000000000 +0100 +@@ -41,7 +41,9 @@ + #include + #include + #include ++#ifndef __APPLE__ + #include ++#endif + #include + #include + +diff -rup a.eglibc-2_18/sunrpc/pmap_clnt.c eglibc-2_18/sunrpc/pmap_clnt.c +--- eglibc-2_18/sunrpc/pmap_clnt.c 2014-08-03 14:33:45.000000000 +0100 ++++ eglibc-2_18/sunrpc/pmap_clnt.c 2014-08-03 14:45:20.000000000 +0100 +@@ -35,7 +35,9 @@ + + #include + #include ++#ifndef __APPLE__ + #include ++#endif + #include + #include + #include +diff -rup a.eglibc-2_18/sunrpc/pmap_rmt.c eglibc-2_18/sunrpc/pmap_rmt.c +--- eglibc-2_18/sunrpc/pmap_rmt.c 2014-08-03 14:33:45.000000000 +0100 ++++ eglibc-2_18/sunrpc/pmap_rmt.c 2014-08-03 14:45:20.000000000 +0100 +@@ -35,7 +35,9 @@ + + #include + #include ++#ifndef __APPLE__ + #include ++#endif + #include + #include + #include +diff -rup a.eglibc-2_18/sunrpc/rpc_main.c eglibc-2_18/sunrpc/rpc_main.c +--- eglibc-2_18/sunrpc/rpc_main.c 2014-08-03 14:33:45.000000000 +0100 ++++ eglibc-2_18/sunrpc/rpc_main.c 2014-08-03 14:45:55.000000000 +0100 +@@ -38,7 +38,9 @@ + #include + #include + #include ++#ifndef __APPLE__ + #include ++#endif + #include + #include + #include +diff -rup a.eglibc-2_18/sunrpc/rpc_scan.c eglibc-2_18/sunrpc/rpc_scan.c +--- eglibc-2_18/sunrpc/rpc_scan.c 2014-08-03 14:33:45.000000000 +0100 ++++ eglibc-2_18/sunrpc/rpc_scan.c 2014-08-03 14:46:00.000000000 +0100 +@@ -37,7 +37,9 @@ + #include + #include + #include ++#ifndef __APPLE__ + #include ++#endif + #include "rpc_scan.h" + #include "rpc_parse.h" + #include "rpc_util.h" +diff -rup a.eglibc-2_18/sunrpc/rpcinfo.c eglibc-2_18/sunrpc/rpcinfo.c +--- eglibc-2_18/sunrpc/rpcinfo.c 2014-08-03 14:33:45.000000000 +0100 ++++ eglibc-2_18/sunrpc/rpcinfo.c 2014-08-03 14:46:10.000000000 +0100 +@@ -48,7 +48,9 @@ + #include + #include + #include ++#ifndef __APPLE__ + #include ++#endif + + #include "../version.h" + #define PACKAGE _libc_intl_domainname +diff -rup a.eglibc-2_18/sunrpc/svc_run.c eglibc-2_18/sunrpc/svc_run.c +--- eglibc-2_18/sunrpc/svc_run.c 2014-08-03 14:33:45.000000000 +0100 ++++ eglibc-2_18/sunrpc/svc_run.c 2014-08-03 14:47:35.000000000 +0100 +@@ -33,7 +33,9 @@ + + #include + #include ++#ifndef __APPLE__ + #include ++#endif + #include + #include + +diff -rup a.eglibc-2_18/sunrpc/svc_simple.c eglibc-2_18/sunrpc/svc_simple.c +--- eglibc-2_18/sunrpc/svc_simple.c 2014-08-03 14:33:45.000000000 +0100 ++++ eglibc-2_18/sunrpc/svc_simple.c 2014-08-03 14:47:48.000000000 +0100 +@@ -34,7 +34,9 @@ + + #include + #include ++#ifndef __APPLE__ + #include ++#endif + #include + #include + #include +diff -rup a.eglibc-2_18/sunrpc/svc_tcp.c eglibc-2_18/sunrpc/svc_tcp.c +--- eglibc-2_18/sunrpc/svc_tcp.c 2014-08-03 14:33:45.000000000 +0100 ++++ eglibc-2_18/sunrpc/svc_tcp.c 2014-08-03 14:47:54.000000000 +0100 +@@ -55,7 +55,9 @@ + #include + #include + #include ++#ifndef __APPLE__ + #include ++#endif + #include + #include + #include +diff -rup a.eglibc-2_18/sunrpc/svc_udp.c eglibc-2_18/sunrpc/svc_udp.c +--- eglibc-2_18/sunrpc/svc_udp.c 2014-08-03 14:33:45.000000000 +0100 ++++ eglibc-2_18/sunrpc/svc_udp.c 2014-08-03 14:47:57.000000000 +0100 +@@ -56,7 +56,9 @@ + #include + #include + #include ++#ifndef __APPLE__ + #include ++#endif + + #ifdef IP_PKTINFO + #include +diff -rup a.eglibc-2_18/sunrpc/svc_unix.c eglibc-2_18/sunrpc/svc_unix.c +--- eglibc-2_18/sunrpc/svc_unix.c 2014-08-03 14:33:45.000000000 +0100 ++++ eglibc-2_18/sunrpc/svc_unix.c 2014-08-03 14:48:03.000000000 +0100 +@@ -62,7 +62,9 @@ + #include + #include + #include ++#ifndef __APPLE__ + #include ++#endif + #include + + /* +diff -rup a.eglibc-2_18/sunrpc/xdr.c eglibc-2_18/sunrpc/xdr.c +--- eglibc-2_18/sunrpc/xdr.c 2014-08-03 14:33:45.000000000 +0100 ++++ eglibc-2_18/sunrpc/xdr.c 2014-08-03 14:48:10.000000000 +0100 +@@ -38,7 +38,9 @@ + #include + #include + #include ++#ifndef __APPLE__ + #include ++#endif + #include + #include + +diff -rup a.eglibc-2_18/sunrpc/xdr_array.c eglibc-2_18/sunrpc/xdr_array.c +--- eglibc-2_18/sunrpc/xdr_array.c 2014-08-03 14:33:45.000000000 +0100 ++++ eglibc-2_18/sunrpc/xdr_array.c 2014-08-03 14:48:10.000000000 +0100 +@@ -38,7 +38,9 @@ + #include + #include + #include ++#ifndef __APPLE__ + #include ++#endif + #include + #include + +diff -rup a.eglibc-2_18/sunrpc/xdr_rec.c eglibc-2_18/sunrpc/xdr_rec.c +--- eglibc-2_18/sunrpc/xdr_rec.c 2014-08-03 14:33:45.000000000 +0100 ++++ eglibc-2_18/sunrpc/xdr_rec.c 2014-08-03 14:48:10.000000000 +0100 +@@ -47,7 +47,9 @@ + #include + #include + #include ++#ifndef __APPLE__ + #include ++#endif + #include + #include + +diff -rup a.eglibc-2_18/sunrpc/xdr_ref.c eglibc-2_18/sunrpc/xdr_ref.c +--- eglibc-2_18/sunrpc/xdr_ref.c 2014-08-03 14:33:45.000000000 +0100 ++++ eglibc-2_18/sunrpc/xdr_ref.c 2014-08-03 14:48:10.000000000 +0100 +@@ -38,7 +38,9 @@ + #include + #include + #include ++#ifndef __APPLE__ + #include ++#endif + #include + #include + diff --git a/patches/eglibc/2_18/1-osx-sunrpc-types_h-fixup.patch b/patches/eglibc/2_18/1-osx-sunrpc-types_h-fixup.patch new file mode 100644 index 0000000..5aea6bd --- /dev/null +++ b/patches/eglibc/2_18/1-osx-sunrpc-types_h-fixup.patch @@ -0,0 +1,14 @@ +--- a.eglibc-2_18/sunrpc/rpc/types.h 2014-08-03 15:06:56.000000000 +0100 ++++ eglibc-2_18/sunrpc/rpc/types.h 2014-08-03 15:08:50.000000000 +0100 +@@ -69,6 +69,11 @@ typedef unsigned long rpcport_t; + #include + #endif + ++#ifdef __APPLE__ ++#define __u_char_defined ++#define __daddr_t_defined ++#endif ++ + #ifndef __u_char_defined + typedef __u_char u_char; + typedef __u_short u_short; diff --git a/patches/ppl/0.11.2/401-flexible-array-clang.patch b/patches/ppl/0.11.2/401-flexible-array-clang.patch new file mode 100644 index 0000000..48a81bd --- /dev/null +++ b/patches/ppl/0.11.2/401-flexible-array-clang.patch @@ -0,0 +1,21 @@ +diff -urN ppl-0.11.orig/m4/ac_cxx_flexible_arrays.m4 ppl-0.11/m4/ac_cxx_flexible_arrays.m4 +--- ppl-0.11.orig/m4/ac_cxx_flexible_arrays.m4 2010-08-02 13:21:24.000000000 -0700 ++++ ppl-0.11/m4/ac_cxx_flexible_arrays.m4 2014-03-12 08:43:21.000000000 -0700 +@@ -40,6 +40,8 @@ + A() + : i(0), b(false) { + } ++ ++ ~A() {} + }; + + class B { +@@ -89,6 +91,8 @@ + A() + : i(0), b(false) { + } ++ ++ ~A() {} + }; + + class B {