| 1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950515253545556575859606162 |
- Index: src/github.com/cockroachdb/cockroach/Makefile
- --- src/github.com/cockroachdb/cockroach/Makefile.orig 2017-10-12 20:22:12.000000000 +0200
- +++ src/github.com/cockroachdb/cockroach/Makefile 2017-10-12 20:32:30.635711000 +0200
- @@ -157,7 +157,7 @@
-
- $(COCKROACH) build go-install: $(C_LIBS_CCL)
-
- -$(COCKROACH) build buildoss: BUILDMODE = build -i -o $(COCKROACH)
- +$(COCKROACH) build buildoss: BUILDMODE = build -x -i -o $(COCKROACH)
-
- # The build.utcTime format must remain in sync with TimeFormat in pkg/build/info.go.
- $(COCKROACH) build buildoss go-install check test testshort testrace bench: override LINKFLAGS += \
- @@ -361,13 +361,13 @@
- # 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 "1.1.1" >$@
-
- .buildinfo/basebranch: | .buildinfo
- - @git describe --tags --abbrev=0 | tr -d \\n > $@
- + @echo "release-1.1" >$@
-
- .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/build/common.mk
- --- src/github.com/cockroachdb/cockroach/build/common.mk.orig 2017-10-12 20:22:12.000000000 +0200
- +++ src/github.com/cockroachdb/cockroach/build/common.mk 2017-10-12 20:37:46.516897000 +0200
- @@ -402,7 +402,7 @@
- mkdir -p $(SNAPPY_DIR)
- @# NOTE: If you change the CMake flags below, bump the version in
- @# $(C_DEPS_DIR)/snappy-rebuild. See above for rationale.
- - cd $(SNAPPY_DIR) && cmake $(CMAKE_FLAGS) $(SNAPPY_SRC_DIR)
- + cd $(SNAPPY_DIR) && cmake $(CMAKE_FLAGS) $(SNAPPY_SRC_DIR) -DCMAKE_CXX_FLAGS="$(CXX)" -DCMAKE_CXX_FLAGS="$(CXXFLAGS) $(CPPFLAGS)"
-
- $(LIBROACH_DIR)/Makefile: $(C_DEPS_DIR)/libroach-rebuild $(BOOTSTRAP_TARGET)
- rm -rf $(LIBROACH_DIR)
- @@ -434,7 +434,7 @@
-
- .PHONY: librocksdb
- librocksdb: $(ROCKSDB_DIR)/Makefile
- - @$(MAKE) --no-print-directory -C $(ROCKSDB_DIR) rocksdb
- + @$(MAKE) --no-print-directory -C $(ROCKSDB_DIR) rocksdb FORCE_GIT_SHA=0000
-
- .PHONY: libroach
- libroach: $(LIBROACH_DIR)/Makefile
- Index: src/github.com/cockroachdb/cockroach/pkg/storage/engine/rocksdb.go
- --- src/github.com/cockroachdb/cockroach/pkg/storage/engine/rocksdb.go.orig 2017-10-12 20:22:13.000000000 +0200
- +++ src/github.com/cockroachdb/cockroach/pkg/storage/engine/rocksdb.go 2017-10-12 20:32:30.636247000 +0200
- @@ -54,6 +54,7 @@
- // #cgo LDFLAGS: -lprotobuf
- // #cgo LDFLAGS: -lrocksdb
- // #cgo LDFLAGS: -lsnappy
- +// #cgo LDFLAGS: -lstdc++
- // #cgo linux LDFLAGS: -lrt -lpthread
- // #cgo windows LDFLAGS: -lrpcrt4
- //
|
