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

[Martin Matuska]

Author: mm
Date: Tue Oct 23 00:28:14 2018
New Revision: 482806
URL: https://svnweb.freebsd.org/changeset/ports/482806

Log:
  devel/libubox: fix build on powerpc64
  
  PR:		231496
  Submitted by:	Piotr Kubaj <pkubaj at anongoth.pl>

Added:
  head/devel/libubox/files/
  head/devel/libubox/files/patch-files_patch-utils.h   (contents, props changed)
Modified:
  head/devel/libubox/Makefile
  head/devel/libubox/pkg-plist

Modified: head/devel/libubox/Makefile
==============================================================================
--- head/devel/libubox/Makefile	Tue Oct 23 00:25:20 2018	(r482805)
+++ head/devel/libubox/Makefile	Tue Oct 23 00:28:14 2018	(r482806)
@@ -14,6 +14,7 @@ LICENSE=	GPLv2
 LIB_DEPENDS=	libjson-c.so:devel/json-c
 
 USES=		cmake pkgconfig lua:51
+USE_LDCONFIG=	yes
 USE_GITHUB=	yes
 GH_ACCOUNT=	mmatuska
 GH_TAGNAME=	c83a84af

Added: head/devel/libubox/files/patch-files_patch-utils.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/devel/libubox/files/patch-files_patch-utils.h	Tue Oct 23 00:28:14 2018	(r482806)
@@ -0,0 +1,23 @@
+--- files/patch-utils.h.orig	2018-10-23 00:26:19 UTC
++++ files/patch-utils.h
+@@ -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
++ 

Modified: head/devel/libubox/pkg-plist
==============================================================================
--- head/devel/libubox/pkg-plist	Tue Oct 23 00:25:20 2018	(r482805)
+++ head/devel/libubox/pkg-plist	Tue Oct 23 00:28:14 2018	(r482806)
@@ -23,4 +23,3 @@ lib/libubox.a
 lib/libubox.so
 %%LUA_MODLIBDIR%%/uloop.so
 %%DATADIR%%/jshn.sh
-