- updated to 6.29.5 (new soname)

[packages/rocksdb.git] / rocksdb-detect-flags.patch

diff --git a/rocksdb-detect-flags.patch b/rocksdb-detect-flags.patch
index 8bcac1edd9fd2a63f19c458efc7df1d28cc63a6b..80d2b076ae5ea42f7f693cda6eaa09407adc340f 100644 (file)
--- a/rocksdb-detect-flags.patch
+++ b/rocksdb-detect-flags.patch
@@ -1,11 +1,10 @@
---- rocksdb-rocksdb-5.2.1/Makefile.orig        2017-04-28 19:57:40.787056551 +0200
-+++ rocksdb-rocksdb-5.2.1/Makefile     2017-04-28 19:58:43.773722499 +0200
-@@ -140,7 +140,7 @@
- 
- AM_LINK = $(AM_V_CCLD)$(CXX) $^ $(EXEC_LDFLAGS) -o $@ $(LDFLAGS) $(COVERAGEFLAGS)
- # detect what platform we're building on
--dummy := $(shell (export ROCKSDB_ROOT="$(CURDIR)"; export PORTABLE="$(PORTABLE)"; "$(CURDIR)/build_tools/build_detect_platform" "$(CURDIR)/make_config.mk"))
-+dummy := $(shell (export ROCKSDB_ROOT="$(CURDIR)" CFLAGS="$(CFLAGS)"; export PORTABLE="$(PORTABLE)"; "$(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
- CLEAN_FILES += make_config.mk
+--- rocksdb-6.29.5/Makefile.orig       2022-08-21 07:58:56.118421883 +0200
++++ rocksdb-6.29.5/Makefile    2022-08-21 08:00:52.517791294 +0200
+@@ -227,6 +227,7 @@ AM_SHARE = $(AM_V_CCLD) $(CXX) $(PLATFOR
+ # Export some common variables that might have been passed as Make variables
+ # instead of environment variables.
+ dummy := $(shell (export ROCKSDB_ROOT="$(CURDIR)"; \
++                  export CFLAGS="$(EXTRA_CFLAGS)"; \
+                   export CXXFLAGS="$(EXTRA_CXXFLAGS)"; \
+                   export LDFLAGS="$(EXTRA_LDFLAGS)"; \
+                   export COMPILE_WITH_ASAN="$(COMPILE_WITH_ASAN)"; \