|
|
|
|
@ -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-04-23 20:29:43.000000000 +0200
|
|
|
|
|
+++ src/github.com/cockroachdb/cockroach/Makefile 2018-05-10 12:25:37.708620000 +0200
|
|
|
|
|
@@ -906,10 +906,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,8 +15,8 @@ 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
|
|
|
|
|
--- src/github.com/cockroachdb/cockroach/pkg/storage/engine/rocksdb.go.orig 2018-04-23 20:29:43.000000000 +0200
|
|
|
|
|
+++ src/github.com/cockroachdb/cockroach/pkg/storage/engine/rocksdb.go 2018-05-10 12:25:37.709089000 +0200
|
|
|
|
|
@@ -54,6 +54,7 @@
|
|
|
|
|
// #cgo LDFLAGS: -lprotobuf
|
|
|
|
|
// #cgo LDFLAGS: -lrocksdb
|
|
|
|
|
@ -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-04-23 20:30:21.000000000 +0200
|
|
|
|
|
+++ src/github.com/cockroachdb/cockroach/vendor/github.com/knz/go-libedit/unix/editline_unix.go 2018-05-10 12:25:37.709303000 +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 <stdlib.h>
|
|
|
|
|
|
