Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 2 Jan 2019 13:06:25 +0000 (UTC)
From:      Mahdi Mokhtari <mmokhi@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r489079 - in head/net-mgmt/netdata: . files
Message-ID:  <201901021306.x02D6PjI077917@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: mmokhi
Date: Wed Jan  2 13:06:25 2019
New Revision: 489079
URL: https://svnweb.freebsd.org/changeset/ports/489079

Log:
  net-mgmt/netdata: Fix build on i386
  Add more exact test-cases to configure.ac to prevent it assuming support of
  __atomic_add/fetch/... symbols on i386 (Clang > 4).
  
  Sponsored by:	The FreeBSD Foundation

Added:
  head/net-mgmt/netdata/files/patch-build_m4_ax__c______atomic.m4   (contents, props changed)
Modified:
  head/net-mgmt/netdata/Makefile

Modified: head/net-mgmt/netdata/Makefile
==============================================================================
--- head/net-mgmt/netdata/Makefile	Wed Jan  2 12:35:38 2019	(r489078)
+++ head/net-mgmt/netdata/Makefile	Wed Jan  2 13:06:25 2019	(r489079)
@@ -4,7 +4,7 @@
 PORTNAME=	netdata
 PORTVERSION=	1.11.1
 DISTVERSIONPREFIX=v
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net-mgmt
 
 MAINTAINER=	mmokhi@FreeBSD.org

Added: head/net-mgmt/netdata/files/patch-build_m4_ax__c______atomic.m4
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net-mgmt/netdata/files/patch-build_m4_ax__c______atomic.m4	Wed Jan  2 13:06:25 2019	(r489079)
@@ -0,0 +1,25 @@
+--- build/m4/ax_c___atomic.m4.orig	2018-12-26 13:22:11 UTC
++++ build/m4/ax_c___atomic.m4
+@@ -6,7 +6,12 @@ AC_DEFUN([AC_C___ATOMIC],
+ [AC_CACHE_CHECK([for __atomic], ac_cv_c___atomic,
+ [AC_LINK_IFELSE(
+    [AC_LANG_SOURCE(
+-      [[int
++      [[typedef struct test {
++        volatile uint16_t a;
++        volatile uint64_t b;
++        volatile uint64_t c;
++        } test_t;
++        int
+         main (int argc, char **argv)
+         {
+           volatile unsigned long ul1 = 1, ul2 = 0, ul3 = 2;
+@@ -23,6 +28,8 @@ AC_DEFUN([AC_C___ATOMIC],
+           __atomic_fetch_sub(&ull3, 1, __ATOMIC_SEQ_CST);
+           __atomic_or_fetch(&ull1, ull2, __ATOMIC_SEQ_CST);
+           __atomic_and_fetch(&ull1, ull2, __ATOMIC_SEQ_CST);
++          volatile test_t test = {.a = 0, .b = 0, .c = 1};
++          __atomic_fetch_add(&test.b, 1, __ATOMIC_SEQ_CST);
+           return 0;
+         }
+       ]])],



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