Attachment 202803 Details for Bug 236478 – patch file

[patch] patch file

cockroach-2.0.7.patch (text/plain), 3.63 KB, created by Dmitri Goutnik on 2019-03-11 23:54:26 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dmitri Goutnik

Created: 2019-03-11 23:54:26 UTC

Size: 3.63 KB

patch

obsolete

>Index: databases/cockroach/Makefile
>===================================================================
>--- databases/cockroach/Makefile	(revision 495393)
>+++ databases/cockroach/Makefile	(working copy)
>@@ -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 @@
> 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 @@
> 	@${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:
>Index: databases/cockroach/distinfo
>===================================================================
>--- databases/cockroach/distinfo	(revision 495393)
>+++ databases/cockroach/distinfo	(working copy)
>@@ -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
>Index: databases/cockroach/files/patch-src_github.com_cockroachdb_cockroach_pkg_storage_engine_rocksdb.go
>===================================================================
>--- databases/cockroach/files/patch-src_github.com_cockroachdb_cockroach_pkg_storage_engine_rocksdb.go	(nonexistent)
>+++ databases/cockroach/files/patch-src_github.com_cockroachdb_cockroach_pkg_storage_engine_rocksdb.go	(working copy)
>@@ -0,0 +1,29 @@
>+--- src/github.com/cockroachdb/cockroach/pkg/storage/engine/rocksdb.go.orig	2019-03-11 22:34:49 UTC
>++++ src/github.com/cockroachdb/cockroach/pkg/storage/engine/rocksdb.go
>+@@ -1986,22 +1985,22 @@ func (r *rocksDBIterator) Valid() (bool,
>+ 
>+ 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 {
>
>Property changes on: databases/cockroach/files/patch-src_github.com_cockroachdb_cockroach_pkg_storage_engine_rocksdb.go
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property

Flags:

dmgk: maintainer-approval? (freebsd)

Actions: View | Diff

Attachments on bug 236478: 202803