From patchwork Mon Jul 15 12:39:22 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mischa Jonker X-Patchwork-Id: 259035 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ozlabs.org (Postfix) with ESMTP id 560EA2C00DB for ; Mon, 15 Jul 2013 22:39:36 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id CD0898BCCD; Mon, 15 Jul 2013 12:39:34 +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 UhYgr4co7p1y; Mon, 15 Jul 2013 12:39:32 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 4C8E78B087; Mon, 15 Jul 2013 12:39:32 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 1B3DE1BFA8B for ; Mon, 15 Jul 2013 12:39:36 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 7DD7A8B087 for ; Mon, 15 Jul 2013 12:39:31 +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 QlXeRrC72TEn for ; Mon, 15 Jul 2013 12:39:30 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from kiruna.synopsys.com (us01smtp2.synopsys.com [198.182.44.80]) by whitealder.osuosl.org (Postfix) with ESMTP id BD8C08B079 for ; Mon, 15 Jul 2013 12:39:30 +0000 (UTC) Received: from mailhost.synopsys.com (unknown [10.9.202.240]) by kiruna.synopsys.com (Postfix) with ESMTP id EB2BAF5AA for ; Mon, 15 Jul 2013 05:39:29 -0700 (PDT) Received: from mailhost.synopsys.com (localhost [127.0.0.1]) by mailhost.synopsys.com (Postfix) with ESMTP id D6F8E23C; Mon, 15 Jul 2013 05:39:29 -0700 (PDT) Received: from mischa-VirtualBox.internal.synopsys.com (mischa-virtualbox.internal.synopsys.com [10.100.24.32]) by mailhost.synopsys.com (Postfix) with ESMTP id 25080236; Mon, 15 Jul 2013 05:39:28 -0700 (PDT) From: Mischa Jonker To: buildroot@busybox.net Date: Mon, 15 Jul 2013 14:39:22 +0200 Message-Id: <1373891962-32493-1-git-send-email-mjonker@synopsys.com> X-Mailer: git-send-email 1.7.9.5 Cc: Mischa Jonker Subject: [Buildroot] [PATCH] libosip2: arc: Undefine __arc__ when building for ARC processors X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.14 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: buildroot-bounces@busybox.net libosip2 appears to have support for the "ARC standard" (Advanced RISC Computing), which is unrelated to Synopsys DesignWare ARC processors. The check for this involves verifying the existence of the "__arc__" macro. Unfortunately, this macro is also present as a predefined built-in for the ARC processors, resulting into build failures. Signed-off-by: Mischa Jonker --- package/libeXosip2/libeXosip2.mk | 4 ++++ package/libosip2/libosip2.mk | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/package/libeXosip2/libeXosip2.mk b/package/libeXosip2/libeXosip2.mk index 4be2f05..76c4947 100644 --- a/package/libeXosip2/libeXosip2.mk +++ b/package/libeXosip2/libeXosip2.mk @@ -12,6 +12,10 @@ LIBEXOSIP2_LICENSE_FILES = COPYING LIBEXOSIP2_DEPENDENCIES = host-pkgconf libosip2 +ifeq ($(BR2_arc),y) +LIBEXOSIP2_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -U__arc__" +endif + ifeq ($(BR2_PACKAGE_OPENSSL),y) LIBEXOSIP2_DEPENDENCIES += openssl LIBEXOSIP2_CONF_OPT += --enable-openssl diff --git a/package/libosip2/libosip2.mk b/package/libosip2/libosip2.mk index 6ae8149..6d5c516 100644 --- a/package/libosip2/libosip2.mk +++ b/package/libosip2/libosip2.mk @@ -10,6 +10,10 @@ LIBOSIP2_INSTALL_STAGING = YES LIBOSIP2_LICENSE = LGPLv2.1+ LIBOSIP2_LICENSE_FILES = COPYING +ifeq ($(BR2_arc),y) +LIBOSIP2_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -U__arc__" +endif + LIBOSIP2_CONF_OPT = \ --enable-mt=$(if $(BR2_TOOLCHAIN_HAS_THREADS),yes,no)