Date: Sun, 20 Aug 2017 12:26:34 +0000 (UTC) From: Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r448384 - in head/devel/protobuf: . files Message-ID: <201708201226.v7KCQYLt099748@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: sunpoet Date: Sun Aug 20 12:26:34 2017 New Revision: 448384 URL: https://svnweb.freebsd.org/changeset/ports/448384 Log: Pet portlint: move BROKEN_* upward - Update patch file Modified: head/devel/protobuf/Makefile head/devel/protobuf/files/patch-src-google-protobuf-stubs-atomicops.h Modified: head/devel/protobuf/Makefile ============================================================================== --- head/devel/protobuf/Makefile Sun Aug 20 12:26:29 2017 (r448383) +++ head/devel/protobuf/Makefile Sun Aug 20 12:26:34 2017 (r448384) @@ -12,10 +12,10 @@ COMMENT= Data interchange format library LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE +BROKEN_sparc64= fails to compile: no atomic ops available + TEST_DEPENDS= googlemock>=0:devel/googlemock \ googletest>=0:devel/googletest - -BROKEN_sparc64= fails to compile: no atomic ops available CFLAGS+= -DGOOGLE_PROTOBUF_NO_RTTI -I${WRKSRC}/src CONFIGURE_ENV= CXX_FOR_BUILD=c++ Modified: head/devel/protobuf/files/patch-src-google-protobuf-stubs-atomicops.h ============================================================================== --- head/devel/protobuf/files/patch-src-google-protobuf-stubs-atomicops.h Sun Aug 20 12:26:29 2017 (r448383) +++ head/devel/protobuf/files/patch-src-google-protobuf-stubs-atomicops.h Sun Aug 20 12:26:34 2017 (r448384) @@ -1,11 +1,11 @@ ---- src/google/protobuf/stubs/atomicops.h.orig 2016-09-24 02:12:45 UTC +--- src/google/protobuf/stubs/atomicops.h.orig 2017-08-15 23:39:12 UTC +++ src/google/protobuf/stubs/atomicops.h -@@ -202,6 +202,8 @@ Atomic64 Release_Load(volatile const Ato +@@ -198,6 +198,8 @@ Atomic64 Release_Load(volatile const Ato #elif defined(__GNUC__) #if defined(GOOGLE_PROTOBUF_ARCH_IA32) || defined(GOOGLE_PROTOBUF_ARCH_X64) #include <google/protobuf/stubs/atomicops_internals_x86_gcc.h> +#elif defined(GOOGLE_PROTOBUF_ARCH_ARM) && defined(__FreeBSD__) +#include <google/protobuf/stubs/atomicops_internals_generic_gcc.h> #elif defined(GOOGLE_PROTOBUF_ARCH_ARM) && defined(__linux__) - #include <google/protobuf/stubs/atomicops_internals_arm_gcc.h> - #elif defined(GOOGLE_PROTOBUF_ARCH_AARCH64) + #if (((__GNUC__ == 4) && (__GNUC_MINOR__ >= 7)) || (__GNUC__ > 4)) + #include <google/protobuf/stubs/atomicops_internals_generic_gcc.h>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201708201226.v7KCQYLt099748>