Skip to content

Commit 11a7c78

Browse files
committed
compile-options: Remove option to specify embedded DB
We don't really build with something else then lmdb. Hence, we don't need the option to build with something else. Signed-off-by: Lars Erik Wik <lars.erik.wik@northern.tech>
1 parent f48a6cc commit 11a7c78

File tree

3 files changed

+2
-13
lines changed

3 files changed

+2
-13
lines changed

build-scripts/compile-options

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -92,10 +92,6 @@ export LDFLAGS
9292
DEB_LDFLAGS_APPEND="$LDFLAGS"
9393
export DEB_LDFLAGS_APPEND
9494

95-
# Embedded DB selection
96-
EMBEDDED_DB="lmdb"
97-
98-
9995

10096
############### Fill in build dependencies in DEPS variable ################
10197

@@ -108,7 +104,7 @@ case "$OS_FAMILY" in
108104
solaris|aix) var_append DEPS "libgcc" ;;
109105
esac
110106

111-
var_append DEPS "$EMBEDDED_DB pcre2"
107+
var_append DEPS "lmdb pcre2"
112108

113109
if ! [ "$SYSTEM_SSL" = 1 ]
114110
then

build-scripts/configure

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,8 @@ esac
1515

1616
P=$BUILDPREFIX
1717

18-
ARGS="--prefix=$P --libdir=$P/lib --with-workdir=$P --sysconfdir=/etc --with-openssl=$P --with-pcre2=$P --with-librsync=$P --with-init-script"
18+
ARGS="--prefix=$P --libdir=$P/lib --with-workdir=$P --sysconfdir=/etc --with-lmdb=$P --with-openssl=$P --with-pcre2=$P --with-librsync=$P --with-init-script"
1919

20-
if [ $EMBEDDED_DB = lmdb ]
21-
then
22-
var_append ARGS "--with-lmdb=$P"
23-
fi
2420
case "$DEPS" in
2521
*pthreads-w32*) var_append ARGS "--with-pthreads=$P" ;;
2622
esac

scripts/deptool.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -236,8 +236,6 @@ def deps_list(self, ref="master"):
236236
"""Returns a sorted list of dependencies for given ref, for example: `["lcov", "libgnurx", "pthreads-w32"]`.
237237
Assumes the proper ref is checked out by `self.buildscripts_repo`.
238238
"""
239-
# TODO: get value of $EMBEDDED_DB from file
240-
embedded_db = "lmdb"
241239
if ref == "3.7.x":
242240
options_file = self.buildscripts_repo.get_file(
243241
"build-scripts/install-dependencies"
@@ -264,7 +262,6 @@ def deps_list(self, ref="master"):
264262
# in the middle we also do some clean-ups
265263
only_deps = (
266264
" ".join(only_deps)
267-
.replace("$EMBEDDED_DB", embedded_db)
268265
.replace("libgcc ", "")
269266
.split(" ")
270267
)

0 commit comments

Comments
 (0)