From owner-svn-ports-head@freebsd.org Sat Dec 17 12:57:15 2016 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 299CBC84541; Sat, 17 Dec 2016 12:57:15 +0000 (UTC) (envelope-from sunpoet@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 mx1.freebsd.org (Postfix) with ESMTPS id 046F419CC; Sat, 17 Dec 2016 12:57:14 +0000 (UTC) (envelope-from sunpoet@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id uBHCvERd077945; Sat, 17 Dec 2016 12:57:14 GMT (envelope-from sunpoet@FreeBSD.org) Received: (from sunpoet@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id uBHCvDUX077941; Sat, 17 Dec 2016 12:57:13 GMT (envelope-from sunpoet@FreeBSD.org) Message-Id: <201612171257.uBHCvDUX077941@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: sunpoet set sender to sunpoet@FreeBSD.org using -f From: Sunpoet Po-Chuan Hsieh Date: Sat, 17 Dec 2016 12:57:13 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r428734 - in head/devel/protobuf: . files X-SVN-Group: ports-head 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.23 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: Sat, 17 Dec 2016 12:57:15 -0000 Author: sunpoet Date: Sat Dec 17 12:57:13 2016 New Revision: 428734 URL: https://svnweb.freebsd.org/changeset/ports/428734 Log: - Allow make test PR: 215346 Submitted by: jbeich Added: head/devel/protobuf/files/patch-src-google-protobuf-testing-zcgunzip.cc (contents, props changed) head/devel/protobuf/files/patch-src-google-protobuf-testing-zcgzip.cc (contents, props changed) 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 Sat Dec 17 12:57:08 2016 (r428733) +++ head/devel/protobuf/Makefile Sat Dec 17 12:57:13 2016 (r428734) @@ -12,17 +12,25 @@ COMMENT= Data interchange format library LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE +TEST_DEPENDS= googlemock>=0:devel/googlemock \ + googletest>=0:devel/googletest + BROKEN_sparc64= fails to compile: no atomic ops available CFLAGS+= -DGOOGLE_PROTOBUF_NO_RTTI GNU_CONFIGURE= yes INSTALL_TARGET= install-strip +TEST_ARGS= ${MAKE_ARGS} ${_MAKE_JOBS} TEST_TARGET= check USE_CSTD= c99 # for audio/clementine-player support USE_LDCONFIG= yes -USES= autoreconf gmake libtool pathfix pkgconfig +USES= autoreconf gmake libtool localbase pathfix pkgconfig GH_ACCOUNT= google USE_GITHUB= yes +post-patch: + @${REINPLACE_CMD} -e 's|^check-local:|disabled-&|' ${WRKSRC}/Makefile.am + @${REINPLACE_CMD} -Ee '/gtest|mock/ s|[^ ]*lib(.*)\.la|-l\1|' ${WRKSRC}/src/Makefile.am + .include Modified: head/devel/protobuf/files/patch-src-google-protobuf-stubs-atomicops.h ============================================================================== --- head/devel/protobuf/files/patch-src-google-protobuf-stubs-atomicops.h Sat Dec 17 12:57:08 2016 (r428733) +++ head/devel/protobuf/files/patch-src-google-protobuf-stubs-atomicops.h Sat Dec 17 12:57:13 2016 (r428734) @@ -1,6 +1,6 @@ ---- src/google/protobuf/stubs/atomicops.h.orig 2015-05-06 14:28:24 UTC +--- src/google/protobuf/stubs/atomicops.h.orig 2016-09-24 02:12:45 UTC +++ src/google/protobuf/stubs/atomicops.h -@@ -202,6 +202,8 @@ GOOGLE_PROTOBUF_ATOMICOPS_ERROR +@@ -202,6 +202,8 @@ Atomic64 Release_Load(volatile const Ato #elif defined(__GNUC__) #if defined(GOOGLE_PROTOBUF_ARCH_IA32) || defined(GOOGLE_PROTOBUF_ARCH_X64) #include Added: head/devel/protobuf/files/patch-src-google-protobuf-testing-zcgunzip.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/protobuf/files/patch-src-google-protobuf-testing-zcgunzip.cc Sat Dec 17 12:57:13 2016 (r428734) @@ -0,0 +1,10 @@ +--- src/google/protobuf/testing/zcgunzip.cc.orig 2016-09-24 02:12:45 UTC ++++ src/google/protobuf/testing/zcgunzip.cc +@@ -42,6 +42,7 @@ + #include + #include + #include ++#include + + #ifdef _WIN32 + #ifndef STDIN_FILENO Added: head/devel/protobuf/files/patch-src-google-protobuf-testing-zcgzip.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/protobuf/files/patch-src-google-protobuf-testing-zcgzip.cc Sat Dec 17 12:57:13 2016 (r428734) @@ -0,0 +1,10 @@ +--- src/google/protobuf/testing/zcgzip.cc.orig 2016-09-24 02:12:45 UTC ++++ src/google/protobuf/testing/zcgzip.cc +@@ -41,6 +41,7 @@ + #include + #include + #include ++#include + + #ifdef _WIN32 + #ifndef STDIN_FILENO