|
|
|
@ -1,12 +1,12 @@
|
|
|
|
|
Index: src/github.com/cockroachdb/cockroach/Makefile
|
|
|
|
|
--- src/github.com/cockroachdb/cockroach/Makefile.orig 2018-08-27 19:28:14.000000000 +0200
|
|
|
|
|
+++ src/github.com/cockroachdb/cockroach/Makefile 2018-09-01 09:55:54.180753000 +0200
|
|
|
|
|
@@ -972,10 +972,10 @@
|
|
|
|
|
--- src/github.com/cockroachdb/cockroach/Makefile.orig 2019-01-25 18:39:59.684106000 +0100
|
|
|
|
|
+++ src/github.com/cockroachdb/cockroach/Makefile 2019-01-25 18:40:45.767540000 +0100
|
|
|
|
|
@@ -988,10 +988,10 @@
|
|
|
|
|
# For details, see the "Possible timestamp problems with diff-files?" thread on
|
|
|
|
|
# the Git mailing list (http://marc.info/?l=git&m=131687596307197).
|
|
|
|
|
.buildinfo/tag: | .buildinfo
|
|
|
|
|
- @{ git describe --tags --dirty 2> /dev/null || git rev-parse --short HEAD; } | tr -d \\n > $@
|
|
|
|
|
+ @echo "2.1.0.alpha" >$@
|
|
|
|
|
- @{ git describe --tags --dirty --match=v[0-9]* 2> /dev/null || git rev-parse --short HEAD; } | tr -d \\n > $@
|
|
|
|
|
+ @echo "2.1.4" >$@
|
|
|
|
|
|
|
|
|
|
.buildinfo/rev: | .buildinfo
|
|
|
|
|
- @git rev-parse HEAD > $@
|
|
|
|
@ -15,9 +15,9 @@ Index: src/github.com/cockroachdb/cockroach/Makefile
|
|
|
|
|
ifneq ($(GIT_DIR),)
|
|
|
|
|
# If we're in a Git checkout, we update the buildinfo information on every build
|
|
|
|
|
Index: src/github.com/cockroachdb/cockroach/pkg/storage/engine/rocksdb.go
|
|
|
|
|
--- src/github.com/cockroachdb/cockroach/pkg/storage/engine/rocksdb.go.orig 2018-08-27 19:28:15.000000000 +0200
|
|
|
|
|
+++ src/github.com/cockroachdb/cockroach/pkg/storage/engine/rocksdb.go 2018-09-01 09:55:54.181344000 +0200
|
|
|
|
|
@@ -56,6 +56,7 @@
|
|
|
|
|
--- src/github.com/cockroachdb/cockroach/pkg/storage/engine/rocksdb.go.orig 2019-01-21 17:45:39.000000000 +0100
|
|
|
|
|
+++ src/github.com/cockroachdb/cockroach/pkg/storage/engine/rocksdb.go 2019-01-25 18:39:59.684635000 +0100
|
|
|
|
|
@@ -57,6 +57,7 @@
|
|
|
|
|
// #cgo LDFLAGS: -lprotobuf
|
|
|
|
|
// #cgo LDFLAGS: -lrocksdb
|
|
|
|
|
// #cgo LDFLAGS: -lsnappy
|
|
|
|
@ -26,8 +26,8 @@ Index: src/github.com/cockroachdb/cockroach/pkg/storage/engine/rocksdb.go
|
|
|
|
|
// #cgo windows LDFLAGS: -lshlwapi -lrpcrt4
|
|
|
|
|
//
|
|
|
|
|
Index: src/github.com/cockroachdb/cockroach/vendor/github.com/knz/go-libedit/unix/editline_unix.go
|
|
|
|
|
--- src/github.com/cockroachdb/cockroach/vendor/github.com/knz/go-libedit/unix/editline_unix.go.orig 2018-09-01 09:55:54.181581000 +0200
|
|
|
|
|
+++ src/github.com/cockroachdb/cockroach/vendor/github.com/knz/go-libedit/unix/editline_unix.go 2018-09-01 10:04:02.182929000 +0200
|
|
|
|
|
--- src/github.com/cockroachdb/cockroach/vendor/github.com/knz/go-libedit/unix/editline_unix.go.orig 2019-01-21 17:45:50.000000000 +0100
|
|
|
|
|
+++ src/github.com/cockroachdb/cockroach/vendor/github.com/knz/go-libedit/unix/editline_unix.go 2019-01-25 18:39:59.684795000 +0100
|
|
|
|
|
@@ -12,11 +12,9 @@
|
|
|
|
|
"github.com/knz/go-libedit/unix/sigtramp"
|
|
|
|
|
)
|
|
|
|
|