You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
45 lines
2.2 KiB
45 lines
2.2 KiB
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 @@ |
|
# 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" >$@ |
|
|
|
.buildinfo/rev: | .buildinfo |
|
- @git rev-parse HEAD > $@ |
|
+ @echo "0000" >$@ |
|
|
|
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 @@ |
|
// #cgo LDFLAGS: -lprotobuf |
|
// #cgo LDFLAGS: -lrocksdb |
|
// #cgo LDFLAGS: -lsnappy |
|
+// #cgo LDFLAGS: -lstdc++ |
|
// #cgo linux LDFLAGS: -lrt -lpthread |
|
// #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 |
|
@@ -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 -D_GNU_SOURCE |
|
+// #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 -D_GNU_SOURCE |
|
// #cgo darwin CPPFLAGS: -D__darwin__=1 |
|
// |
|
// #include <stdlib.h>
|
|
|