svn commit: r496226 - in head/devel/libubox: . files

[Martin Matuska]

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 <pkubaj at anongoth.pl>

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 at 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
+