浏览代码

libosip2: arc: Undefine __arc__ when building for ARC processors

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.

[Peter: add short comment in .mk files as well]
Signed-off-by: Mischa Jonker <mjonker@synopsys.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
Mischa Jonker 12 年之前
父节点
当前提交
821a6d6338
共有 2 个文件被更改,包括 10 次插入0 次删除
  1. 5 0
      package/libeXosip2/libeXosip2.mk
  2. 5 0
      package/libosip2/libosip2.mk

+ 5 - 0
package/libeXosip2/libeXosip2.mk

@@ -12,6 +12,11 @@ LIBEXOSIP2_LICENSE_FILES = COPYING
 
 
 LIBEXOSIP2_DEPENDENCIES = host-pkgconf libosip2
 LIBEXOSIP2_DEPENDENCIES = host-pkgconf libosip2
 
 
+ifeq ($(BR2_arc),y)
+# toolchain __arc__ define conflicts with libeXosip2 source
+LIBEXOSIP2_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -U__arc__"
+endif
+
 ifeq ($(BR2_PACKAGE_OPENSSL),y)
 ifeq ($(BR2_PACKAGE_OPENSSL),y)
 LIBEXOSIP2_DEPENDENCIES += openssl
 LIBEXOSIP2_DEPENDENCIES += openssl
 LIBEXOSIP2_CONF_OPT += --enable-openssl
 LIBEXOSIP2_CONF_OPT += --enable-openssl

+ 5 - 0
package/libosip2/libosip2.mk

@@ -10,6 +10,11 @@ LIBOSIP2_INSTALL_STAGING = YES
 LIBOSIP2_LICENSE = LGPLv2.1+
 LIBOSIP2_LICENSE = LGPLv2.1+
 LIBOSIP2_LICENSE_FILES = COPYING
 LIBOSIP2_LICENSE_FILES = COPYING
 
 
+ifeq ($(BR2_arc),y)
+# toolchain __arc__ define conflicts with libosip2 source
+LIBOSIP2_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -U__arc__"
+endif
+
 LIBOSIP2_CONF_OPT = \
 LIBOSIP2_CONF_OPT = \
 	--enable-mt=$(if $(BR2_TOOLCHAIN_HAS_THREADS),yes,no)
 	--enable-mt=$(if $(BR2_TOOLCHAIN_HAS_THREADS),yes,no)