svn commit: r498740 - in head/databases/cockroach: . files
Steve Wills
swills at FreeBSD.org
Fri Apr 12 20:03:35 UTC 2019
Author: swills
Date: Fri Apr 12 20:03:33 2019
New Revision: 498740
URL: https://svnweb.freebsd.org/changeset/ports/498740
Log:
databases/cockroach: Unbreak, update to 2.0.7
PR: 236478
Submitted by: Dmitri Goutnik <dg at syrec.org> (slightly modified)
Approved by: maintainer timeout (freebsd at jen20.com, >4 weeks)
Added:
head/databases/cockroach/files/patch-src_github.com_cockroachdb_cockroach_c-deps_rocksdb_CMakeLists.txt (contents, props changed)
head/databases/cockroach/files/patch-src_github.com_cockroachdb_cockroach_pkg_storage_engine_rocksdb.go (contents, props changed)
Modified:
head/databases/cockroach/Makefile (contents, props changed)
head/databases/cockroach/distinfo (contents, props changed)
Modified: head/databases/cockroach/Makefile
==============================================================================
--- head/databases/cockroach/Makefile Fri Apr 12 19:43:05 2019 (r498739)
+++ head/databases/cockroach/Makefile Fri Apr 12 20:03:33 2019 (r498740)
@@ -2,7 +2,7 @@
PORTNAME= cockroach
DISTVERSIONPREFIX= v
-DISTVERSION= 2.0.6
+DISTVERSION= 2.0.7
CATEGORIES= databases
MASTER_SITES= https://binaries.cockroachdb.com/
EXTRACT_SUFX= .src.tgz
@@ -13,8 +13,6 @@ COMMENT= Cloud-native SQL database that survive disast
LICENSE= APACHE20
LICENSE_FILE= ${WRKSRC}/src/github.com/cockroachdb/cockroach/LICENSE
-BROKEN= fails to build
-
ONLY_FOR_ARCHS= amd64
ONLY_FOR_ARCHS_REASON= "Only supported on amd64"
@@ -38,9 +36,11 @@ post-patch:
@${REINPLACE_CMD} -e 's|LDFLAGS: -ledit|LDFLAGS: -L${LOCALBASE}/lib -ledit|g' \
-e 's|CPPFLAGS: -Ishim|CPPFLAGS: -I${LOCALBASE}/include -Ishim|g' \
${WRKSRC}/src/github.com/cockroachdb/cockroach/vendor/github.com/knz/go-libedit/unix/editline_unix.go
+ @${REINPLACE_CMD} -e 's|build -i -o|build -o|g' \
+ ${WRKSRC}/src/github.com/cockroachdb/cockroach/Makefile
do-build:
- @${SETENV} -i PATH="${PATH}" \
+ @${SETENV} -i ${MAKE_ENV} \
${MAKE_CMD} -C ${WRKSRC} buildoss
do-install:
Modified: head/databases/cockroach/distinfo
==============================================================================
--- head/databases/cockroach/distinfo Fri Apr 12 19:43:05 2019 (r498739)
+++ head/databases/cockroach/distinfo Fri Apr 12 20:03:33 2019 (r498740)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1538829109
-SHA256 (cockroach-v2.0.6.src.tgz) = fd1d966542565cbeca6c390db6b7afd98bc239e6e2a4602b3edff973be472097
-SIZE (cockroach-v2.0.6.src.tgz) = 45566359
+TIMESTAMP = 1552343259
+SHA256 (cockroach-v2.0.7.src.tgz) = 0aa42e8a87d0b915d6e7a9df39e3bb32eac250c1afc25e37cc36585f3afa081a
+SIZE (cockroach-v2.0.7.src.tgz) = 45565811
Added: head/databases/cockroach/files/patch-src_github.com_cockroachdb_cockroach_c-deps_rocksdb_CMakeLists.txt
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/databases/cockroach/files/patch-src_github.com_cockroachdb_cockroach_c-deps_rocksdb_CMakeLists.txt Fri Apr 12 20:03:33 2019 (r498740)
@@ -0,0 +1,11 @@
+--- src/github.com/cockroachdb/cockroach/c-deps/rocksdb/CMakeLists.txt.orig 2019-04-12 18:43:38 UTC
++++ src/github.com/cockroachdb/cockroach/c-deps/rocksdb/CMakeLists.txt
+@@ -209,7 +209,7 @@ if(HAVE_THREAD_LOCAL)
+ add_definitions(-DROCKSDB_SUPPORT_THREAD_LOCAL)
+ endif()
+
+-option(FAIL_ON_WARNINGS "Treat compile warnings as errors" ON)
++option(FAIL_ON_WARNINGS "Treat compile warnings as errors" OFF)
+ if(FAIL_ON_WARNINGS)
+ if(MSVC)
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /WX")
Added: head/databases/cockroach/files/patch-src_github.com_cockroachdb_cockroach_pkg_storage_engine_rocksdb.go
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/databases/cockroach/files/patch-src_github.com_cockroachdb_cockroach_pkg_storage_engine_rocksdb.go Fri Apr 12 20:03:33 2019 (r498740)
@@ -0,0 +1,29 @@
+--- src/github.com/cockroachdb/cockroach/pkg/storage/engine/rocksdb.go.orig 2018-12-10 15:51:01 UTC
++++ src/github.com/cockroachdb/cockroach/pkg/storage/engine/rocksdb.go
+@@ -1986,22 +1986,22 @@ func (r *rocksDBIterator) Valid() (bool, error) {
+
+ func (r *rocksDBIterator) Next() {
+ r.checkEngineOpen()
+- r.setState(C.DBIterNext(r.iter, false /* skip_current_key_versions */))
++ r.setState(C.DBIterNext(r.iter, C.bool(false) /* skip_current_key_versions */))
+ }
+
+ func (r *rocksDBIterator) Prev() {
+ r.checkEngineOpen()
+- r.setState(C.DBIterPrev(r.iter, false /* skip_current_key_versions */))
++ r.setState(C.DBIterPrev(r.iter, C.bool(false) /* skip_current_key_versions */))
+ }
+
+ func (r *rocksDBIterator) NextKey() {
+ r.checkEngineOpen()
+- r.setState(C.DBIterNext(r.iter, true /* skip_current_key_versions */))
++ r.setState(C.DBIterNext(r.iter, C.bool(true) /* skip_current_key_versions */))
+ }
+
+ func (r *rocksDBIterator) PrevKey() {
+ r.checkEngineOpen()
+- r.setState(C.DBIterPrev(r.iter, true /* skip_current_key_versions */))
++ r.setState(C.DBIterPrev(r.iter, C.bool(true) /* skip_current_key_versions */))
+ }
+
+ func (r *rocksDBIterator) Key() MVCCKey {
More information about the svn-ports-head
mailing list