Attachment #202803 for bug #236478

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





PORTNAME=	cockroach
DISTVERSIONPREFIX=	v
DISTVERSION=	2.0.7
CATEGORIES=	databases
MASTER_SITES=	https://binaries.cockroachdb.com/
EXTRACT_SUFX=	.src.tgz

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"


	@${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 ${MAKE_ENV} \
		${MAKE_CMD} -C ${WRKSRC} buildoss

do-install:

Lines 1-3 Link Here

(-)databases/cockroach/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1538829109	1	TIMESTAMP = 1552343259
2	SHA256 (cockroach-v2.0.6.src.tgz) = fd1d966542565cbeca6c390db6b7afd98bc239e6e2a4602b3edff973be472097	2	SHA256 (cockroach-v2.0.7.src.tgz) = 0aa42e8a87d0b915d6e7a9df39e3bb32eac250c1afc25e37cc36585f3afa081a
3	SIZE (cockroach-v2.0.6.src.tgz) = 45566359	3	SIZE (cockroach-v2.0.7.src.tgz) = 45565811




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

Return to bug 236478

Lines 2-8 Link Here

(-)databases/cockroach/Makefile (-4 / +4 lines)
2		2
3	PORTNAME= cockroach	3	PORTNAME= cockroach
4	DISTVERSIONPREFIX= v	4	DISTVERSIONPREFIX= v
5	DISTVERSION= 2.0.6	5	DISTVERSION= 2.0.7
6	CATEGORIES= databases	6	CATEGORIES= databases
7	MASTER_SITES= https://binaries.cockroachdb.com/	7	MASTER_SITES= https://binaries.cockroachdb.com/
8	EXTRACT_SUFX= .src.tgz	8	EXTRACT_SUFX= .src.tgz
Lines 13-20 Link Here
13	LICENSE= APACHE20	13	LICENSE= APACHE20
14	LICENSE_FILE= ${WRKSRC}/src/github.com/cockroachdb/cockroach/LICENSE	14	LICENSE_FILE= ${WRKSRC}/src/github.com/cockroachdb/cockroach/LICENSE
15		15
16	BROKEN= fails to build
17
18	ONLY_FOR_ARCHS= amd64	16	ONLY_FOR_ARCHS= amd64
19	ONLY_FOR_ARCHS_REASON= "Only supported on amd64"	17	ONLY_FOR_ARCHS_REASON= "Only supported on amd64"
20		18
Lines 38-46 Link Here
38	@${REINPLACE_CMD} -e 's\|LDFLAGS: -ledit\|LDFLAGS: -L${LOCALBASE}/lib -ledit\|g' \	36	@${REINPLACE_CMD} -e 's\|LDFLAGS: -ledit\|LDFLAGS: -L${LOCALBASE}/lib -ledit\|g' \
39	-e 's\|CPPFLAGS: -Ishim\|CPPFLAGS: -I${LOCALBASE}/include -Ishim\|g' \	37	-e 's\|CPPFLAGS: -Ishim\|CPPFLAGS: -I${LOCALBASE}/include -Ishim\|g' \
40	${WRKSRC}/src/github.com/cockroachdb/cockroach/vendor/github.com/knz/go-libedit/unix/editline_unix.go	38	${WRKSRC}/src/github.com/cockroachdb/cockroach/vendor/github.com/knz/go-libedit/unix/editline_unix.go
		39	@${REINPLACE_CMD} -e 's\|build -i -o\|build -o\|g' \
		40	${WRKSRC}/src/github.com/cockroachdb/cockroach/Makefile
41		41
42	do-build:	42	do-build:
43	@${SETENV} -i PATH="${PATH}" \	43	@${SETENV} -i ${MAKE_ENV} \
44	${MAKE_CMD} -C ${WRKSRC} buildoss	44	${MAKE_CMD} -C ${WRKSRC} buildoss
45		45
46	do-install:	46	do-install:

Line 0 Link Here

(-)databases/cockroach/files/patch-src_github.com_cockroachdb_cockroach_pkg_storage_engine_rocksdb.go (+29 lines)
	1	--- src/github.com/cockroachdb/cockroach/pkg/storage/engine/rocksdb.go.orig 2019-03-11 22:34:49 UTC
	2	+++ src/github.com/cockroachdb/cockroach/pkg/storage/engine/rocksdb.go
	3	@@ -1986,22 +1985,22 @@ func (r *rocksDBIterator) Valid() (bool,
	4
	5	func (r *rocksDBIterator) Next() {
	6	r.checkEngineOpen()
	7	- r.setState(C.DBIterNext(r.iter, false /* skip_current_key_versions */))
	8	+ r.setState(C.DBIterNext(r.iter, C.bool(false) /* skip_current_key_versions */))
	9	}
	10
	11	func (r *rocksDBIterator) Prev() {
	12	r.checkEngineOpen()
	13	- r.setState(C.DBIterPrev(r.iter, false /* skip_current_key_versions */))
	14	+ r.setState(C.DBIterPrev(r.iter, C.bool(false) /* skip_current_key_versions */))
	15	}
	16
	17	func (r *rocksDBIterator) NextKey() {
	18	r.checkEngineOpen()
	19	- r.setState(C.DBIterNext(r.iter, true /* skip_current_key_versions */))
	20	+ r.setState(C.DBIterNext(r.iter, C.bool(true) /* skip_current_key_versions */))
	21	}
	22
	23	func (r *rocksDBIterator) PrevKey() {
	24	r.checkEngineOpen()
	25	- r.setState(C.DBIterPrev(r.iter, true /* skip_current_key_versions */))
	26	+ r.setState(C.DBIterPrev(r.iter, C.bool(true) /* skip_current_key_versions */))
	27	}
	28
	29	func (r *rocksDBIterator) Key() MVCCKey {