From owner-svn-ports-all@freebsd.org Sat Feb 1 23:55:11 2020 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id A900A230A4E; Sat, 1 Feb 2020 23:55:11 +0000 (UTC) (envelope-from tobik@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4899v341gpz4Dn7; Sat, 1 Feb 2020 23:55:11 +0000 (UTC) (envelope-from tobik@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 853626FE8; Sat, 1 Feb 2020 23:55:11 +0000 (UTC) (envelope-from tobik@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 011NtB2i070918; Sat, 1 Feb 2020 23:55:11 GMT (envelope-from tobik@FreeBSD.org) Received: (from tobik@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 011NtB3R070915; Sat, 1 Feb 2020 23:55:11 GMT (envelope-from tobik@FreeBSD.org) Message-Id: <202002012355.011NtB3R070915@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tobik set sender to tobik@FreeBSD.org using -f From: Tobias Kortkamp Date: Sat, 1 Feb 2020 23:55:11 +0000 (UTC) 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 X-SVN-Group: ports-head X-SVN-Commit-Author: tobik X-SVN-Commit-Paths: in head/net-im/uTox: . files X-SVN-Commit-Revision: 524793 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 01 Feb 2020 23:55:11 -0000 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