Attachment #156374 for bug #199951

View | Details | Raw Unified | Return to bug 199951
Collapse All | Expand All




# $FreeBSD$

PORTNAME=	protobuf
PORTVERSION=	2.6.1
CATEGORIES=	devel
MASTER_SITES=	https://protobuf.googlecode.com/svn/rc/ \
		LOCAL/sunpoet

MAINTAINER=	sunpoet@FreeBSD.org
COMMENT=	Data interchange format library

INSTALL_TARGET=	install-strip
ONLY_FOR_ARCHS=	amd64 armv6 i386
USE_LDCONFIG=	yes
USES=		autoreconf gmake libtool pathfix pkgconfig tar:bzip2

USE_GITHUB=	yes
GH_ACCOUNT=	google
GH_PROJECT=	protobuf
GH_TAGNAME=	v${PORTVERSION}

PATHFIX_MAKEFILEIN=	Makefile.am

# Clang will generate code that just doesn't work with clementine-player
# if this isn't compiled as though it were C99.
USE_CSTD=	c99

Lines 1-2 Link Here

(-)distinfo (-2 / +2 lines)
1	SHA256 (protobuf-2.6.0.tar.bz2) = 0a2f8533b2e0587a2b4efce0c4c8aea21bbfae1c41c466634d958dedf580f6aa	1	SHA256 (google-protobuf-2.6.1-v2.6.1_GH0.tar.bz2) = 2667b7cda4a6bc8a09e5463adf3b5984e08d94e72338277affa8594d8b6e5cd1
2	SIZE (protobuf-2.6.0.tar.bz2) = 2021255	2	SIZE (google-protobuf-2.6.1-v2.6.1_GH0.tar.bz2) = 1349051

Lines 1-6 Link Here

(-)files/patch-src-google-protobuf-stubs-atomicops.h (-3 / +3 lines)
1	--- src/google/protobuf/stubs/atomicops.h.orig 2014-08-26 03:52:37.000000000 +0800	1	--- src/google/protobuf/stubs/atomicops.h.orig 2015-05-05 12:55:38 UTC
2	+++ src/google/protobuf/stubs/atomicops.h 2015-02-21 11:45:38.816841509 +0800	2	+++ src/google/protobuf/stubs/atomicops.h
3	@@ -182,6 +182,8 @@	3	@@ -187,6 +187,8 @@ GOOGLE_PROTOBUF_ATOMICOPS_ERROR
4	#elif defined(__GNUC__)	4	#elif defined(__GNUC__)
5	#if defined(GOOGLE_PROTOBUF_ARCH_IA32) \|\| defined(GOOGLE_PROTOBUF_ARCH_X64)	5	#if defined(GOOGLE_PROTOBUF_ARCH_IA32) \|\| defined(GOOGLE_PROTOBUF_ARCH_X64)
6	#include <google/protobuf/stubs/atomicops_internals_x86_gcc.h>	6	#include <google/protobuf/stubs/atomicops_internals_x86_gcc.h>




--- 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__




lib/libprotobuf-lite.a
lib/libprotobuf-lite.so
lib/libprotobuf-lite.so.9
lib/libprotobuf-lite.so.9.0.1
lib/libprotobuf.a
lib/libprotobuf.so
lib/libprotobuf.so.9
lib/libprotobuf.so.9.0.1
lib/libprotoc.a
lib/libprotoc.so
lib/libprotoc.so.9
lib/libprotoc.so.9.0.1
libdata/pkgconfig/protobuf-lite.pc
libdata/pkgconfig/protobuf.pc

Return to bug 199951

Lines 2-11 Link Here

(-)Makefile (-4 / +9 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= protobuf	4	PORTNAME= protobuf
5	PORTVERSION= 2.6.0	5	PORTVERSION= 2.6.1
6	CATEGORIES= devel	6	CATEGORIES= devel
7	MASTER_SITES= https://protobuf.googlecode.com/svn/rc/ \
8	LOCAL/sunpoet
9		7
10	MAINTAINER= sunpoet@FreeBSD.org	8	MAINTAINER= sunpoet@FreeBSD.org
11	COMMENT= Data interchange format library	9	COMMENT= Data interchange format library
Lines 17-24 Link Here
17	INSTALL_TARGET= install-strip	15	INSTALL_TARGET= install-strip
18	ONLY_FOR_ARCHS= amd64 armv6 i386	16	ONLY_FOR_ARCHS= amd64 armv6 i386
19	USE_LDCONFIG= yes	17	USE_LDCONFIG= yes
20	USES= gmake libtool pathfix pkgconfig tar:bzip2	18	USES= autoreconf gmake libtool pathfix pkgconfig tar:bzip2
21		19
		20	USE_GITHUB= yes
		21	GH_ACCOUNT= google
		22	GH_PROJECT= protobuf
		23	GH_TAGNAME= v${PORTVERSION}
		24
		25	PATHFIX_MAKEFILEIN= Makefile.am
		26
22	# Clang will generate code that just doesn't work with clementine-player	27	# Clang will generate code that just doesn't work with clementine-player
23	# if this isn't compiled as though it were C99.	28	# if this isn't compiled as though it were C99.
24	USE_CSTD= c99	29	USE_CSTD= c99

Lines 1-20 Link Here

(-)files/patch-src-google-protobuf-stubs-atomicops_internals_generic_gcc.h (-20 lines)
1	--- src/google/protobuf/stubs/atomicops_internals_generic_gcc.h.orig 2014-08-26 03:52:37.000000000 +0800
2	+++ src/google/protobuf/stubs/atomicops_internals_generic_gcc.h 2015-02-21 11:38:26.948928195 +0800
3	@@ -83,7 +83,7 @@
4	}
5
6	inline void Acquire_Store(volatile Atomic32* ptr, Atomic32 value) {
7	- __atomic_store_n(ptr, value, __ATOMIC_ACQUIRE);
8	+ __atomic_store_n(ptr, value, __ATOMIC_SEQ_CST);
9	}
10
11	inline void Release_Store(volatile Atomic32* ptr, Atomic32 value) {
12	@@ -99,7 +99,7 @@
13	}
14
15	inline Atomic32 Release_Load(volatile const Atomic32* ptr) {
16	- return __atomic_load_n(ptr, __ATOMIC_RELEASE);
17	+ return __atomic_load_n(ptr, __ATOMIC_SEQ_CST);
18	}
19
20	#ifdef __LP64__

Lines 57-70 Link Here

(-)pkg-plist (-3 / +3 lines)
57	lib/libprotobuf-lite.a	57	lib/libprotobuf-lite.a
58	lib/libprotobuf-lite.so	58	lib/libprotobuf-lite.so
59	lib/libprotobuf-lite.so.9	59	lib/libprotobuf-lite.so.9
60	lib/libprotobuf-lite.so.9.0.0	60	lib/libprotobuf-lite.so.9.0.1
61	lib/libprotobuf.a	61	lib/libprotobuf.a
62	lib/libprotobuf.so	62	lib/libprotobuf.so
63	lib/libprotobuf.so.9	63	lib/libprotobuf.so.9
64	lib/libprotobuf.so.9.0.0	64	lib/libprotobuf.so.9.0.1
65	lib/libprotoc.a	65	lib/libprotoc.a
66	lib/libprotoc.so	66	lib/libprotoc.so
67	lib/libprotoc.so.9	67	lib/libprotoc.so.9
68	lib/libprotoc.so.9.0.0	68	lib/libprotoc.so.9.0.1
69	libdata/pkgconfig/protobuf-lite.pc	69	libdata/pkgconfig/protobuf-lite.pc
70	libdata/pkgconfig/protobuf.pc	70	libdata/pkgconfig/protobuf.pc