Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 1 Feb 2020 23:55:11 +0000 (UTC)
From:      Tobias Kortkamp <tobik@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r524793 - in head/net-im/uTox: . files
Message-ID:  <202002012355.011NtB3R070915@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: tobik
Date: Sat Feb  1 23:55:10 2020
New Revision: 524793
URL: https://svnweb.freebsd.org/changeset/ports/524793

Log:
  net-im/uTox: Unbreak build on arm64
  
  In file included from src/main.c:9:
  In file included from src/native/main.h:16:
  In file included from src/native/../xlib/main.h:18:
  In file included from /usr/local/include/X11/extensions/Xrender.h:28:
  In file included from /usr/local/include/X11/Xlib.h:38:
  In file included from /usr/include/sys/types.h:46:
  /usr/include/machine/endian.h:68:20: error: too many arguments provided to function-like macro
  invocation
                           : "=&r" (ret), "+r" (x));
                                          ^
  src/main.h:30:9: note: macro 'volatile' defined here
  #define volatile(x)(x)
          ^
  
  While untested optimistically allow the build on armv* again too.

Added:
  head/net-im/uTox/files/patch-src_main.h   (contents, props changed)
Modified:
  head/net-im/uTox/Makefile

Modified: head/net-im/uTox/Makefile
==============================================================================
--- head/net-im/uTox/Makefile	Sat Feb  1 23:51:15 2020	(r524792)
+++ head/net-im/uTox/Makefile	Sat Feb  1 23:55:10 2020	(r524793)
@@ -15,10 +15,6 @@ COMMENT=	Lightweight Tox client
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BROKEN_aarch64=	fails to compile: endian.h:68:20: too many arguments provided to function-like macro invocation
-BROKEN_armv6=	fails to compile: endian.h:68:20: too many arguments provided to function-like macro invocation
-BROKEN_armv7=	fails to compile: endian.h:68:20: too many arguments provided to function-like macro invocation
-
 BUILD_DEPENDS=	${LOCALBASE}/include/linux/input.h:devel/evdev-proto \
 		${LOCALBASE}/include/linux/videodev2.h:multimedia/v4l_compat
 LIB_DEPENDS=	libfilteraudio.so:audio/libfilteraudio \

Added: head/net-im/uTox/files/patch-src_main.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net-im/uTox/files/patch-src_main.h	Sat Feb  1 23:55:10 2020	(r524793)
@@ -0,0 +1,29 @@
+Fix build on arm
+
+In file included from src/main.c:9:
+In file included from src/native/main.h:16:
+In file included from src/native/../xlib/main.h:18:
+In file included from /usr/local/include/X11/extensions/Xrender.h:28:
+In file included from /usr/local/include/X11/Xlib.h:38:
+In file included from /usr/include/sys/types.h:46:
+/usr/include/machine/endian.h:68:20: error: too many arguments provided to function-like macro
+invocation
+                         : "=&r" (ret), "+r" (x));
+                                        ^
+src/main.h:30:9: note: macro 'volatile' defined here
+#define volatile(x)(x)
+        ^
+
+--- src/main.h.orig	2020-02-01 23:37:59 UTC
++++ src/main.h
+@@ -26,10 +26,6 @@
+ #define MAIN_WIDTH 750
+ #define MAIN_HEIGHT 500
+ 
+-#ifndef __OBJC__
+-#define volatile(x)(x)
+-#endif
+-
+ /* Support for large files. */
+ #define _LARGEFILE_SOURCE
+ #define _FILE_OFFSET_BITS 64



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202002012355.011NtB3R070915>