diff options
| author | Steve Wills <swills@FreeBSD.org> | 2019-04-13 04:03:33 +0800 |
|---|---|---|
| committer | Steve Wills <swills@FreeBSD.org> | 2019-04-13 04:03:33 +0800 |
| commit | 0088edb80e249501f5acf0da1bfea71f5ce2e914 (patch) | |
| tree | 04b3c02c8a8e9dd0fe94dc578aa89efd390f4f93 | |
| parent | 4e6fff19cdb22bafc74cd72d6a63f8a62f24b327 (diff) | |
| download | freebsd-ports-gnome-0088edb80e249501f5acf0da1bfea71f5ce2e914.tar.gz freebsd-ports-gnome-0088edb80e249501f5acf0da1bfea71f5ce2e914.tar.zst freebsd-ports-gnome-0088edb80e249501f5acf0da1bfea71f5ce2e914.zip | |
databases/cockroach: Unbreak, update to 2.0.7
PR: 236478
Submitted by: Dmitri Goutnik <dg@syrec.org> (slightly modified)
Approved by: maintainer timeout (freebsd@jen20.com, >4 weeks)
4 files changed, 47 insertions, 7 deletions
diff --git a/databases/cockroach/Makefile b/databases/cockroach/Makefile index f87b2682d693..815a40b2181f 100644 --- a/databases/cockroach/Makefile +++ b/databases/cockroach/Makefile @@ -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 disasters 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: diff --git a/databases/cockroach/distinfo b/databases/cockroach/distinfo index 994ac3bfdb7e..f22a06bc36bf 100644 --- a/databases/cockroach/distinfo +++ b/databases/cockroach/distinfo @@ -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 diff --git a/databases/cockroach/files/patch-src_github.com_cockroachdb_cockroach_c-deps_rocksdb_CMakeLists.txt b/databases/cockroach/files/patch-src_github.com_cockroachdb_cockroach_c-deps_rocksdb_CMakeLists.txt new file mode 100644 index 000000000000..2be5c5a8213e --- /dev/null +++ b/databases/cockroach/files/patch-src_github.com_cockroachdb_cockroach_c-deps_rocksdb_CMakeLists.txt @@ -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") diff --git a/databases/cockroach/files/patch-src_github.com_cockroachdb_cockroach_pkg_storage_engine_rocksdb.go b/databases/cockroach/files/patch-src_github.com_cockroachdb_cockroach_pkg_storage_engine_rocksdb.go new file mode 100644 index 000000000000..08151bbb4ffa --- /dev/null +++ b/databases/cockroach/files/patch-src_github.com_cockroachdb_cockroach_pkg_storage_engine_rocksdb.go @@ -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 { |