Date: Sat, 21 Feb 2015 08:38:44 +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: r379486 - in head/devel/protobuf: . files Message-ID: <201502210838.t1L8cihZ014339@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: sunpoet Date: Sat Feb 21 08:38:43 2015 New Revision: 379486 URL: https://svnweb.freebsd.org/changeset/ports/379486 QAT: https://qat.redports.org/buildarchive/r379486/ Log: - Fix build with armv6 PR: 197167 Submitted by: <mikael.urankar@gmail.com> Obtained from: https://github.com/google/protobuf/commit/cc0a047384414991009d95ada9e89b9a92aac531 Added: head/devel/protobuf/files/ head/devel/protobuf/files/patch-src-google-protobuf-stubs-atomicops.h (contents, props changed) head/devel/protobuf/files/patch-src-google-protobuf-stubs-atomicops_internals_generic_gcc.h (contents, props changed) Modified: head/devel/protobuf/Makefile Modified: head/devel/protobuf/Makefile ============================================================================== --- head/devel/protobuf/Makefile Sat Feb 21 08:22:28 2015 (r379485) +++ head/devel/protobuf/Makefile Sat Feb 21 08:38:43 2015 (r379486) @@ -15,7 +15,7 @@ LICENSE= BSD3CLAUSE CFLAGS+= -DGOOGLE_PROTOBUF_NO_RTTI GNU_CONFIGURE= yes INSTALL_TARGET= install-strip -ONLY_FOR_ARCHS= amd64 i386 +ONLY_FOR_ARCHS= amd64 armv6 i386 USE_LDCONFIG= yes USES= gmake libtool pathfix pkgconfig tar:bzip2 Added: head/devel/protobuf/files/patch-src-google-protobuf-stubs-atomicops.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/protobuf/files/patch-src-google-protobuf-stubs-atomicops.h Sat Feb 21 08:38:43 2015 (r379486) @@ -0,0 +1,11 @@ +--- src/google/protobuf/stubs/atomicops.h.orig 2014-08-26 03:52:37.000000000 +0800 ++++ src/google/protobuf/stubs/atomicops.h 2015-02-21 11:45:38.816841509 +0800 +@@ -182,6 +182,8 @@ + #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) Added: head/devel/protobuf/files/patch-src-google-protobuf-stubs-atomicops_internals_generic_gcc.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/protobuf/files/patch-src-google-protobuf-stubs-atomicops_internals_generic_gcc.h Sat Feb 21 08:38:43 2015 (r379486) @@ -0,0 +1,20 @@ +--- src/google/protobuf/stubs/atomicops_internals_generic_gcc.h.orig 2014-08-26 03:52:37.000000000 +0800 ++++ src/google/protobuf/stubs/atomicops_internals_generic_gcc.h 2015-02-21 11:38:26.948928195 +0800 +@@ -83,7 +83,7 @@ + } + + inline void Acquire_Store(volatile Atomic32* ptr, Atomic32 value) { +- __atomic_store_n(ptr, value, __ATOMIC_ACQUIRE); ++ __atomic_store_n(ptr, value, __ATOMIC_SEQ_CST); + } + + inline void Release_Store(volatile Atomic32* ptr, Atomic32 value) { +@@ -99,7 +99,7 @@ + } + + inline Atomic32 Release_Load(volatile const Atomic32* ptr) { +- return __atomic_load_n(ptr, __ATOMIC_RELEASE); ++ return __atomic_load_n(ptr, __ATOMIC_SEQ_CST); + } + + #ifdef __LP64__
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201502210838.t1L8cihZ014339>