Skip to contentSkip to conversation

package/rocksdb: fix bzip2 option

PATCH New Fabrice Fontaine 3 participants 3 messages Mar 28, 2020 – Apr 7, 2020

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 package/rocksdb: fix bzip2 option

Commit 95bf830e2ae6b5548c17fd3ce6ac1a8d2aa0c8b6 forgot to replace ROCKSDB_CONF_OPTS by ROCKSDB_MAKE_OPTS for BR2_PACKAGE_BZIP2

---
 package/rocksdb/rocksdb.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
package/rocksdb/rocksdb.mk +2 -2
index 8109605916..5f9fd9f1cb 100644
@@ -14,9 +14,9 @@ ROCKSDB_MAKE_OPTS = PORTABLE=1
 
 ifeq ($(BR2_PACKAGE_BZIP2),y)
 ROCKSDB_DEPENDENCIES += bzip2
-ROCKSDB_CONF_OPTS += ROCKSDB_DISABLE_BZ2=0
+ROCKSDB_MAKE_OPTS += ROCKSDB_DISABLE_BZ2=0
 else
-ROCKSDB_CONF_OPTS += ROCKSDB_DISABLE_BZ2=1
+ROCKSDB_MAKE_OPTS += ROCKSDB_DISABLE_BZ2=1
 endif
 
 ifeq ($(BR2_PACKAGE_GFLAGS),y)
Signature · 1 line
2.25.1
#1 lore raw

PATCH 1/1 package/rocksdb: fix bzip2 option

Quoted 7 lines · On Sat, 28 Mar 2020 14:23:26 +0100 Fabrice Fontaine…

Commit 95bf830e2ae6b5548c17fd3ce6ac1a8d2aa0c8b6 forgot to replace ROCKSDB_CONF_OPTS by ROCKSDB_MAKE_OPTS for BR2_PACKAGE_BZIP2

---
 package/rocksdb/rocksdb.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Applied to master, thanks.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com