[PATCH] meta-telephony[201705]: libdbi: Add version 0.9.0 to fix osmo-msc build failure

This is merely a historical archive of years 2008-2021, before the migration to mailman3.

A maintained and still updated list archive can be found at https://lists.osmocom.org/hyperkitty/list/gerrit-log@lists.osmocom.org/.

daniel gerrit-no-reply at lists.osmocom.org
Thu Jan 4 08:38:03 UTC 2018


Hello Pau Espin Pedrol,

I'd like you to reexamine a change.  Please visit

    https://gerrit.osmocom.org/5618

to look at the new patch set (#3).

libdbi: Add version 0.9.0 to fix osmo-msc build failure

A patch is needed to fix compilation:
* Link against sqlite3 instead of sqlite for sqlite3
* Disable tests

Remove old libdbi versions and keep/apply the malloc patch

Change-Id: Ia4319c595a1ccb20c87d86c1ab1e58e95da34d7b
---
A recipes-misc/libdbi/files/0001-build-resolve-link-failure-in-sqlite3-module.patch
A recipes-misc/libdbi/files/disable-tests.patch
D recipes-misc/libdbi/libdbi-drivers_0.8.3-1.bb
A recipes-misc/libdbi/libdbi-drivers_0.9.0.bb
D recipes-misc/libdbi/libdbi_0.7.2.bb
D recipes-misc/libdbi/libdbi_0.8.3.bb
A recipes-misc/libdbi/libdbi_0.9.0.bb
7 files changed, 57 insertions(+), 18 deletions(-)


  git pull ssh://gerrit.osmocom.org:29418/meta-telephony refs/changes/18/5618/3

diff --git a/recipes-misc/libdbi/files/0001-build-resolve-link-failure-in-sqlite3-module.patch b/recipes-misc/libdbi/files/0001-build-resolve-link-failure-in-sqlite3-module.patch
new file mode 100644
index 0000000..be897bc
--- /dev/null
+++ b/recipes-misc/libdbi/files/0001-build-resolve-link-failure-in-sqlite3-module.patch
@@ -0,0 +1,28 @@
+From 29ea4fd2c00a3c39ab4de08e3f333d5f4e219569 Mon Sep 17 00:00:00 2001
+Message-Id: <29ea4fd2c00a3c39ab4de08e3f333d5f4e219569.1515054303.git.daniel at totalueberwachung.de>
+From: Jan Engelhardt <jengelh at inai.de>
+Date: Wed, 4 Sep 2013 12:52:32 +0200
+Subject: [PATCH 1/1] build: resolve link failure in sqlite3 module
+
+The sqlite3 backend fails to link because the wrong library name is
+used. (Ideally, libdbi-drivers should use PKG_CHECK_MODULES instead.)
+---
+ acinclude.m4 | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/acinclude.m4 b/acinclude.m4
+index 8e89af8..45db616 100644
+--- a/acinclude.m4
++++ b/acinclude.m4
+@@ -310,7 +310,7 @@ if test "$ac_sqlite3" = "yes"; then
+ 		AC_SEARCH_LIBS_VAR([sqlite3_exec], sqlite3, , , , SQLITE3_LIBS)
+ 		SQLITE3_LDFLAGS=""
+ 	else
+-		SQLITE3_LIBS=-lsqlite
++		SQLITE3_LIBS=-lsqlite3
+ 		SQLITE3_LDFLAGS=-L$ac_sqlite3_libdir
+ 	fi
+ 
+-- 
+2.11.0
+
diff --git a/recipes-misc/libdbi/files/disable-tests.patch b/recipes-misc/libdbi/files/disable-tests.patch
new file mode 100644
index 0000000..a3380e0
--- /dev/null
+++ b/recipes-misc/libdbi/files/disable-tests.patch
@@ -0,0 +1,12 @@
+--- a/Makefile.am	2017-12-29 12:29:35.504078484 +0100
++++ b/Makefile.am	2017-12-29 12:29:44.428146890 +0100
+@@ -4,7 +4,7 @@
+ 
+ ACLOCAL_AMFLAGS = -I m4
+ 
+-SUBDIRS = drivers tests @docs_subdirs@
++SUBDIRS = drivers @docs_subdirs@
+ 
+ EXTRA_DIST = AUTHORS COPYING ChangeLog INSTALL README README.win32 README.osx README.encodings TODO libdbi-drivers.spec.in config.h.in Makefile.w32 autogen.sh fixlt.sh
+ 
+
diff --git a/recipes-misc/libdbi/libdbi-drivers_0.8.3-1.bb b/recipes-misc/libdbi/libdbi-drivers_0.8.3-1.bb
deleted file mode 100644
index deeb56e..0000000
--- a/recipes-misc/libdbi/libdbi-drivers_0.8.3-1.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require ${PN}.inc
-
-PR = "${INC_PR}.1"
-
-SRC_URI[md5sum] = "4de79b323162a5a7652b65b608eca6cd"
-SRC_URI[sha256sum] = "4ab9944398ce769c0deeb64d2f73555c67bc25ccd2ade1ccf552226c7b2acf72"
-
-SRC_URI += "file://memory-corruption-fixes.patch"
diff --git a/recipes-misc/libdbi/libdbi-drivers_0.9.0.bb b/recipes-misc/libdbi/libdbi-drivers_0.9.0.bb
new file mode 100644
index 0000000..389d36b
--- /dev/null
+++ b/recipes-misc/libdbi/libdbi-drivers_0.9.0.bb
@@ -0,0 +1,10 @@
+require ${PN}.inc
+
+PR = "${INC_PR}.0"
+
+SRC_URI[md5sum] = "9f47b960e225eede2cdeaabf7d22f59f"
+SRC_URI[sha256sum] = "43d2eacd573a4faff296fa925dd97fbf2aedbf1ae35c6263478210c61004c854"
+
+SRC_URI += "file://0001-build-resolve-link-failure-in-sqlite3-module.patch \
+	file://disable-tests.patch \
+	file://memory-corruption-fixes.patch"
diff --git a/recipes-misc/libdbi/libdbi_0.7.2.bb b/recipes-misc/libdbi/libdbi_0.7.2.bb
deleted file mode 100644
index d5803c0..0000000
--- a/recipes-misc/libdbi/libdbi_0.7.2.bb
+++ /dev/null
@@ -1,3 +0,0 @@
-require ${PN}.inc
-
-PR = "${INC_PR}.0"
diff --git a/recipes-misc/libdbi/libdbi_0.8.3.bb b/recipes-misc/libdbi/libdbi_0.8.3.bb
deleted file mode 100644
index ec16285..0000000
--- a/recipes-misc/libdbi/libdbi_0.8.3.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require ${PN}.inc
-
-PR = "${INC_PR}.0"
-
-SRC_URI[md5sum] = "ca66db78d479cbfa727cf3245b5864ae"
-SRC_URI[sha256sum] = "72e41856bebb1da7b1fd1e6369358c294913f329c5e594e338b3983e6369a5e3"
-
diff --git a/recipes-misc/libdbi/libdbi_0.9.0.bb b/recipes-misc/libdbi/libdbi_0.9.0.bb
new file mode 100644
index 0000000..e32ef03
--- /dev/null
+++ b/recipes-misc/libdbi/libdbi_0.9.0.bb
@@ -0,0 +1,7 @@
+require ${PN}.inc
+
+PR = "${INC_PR}.0"
+
+SRC_URI[md5sum] = "05e2ceeac4bc85fbe40de8b4b22d9ab3"
+SRC_URI[sha256sum] = "dafb6cdca524c628df832b6dd0bf8fabceb103248edb21762c02d3068fca4503"
+

-- 
To view, visit https://gerrit.osmocom.org/5618
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: newpatchset
Gerrit-Change-Id: Ia4319c595a1ccb20c87d86c1ab1e58e95da34d7b
Gerrit-PatchSet: 3
Gerrit-Project: meta-telephony
Gerrit-Branch: 201705
Gerrit-Owner: daniel <dwillmann at sysmocom.de>
Gerrit-Reviewer: Harald Welte <laforge at gnumonks.org>
Gerrit-Reviewer: Pau Espin Pedrol <pespin at sysmocom.de>
Gerrit-Reviewer: daniel <dwillmann at sysmocom.de>



More information about the gerrit-log mailing list