softhsm: avoid unnecessary check for native sqlite binary

SoftHSMv2 actually only uses the sqlite library. With the check for the
sqlite3 binary, building with the DB backend would mean depending on
sqlite-native.

Signed-off-by: Jan Luebbe <jlu@pengutronix.de>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Jan Luebbe
2023-01-30 13:34:02 +01:00
committed by Khem Raj
parent df4f8a675f
commit d3a5cfe748
2 changed files with 43 additions and 1 deletions
@@ -0,0 +1,40 @@
From 88d968346184058df18dc69171dcd4fd612c2341 Mon Sep 17 00:00:00 2001
From: Jan Luebbe <sho@stratum0.net>
Date: Mon, 30 Jan 2023 12:48:23 +0100
Subject: [PATCH] avoid unnecessary check for sqlite3 binary
Only the library is used, not the sqlite3 binary. Drop this check to simplify
cross-compilation (as no native sqlite3 binary is needed).
Upstream-Status: Submitted [https://github.com/opendnssec/SoftHSMv2/pull/694]
---
m4/acx_sqlite3.m4 | 6 ------
1 file changed, 6 deletions(-)
diff --git a/m4/acx_sqlite3.m4 b/m4/acx_sqlite3.m4
index fd942a75e1a6..17c126d161f5 100644
--- a/m4/acx_sqlite3.m4
+++ b/m4/acx_sqlite3.m4
@@ -4,19 +4,13 @@ AC_DEFUN([ACX_SQLITE3],[
[
SQLITE3_INCLUDES="-I$withval/include"
SQLITE3_LIBDIRS="-L$withval/lib"
- AC_PATH_PROGS(SQLITE3, sqlite3, sqlite3, $withval/bin)
],[
SQLITE3_INCLUDES=""
SQLITE3_LIBDIRS=""
- AC_PATH_PROGS(SQLITE3, sqlite3, sqlite3, $PATH)
])
- if ! test -x "$SQLITE3"; then
- AC_MSG_ERROR([sqlite3 command not found])
- fi
-
AC_MSG_CHECKING(what are the SQLite3 includes)
AC_MSG_RESULT($SQLITE3_INCLUDES)
--
2.30.2
@@ -5,7 +5,9 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=ef3f77a3507c3d91e75b9f2bdaee4210"
DEPENDS = "sqlite3"
SRC_URI = "https://dist.opendnssec.org/source/softhsm-2.6.1.tar.gz"
SRC_URI = "https://dist.opendnssec.org/source/softhsm-2.6.1.tar.gz \
file://0001-avoid-unnecessary-check-for-sqlite3-binary.patch \
"
SRC_URI[sha256sum] = "61249473054bcd1811519ef9a989a880a7bdcc36d317c9c25457fc614df475f2"
inherit autotools pkgconfig siteinfo