From a4ac66cfed34e49e3272616cd0c06133d3535d40 Mon Sep 17 00:00:00 2001 From: "Ralf S. Engelschall" Date: Tue, 8 May 2018 21:14:43 +0200 Subject: [PATCH] update patchset --- cockroach21/cockroach21.patch | 30 ++++++++++++++++++++++++------ 1 file changed, 24 insertions(+), 6 deletions(-) diff --git a/cockroach21/cockroach21.patch b/cockroach21/cockroach21.patch index 7bc2c82536..723b8fcd71 100644 --- a/cockroach21/cockroach21.patch +++ b/cockroach21/cockroach21.patch @@ -1,7 +1,7 @@ Index: src/github.com/cockroachdb/cockroach/Makefile ---- src/github.com/cockroachdb/cockroach/Makefile.orig 2018-02-15 10:30:01.505809000 +0100 -+++ src/github.com/cockroachdb/cockroach/Makefile 2018-02-15 10:31:43.131470000 +0100 -@@ -907,10 +907,10 @@ +--- src/github.com/cockroachdb/cockroach/Makefile.orig 2018-05-08 01:58:20.000000000 +0200 ++++ src/github.com/cockroachdb/cockroach/Makefile 2018-05-08 20:34:42.127003000 +0200 +@@ -964,10 +964,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 @@ -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-02-15 10:26:02.000000000 +0100 -+++ src/github.com/cockroachdb/cockroach/pkg/storage/engine/rocksdb.go 2018-02-15 10:30:01.506392000 +0100 -@@ -54,6 +54,7 @@ +--- src/github.com/cockroachdb/cockroach/pkg/storage/engine/rocksdb.go.orig 2018-05-08 01:58:21.000000000 +0200 ++++ src/github.com/cockroachdb/cockroach/pkg/storage/engine/rocksdb.go 2018-05-08 20:34:42.127433000 +0200 +@@ -55,6 +55,7 @@ // #cgo LDFLAGS: -lprotobuf // #cgo LDFLAGS: -lrocksdb // #cgo LDFLAGS: -lsnappy @@ -25,3 +25,21 @@ Index: src/github.com/cockroachdb/cockroach/pkg/storage/engine/rocksdb.go // #cgo linux LDFLAGS: -lrt -lpthread // #cgo windows LDFLAGS: -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-05-08 01:58:44.000000000 +0200 ++++ src/github.com/cockroachdb/cockroach/vendor/github.com/knz/go-libedit/unix/editline_unix.go 2018-05-08 21:05:57.217379000 +0200 +@@ -12,11 +12,9 @@ + "github.com/knz/go-libedit/unix/sigtramp" + ) + +-// #cgo openbsd netbsd freebsd dragonfly darwin LDFLAGS: -ledit +-// #cgo openbsd netbsd freebsd dragonfly darwin CPPFLAGS: -Ishim +-// #cgo linux LDFLAGS: -lncurses +-// #cgo linux CFLAGS: -Wno-unused-result +-// #cgo linux CPPFLAGS: -Isrc -Isrc/c-libedit -Isrc/c-libedit/editline -Isrc/c-libedit/linux-build ++// #cgo freebsd linux LDFLAGS: -lncurses ++// #cgo freebsd linux CFLAGS: -Wno-unused-result ++// #cgo freebsd linux CPPFLAGS: -Isrc -Isrc/c-libedit -Isrc/c-libedit/editline -Isrc/c-libedit/linux-build + // #cgo darwin CPPFLAGS: -D__darwin__=1 + // + // #include