Browse Source

upgrading package: cockroach 19.1.5 -> 19.2.0

master
parent
commit
9b682574ac
  1. 26
      cockroach/cockroach.patch
  2. 4
      cockroach/cockroach.spec

26
cockroach/cockroach.patch

@ -1,7 +1,7 @@
Index: src/github.com/cockroachdb/cockroach/Makefile
--- src/github.com/cockroachdb/cockroach/Makefile.orig 2019-04-29 20:25:52.000000000 +0200
+++ src/github.com/cockroachdb/cockroach/Makefile 2019-04-30 21:00:49.139017000 +0200
@@ -317,11 +317,6 @@
--- src/github.com/cockroachdb/cockroach/Makefile.orig 2019-11-12 05:46:11.000000000 +0100
+++ src/github.com/cockroachdb/cockroach/Makefile 2019-11-13 07:32:06.075798000 +0100
@@ -322,11 +322,6 @@
.SECONDARY: bin/.submodules-initialized
bin/.submodules-initialized:
@ -13,7 +13,7 @@ Index: src/github.com/cockroachdb/cockroach/Makefile
IGNORE_GOVERS :=
@@ -706,8 +701,8 @@
@@ -755,8 +750,8 @@
@echo "NCPUS = $$({ getconf _NPROCESSORS_ONLN || sysctl -n hw.ncpu || nproc; } 2>/dev/null)" >> $@
@echo "UNAME = $$(uname)" >> $@
@echo "HOST_TRIPLE = $$($$($(GO) env CC) -dumpmachine)" >> $@
@ -24,7 +24,7 @@ Index: src/github.com/cockroachdb/cockroach/Makefile
@echo "have-defs = 1" >> $@
$(if $(have-defs),$(info Detected change in build system. Rebooting Make.))
@@ -1050,10 +1045,10 @@
@@ -1123,10 +1118,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
@ -38,9 +38,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 2019-04-29 20:25:53.000000000 +0200
+++ src/github.com/cockroachdb/cockroach/pkg/storage/engine/rocksdb.go 2019-04-30 21:00:49.139917000 +0200
@@ -56,6 +56,7 @@
--- src/github.com/cockroachdb/cockroach/pkg/storage/engine/rocksdb.go.orig 2019-11-12 05:46:12.000000000 +0100
+++ src/github.com/cockroachdb/cockroach/pkg/storage/engine/rocksdb.go 2019-11-13 07:32:06.076237000 +0100
@@ -51,6 +51,7 @@
// #cgo LDFLAGS: -lprotobuf
// #cgo LDFLAGS: -lrocksdb
// #cgo LDFLAGS: -lsnappy
@ -49,10 +49,10 @@ 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 2019-04-29 20:26:06.000000000 +0200
+++ src/github.com/cockroachdb/cockroach/vendor/github.com/knz/go-libedit/unix/editline_unix.go 2019-04-30 21:00:49.140232000 +0200
@@ -26,11 +26,9 @@
"github.com/knz/go-libedit/unix/sigtramp"
--- src/github.com/cockroachdb/cockroach/vendor/github.com/knz/go-libedit/unix/editline_unix.go.orig 2019-11-13 07:32:06.076453000 +0100
+++ src/github.com/cockroachdb/cockroach/vendor/github.com/knz/go-libedit/unix/editline_unix.go 2019-11-13 07:33:44.560035000 +0100
@@ -25,11 +25,9 @@
common "github.com/knz/go-libedit/common"
)
-// #cgo openbsd netbsd freebsd dragonfly darwin LDFLAGS: -ledit
@ -63,6 +63,6 @@ Index: src/github.com/cockroachdb/cockroach/vendor/github.com/knz/go-libedit/uni
+// #cgo freebsd linux LDFLAGS: -lncurses
+// #cgo freebsd linux CFLAGS: -Wno-unused-result -Wno-pointer-sign
+// #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>
// #include <stdio.h>

4
cockroach/cockroach.spec

@ -31,8 +31,8 @@ Distribution: OpenPKG Community
Class: EVAL
Group: Database
License: Apache
Version: 19.1.5
Release: 20191001
Version: 19.2.0
Release: 20191113
# list of sources
Source0: https://binaries.cockroachdb.com/cockroach-v%{version}.src.tgz

Loading…
Cancel
Save