From owner-svn-ports-head@freebsd.org Mon Mar 18 23:42:38 2019 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 463CB1550E5E; Mon, 18 Mar 2019 23:42:38 +0000 (UTC) (envelope-from mm@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 DAD7C84340; Mon, 18 Mar 2019 23:42:37 +0000 (UTC) (envelope-from mm@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 B355E995; Mon, 18 Mar 2019 23:42:37 +0000 (UTC) (envelope-from mm@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x2INgbda093517; Mon, 18 Mar 2019 23:42:37 GMT (envelope-from mm@FreeBSD.org) Received: (from mm@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x2INgbMP093516; Mon, 18 Mar 2019 23:42:37 GMT (envelope-from mm@FreeBSD.org) Message-Id: <201903182342.x2INgbMP093516@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mm set sender to mm@FreeBSD.org using -f From: Martin Matuska Date: Mon, 18 Mar 2019 23:42:37 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r496226 - in head/devel/libubox: . files X-SVN-Group: ports-head X-SVN-Commit-Author: mm X-SVN-Commit-Paths: in head/devel/libubox: . files X-SVN-Commit-Revision: 496226 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: DAD7C84340 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.95 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.998,0]; NEURAL_HAM_SHORT(-0.95)[-0.952,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_LONG(-1.00)[-1.000,0] X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 18 Mar 2019 23:42:38 -0000 Author: mm Date: Mon Mar 18 23:42:36 2019 New Revision: 496226 URL: https://svnweb.freebsd.org/changeset/ports/496226 Log: devel/libubox: fix the non-working fix to build on powerpc64 PR: 231496 Submitted by: Piotr Kubaj Added: head/devel/libubox/files/patch-utils.h (contents, props changed) Deleted: head/devel/libubox/files/patch-files_patch-utils.h Modified: head/devel/libubox/Makefile Modified: head/devel/libubox/Makefile ============================================================================== --- head/devel/libubox/Makefile Mon Mar 18 23:33:47 2019 (r496225) +++ head/devel/libubox/Makefile Mon Mar 18 23:42:36 2019 (r496226) @@ -3,7 +3,7 @@ PORTNAME= libubox PORTVERSION= 20180803 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel MAINTAINER= mm@FreeBSD.org Added: head/devel/libubox/files/patch-utils.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/libubox/files/patch-utils.h Mon Mar 18 23:42:36 2019 (r496226) @@ -0,0 +1,20 @@ +--- utils.h.orig 2018-09-19 23:05:31 UTC ++++ utils.h +@@ -121,7 +121,7 @@ int clock_gettime(int type, struct timespec *tv); + * This returns a constant expression while determining if an argument is + * a constant expression, most importantly without evaluating the argument. + */ +-#define __is_constant(x) \ ++#define __is_it_constant(x) \ + (sizeof(int) == sizeof(*(1 ? ((void*)((long)(x) * 0l)) : (int*)1))) + + #define __eval_once(func, x) \ +@@ -136,7 +136,7 @@ int clock_gettime(int type, struct timespec *tv); + #define __eval_safe(func, x) __eval_once(func, x) + #else + #define __eval_safe(func, x) \ +- __builtin_choose_expr(__is_constant(x), \ ++ __builtin_choose_expr(__is_it_constant(x), \ + func(x), __eval_once(func, x)) + #endif +