From owner-svn-ports-head@freebsd.org Thu Aug 23 11:57:28 2018 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 4FA2D108B581; Thu, 23 Aug 2018 11:57:28 +0000 (UTC) (envelope-from demon@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id E1A9E8F385; Thu, 23 Aug 2018 11:57:27 +0000 (UTC) (envelope-from demon@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 C158121A5D; Thu, 23 Aug 2018 11:57:27 +0000 (UTC) (envelope-from demon@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w7NBvRGq071944; Thu, 23 Aug 2018 11:57:27 GMT (envelope-from demon@FreeBSD.org) Received: (from demon@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w7NBvRi2071943; Thu, 23 Aug 2018 11:57:27 GMT (envelope-from demon@FreeBSD.org) Message-Id: <201808231157.w7NBvRi2071943@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: demon set sender to demon@FreeBSD.org using -f From: Dmitry Sivachenko Date: Thu, 23 Aug 2018 11:57:27 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r477868 - head/net/haproxy/files X-SVN-Group: ports-head X-SVN-Commit-Author: demon X-SVN-Commit-Paths: head/net/haproxy/files X-SVN-Commit-Revision: 477868 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.27 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: Thu, 23 Aug 2018 11:57:28 -0000 Author: demon Date: Thu Aug 23 11:57:27 2018 New Revision: 477868 URL: https://svnweb.freebsd.org/changeset/ports/477868 Log: Add forgotten patch to fix build on i386 (the same as in haproxy-devel). Added: head/net/haproxy/files/patch-include-common-hathreads.h (contents, props changed) Added: head/net/haproxy/files/patch-include-common-hathreads.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/haproxy/files/patch-include-common-hathreads.h Thu Aug 23 11:57:27 2018 (r477868) @@ -0,0 +1,11 @@ +--- include/common/hathreads.h.orig 2018-02-17 18:17:22.219400000 +0000 ++++ include/common/hathreads.h 2018-02-17 18:18:44.598422000 +0000 +@@ -104,7 +104,7 @@ extern THREAD_LOCAL unsigned long tid_bit; /* The bit + /* TODO: thread: For now, we rely on GCC builtins but it could be a good idea to + * have a header file regrouping all functions dealing with threads. */ + +-#if defined(__GNUC__) && (__GNUC__ < 4 || __GNUC__ == 4 && __GNUC_MINOR__ < 7) && !defined(__clang__) ++#if (defined(__GNUC__) && (__GNUC__ < 4 || __GNUC__ == 4 && __GNUC_MINOR__ < 7) && !defined(__clang__)) || (defined(__clang__) && defined(__i386__)) + /* gcc < 4.7 */ + + #define HA_ATOMIC_ADD(val, i) __sync_add_and_fetch(val, i)