diff options
Diffstat (limited to 'databases/rocksdb/files/patch-Makefile')
| -rw-r--r-- | databases/rocksdb/files/patch-Makefile | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/databases/rocksdb/files/patch-Makefile b/databases/rocksdb/files/patch-Makefile index f6dd90351cbe..6e5141481e6d 100644 --- a/databases/rocksdb/files/patch-Makefile +++ b/databases/rocksdb/files/patch-Makefile @@ -1,6 +1,6 @@ ---- Makefile.orig 2022-10-05 23:40:03 UTC +--- Makefile.orig 2024-06-24 23:48:34 UTC +++ Makefile -@@ -239,19 +239,19 @@ AM_SHARE = $(AM_V_CCLD) $(CXX) $(PLATFORM_SHARED_LDFLA +@@ -91,20 +91,20 @@ $(info $$DEBUG_LEVEL is $(DEBUG_LEVEL), $$LIB_MODE is # Detect what platform we're building on. # Export some common variables that might have been passed as Make variables # instead of environment variables. @@ -16,6 +16,7 @@ - export LIB_MODE="$(LIB_MODE)"; \ - export ROCKSDB_CXX_STANDARD="$(ROCKSDB_CXX_STANDARD)"; \ - export USE_FOLLY="$(USE_FOLLY)"; \ +- export USE_FOLLY_LITE="$(USE_FOLLY_LITE)"; \ - "$(CURDIR)/build_tools/build_detect_platform" "$(CURDIR)/make_config.mk")) +#dummy := $(shell (export ROCKSDB_ROOT="$(CURDIR)"; \ +# export CXXFLAGS="$(EXTRA_CXXFLAGS)"; \ @@ -29,11 +30,12 @@ +# export LIB_MODE="$(LIB_MODE)"; \ +# export ROCKSDB_CXX_STANDARD="$(ROCKSDB_CXX_STANDARD)"; \ +# export USE_FOLLY="$(USE_FOLLY)"; \ ++# export USE_FOLLY_LITE="$(USE_FOLLY_LITE)"; \ +# "$(CURDIR)/build_tools/build_detect_platform" "$(CURDIR)/make_config.mk")) # this file is generated by the previous line to set build flags and sources include make_config.mk -@@ -876,7 +876,7 @@ endif # PLATFORM_SHARED_EXT +@@ -884,7 +884,7 @@ endif # PLATFORM_SHARED_EXT rocksdbjavastatic rocksdbjava install install-static install-shared \ uninstall analyze tools tools_lib check-headers checkout_folly @@ -42,12 +44,12 @@ all_but_some_tests: $(LIBRARY) $(BENCHMARKS) tools tools_lib test_libs $(ROCKSDBTESTS_SUBSET) -@@ -1273,7 +1273,7 @@ package: +@@ -1297,7 +1297,7 @@ $(STATIC_LIBRARY): $(LIB_OBJECTS) # Unit tests and tools # --------------------------------------------------------------------------- $(STATIC_LIBRARY): $(LIB_OBJECTS) - $(AM_V_AR)rm -f $@ $(SHARED1) $(SHARED2) $(SHARED3) $(SHARED4) -+ $(AM_V_AR)rm -f $@ ++ $(AM_V_AR)rm -f $@ # $(SHARED1) $(SHARED2) $(SHARED3) $(SHARED4) $(AM_V_at)$(AR) $(ARFLAGS) $@ $(LIB_OBJECTS) $(STATIC_TEST_LIBRARY): $(TEST_OBJECTS) |