* [meta-oe][hardknott][PATCH 1/2] lmdb: add recipe
@ 2021-09-13 21:21 Sakib Sajal
2021-09-13 21:21 ` [meta-oe][hardknott][PATCH 2/2] lmdb: use libprefix in Makefile to install libraries Sakib Sajal
2021-09-13 21:50 ` [oe] [meta-oe][hardknott][PATCH 1/2] lmdb: add recipe Armin Kuster
0 siblings, 2 replies; 4+ messages in thread
From: Sakib Sajal @ 2021-09-13 21:21 UTC (permalink / raw)
To: openembedded-devel
lmdb provides a high-performance embedded transactional
database in the form of a key-value store.
Signed-off-by: Sakib Sajal <sakib.sajal@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
(cherry picked from commit f658a3b40ba0491aab2da3bd9b0d2ae7123a6f90)
Signed-off-by: Sakib Sajal <sakib.sajal@windriver.com>
---
meta-oe/recipes-dbs/lmdb/files/run-ptest | 25 +++++++++++++++
meta-oe/recipes-dbs/lmdb/lmdb_0.9.29.bb | 39 ++++++++++++++++++++++++
2 files changed, 64 insertions(+)
create mode 100644 meta-oe/recipes-dbs/lmdb/files/run-ptest
create mode 100644 meta-oe/recipes-dbs/lmdb/lmdb_0.9.29.bb
diff --git a/meta-oe/recipes-dbs/lmdb/files/run-ptest b/meta-oe/recipes-dbs/lmdb/files/run-ptest
new file mode 100644
index 000000000..a6a7549b9
--- /dev/null
+++ b/meta-oe/recipes-dbs/lmdb/files/run-ptest
@@ -0,0 +1,25 @@
+#!/bin/sh
+
+cd tests
+
+retval=0
+for t in mtest*
+do
+ mkdir testdb
+ ./$t > /dev/null && ./mdb_stat testdb > /dev/null
+ if [ $? -ne 0 ]; then
+ echo "FAIL: $t"
+ retval=$(( ${retval} + 1))
+ else
+ echo "PASS: $t"
+ fi
+ rm -rf testdb
+done
+
+if [ $retval -eq 0 ] ; then
+ echo "PASS: lmdb"
+else
+ echo "FAIL: lmdb"
+fi
+
+exit $retval
\ No newline at end of file
diff --git a/meta-oe/recipes-dbs/lmdb/lmdb_0.9.29.bb b/meta-oe/recipes-dbs/lmdb/lmdb_0.9.29.bb
new file mode 100644
index 000000000..0746da141
--- /dev/null
+++ b/meta-oe/recipes-dbs/lmdb/lmdb_0.9.29.bb
@@ -0,0 +1,39 @@
+# SPDX-FileCopyrightText: 2017-2019 Volker Krause <vkrause@kde.org>
+# SPDX-FileCopyrightText: 2019 Hannah Kiekens <hannahkiekens@gmail.com>
+#
+# SPDX-License-Identifier: MIT
+
+SUMMARY = "Lightning Memory-Mapped Database (LMDB)"
+HOMEPAGE = "https://symas.com/lightning-memory-mapped-database/"
+LICENSE = "OLDAP-2.8"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=153d07ef052c4a37a8fac23bc6031972"
+
+SRC_URI = "git://github.com/LMDB/lmdb.git;nobranch=1 \
+ file://run-ptest \
+"
+
+SRCREV = "LMDB_${PV}"
+
+inherit base ptest
+
+S = "${WORKDIR}/git/libraries/liblmdb"
+
+LDFLAGS += "-Wl,-soname,lib${PN}.so.${PV}"
+
+do_compile() {
+ oe_runmake CC="${CC}" SOEXT=".so.${PV}" LDFLAGS="${LDFLAGS}"
+}
+
+do_install() {
+ oe_runmake CC="${CC}" DESTDIR="${D}" prefix="${prefix}" libprefix="${libdir}" manprefix="${mandir}" SOEXT=".so.${PV}" LDFLAGS="${LDFLAGS}" install
+ cd ${D}/${libdir}
+ ln -s liblmdb.so.${PV} liblmdb.so
+ rm liblmdb.a
+}
+
+do_install_ptest() {
+ install -d ${D}${PTEST_PATH}/tests
+ for test in mtest mtest2 mtest3 mtest4 mtest5 mdb_stat; do
+ install -m 755 ${S}/$test ${D}${PTEST_PATH}/tests
+ done
+}
--
2.25.1
^ permalink raw reply related [flat|nested] 4+ messages in thread* [meta-oe][hardknott][PATCH 2/2] lmdb: use libprefix in Makefile to install libraries
2021-09-13 21:21 [meta-oe][hardknott][PATCH 1/2] lmdb: add recipe Sakib Sajal
@ 2021-09-13 21:21 ` Sakib Sajal
2021-09-13 21:50 ` [oe] [meta-oe][hardknott][PATCH 1/2] lmdb: add recipe Armin Kuster
1 sibling, 0 replies; 4+ messages in thread
From: Sakib Sajal @ 2021-09-13 21:21 UTC (permalink / raw)
To: openembedded-devel
Makefile used libdir which had hardcoded "$(exec_prefix)/lib"
directory to install libraries. This is a problem for MULTILIB
builds as libraries are installed in "lib64" directory.
Hence use libprefix which contains the correct path for installing
libraries.
Signed-off-by: Sakib Sajal <sakib.sajal@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
(cherry picked from commit 15ee78730ae2793c5211562fdac7619279794870)
Signed-off-by: Sakib Sajal <sakib.sajal@windriver.com>
---
...file-use-libprefix-instead-of-libdir.patch | 33 +++++++++++++++++++
meta-oe/recipes-dbs/lmdb/lmdb_0.9.29.bb | 5 +--
2 files changed, 36 insertions(+), 2 deletions(-)
create mode 100644 meta-oe/recipes-dbs/lmdb/files/0001-Makefile-use-libprefix-instead-of-libdir.patch
diff --git a/meta-oe/recipes-dbs/lmdb/files/0001-Makefile-use-libprefix-instead-of-libdir.patch b/meta-oe/recipes-dbs/lmdb/files/0001-Makefile-use-libprefix-instead-of-libdir.patch
new file mode 100644
index 000000000..2cc98e6d6
--- /dev/null
+++ b/meta-oe/recipes-dbs/lmdb/files/0001-Makefile-use-libprefix-instead-of-libdir.patch
@@ -0,0 +1,33 @@
+From 4a11d4d03ef66729d302cc122fa0c693299a7776 Mon Sep 17 00:00:00 2001
+From: Sakib Sajal <sakib.sajal@windriver.com>
+Date: Wed, 18 Aug 2021 10:49:38 -0400
+Subject: [PATCH] Makefile: use libprefix instead of libdir
+
+libdir expands to "$(exec_prefix)/lib" where "lib" is hardcoded.
+This is a problem for builds that enable MULTILIB since libraries
+are to be installed in "lib64" directory. Hence allow the directory
+to be configurable.
+
+Signed-off-by: Sakib Sajal <sakib.sajal@windriver.com>
+---
+ libraries/liblmdb/Makefile | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index f254511..1ec74e6 100644
+--- a/Makefile
++++ b/Makefile
+@@ -46,11 +46,11 @@ all: $(ILIBS) $(PROGS)
+
+ install: $(ILIBS) $(IPROGS) $(IHDRS)
+ mkdir -p $(DESTDIR)$(bindir)
+- mkdir -p $(DESTDIR)$(libdir)
++ mkdir -p $(DESTDIR)$(libprefix)
+ mkdir -p $(DESTDIR)$(includedir)
+ mkdir -p $(DESTDIR)$(mandir)/man1
+ for f in $(IPROGS); do cp $$f $(DESTDIR)$(bindir); done
+- for f in $(ILIBS); do cp $$f $(DESTDIR)$(libdir); done
++ for f in $(ILIBS); do cp $$f $(DESTDIR)$(libprefix); done
+ for f in $(IHDRS); do cp $$f $(DESTDIR)$(includedir); done
+ for f in $(IDOCS); do cp $$f $(DESTDIR)$(mandir)/man1; done
+
diff --git a/meta-oe/recipes-dbs/lmdb/lmdb_0.9.29.bb b/meta-oe/recipes-dbs/lmdb/lmdb_0.9.29.bb
index 0746da141..3c6ffe04e 100644
--- a/meta-oe/recipes-dbs/lmdb/lmdb_0.9.29.bb
+++ b/meta-oe/recipes-dbs/lmdb/lmdb_0.9.29.bb
@@ -10,7 +10,8 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=153d07ef052c4a37a8fac23bc6031972"
SRC_URI = "git://github.com/LMDB/lmdb.git;nobranch=1 \
file://run-ptest \
-"
+ file://0001-Makefile-use-libprefix-instead-of-libdir.patch \
+ "
SRCREV = "LMDB_${PV}"
@@ -26,7 +27,7 @@ do_compile() {
do_install() {
oe_runmake CC="${CC}" DESTDIR="${D}" prefix="${prefix}" libprefix="${libdir}" manprefix="${mandir}" SOEXT=".so.${PV}" LDFLAGS="${LDFLAGS}" install
- cd ${D}/${libdir}
+ cd ${D}${libdir}
ln -s liblmdb.so.${PV} liblmdb.so
rm liblmdb.a
}
--
2.25.1
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [oe] [meta-oe][hardknott][PATCH 1/2] lmdb: add recipe
2021-09-13 21:21 [meta-oe][hardknott][PATCH 1/2] lmdb: add recipe Sakib Sajal
2021-09-13 21:21 ` [meta-oe][hardknott][PATCH 2/2] lmdb: use libprefix in Makefile to install libraries Sakib Sajal
@ 2021-09-13 21:50 ` Armin Kuster
2021-09-14 17:00 ` Sakib Sajal
1 sibling, 1 reply; 4+ messages in thread
From: Armin Kuster @ 2021-09-13 21:50 UTC (permalink / raw)
To: Sakib Sajal, openembedded-devel
On 9/13/21 2:21 PM, Sakib Sajal wrote:
> lmdb provides a high-performance embedded transactional
> database in the form of a key-value store.
Thanks for the patch but adding a new packages is outside the scope of
stable branch maintenance.
- armin
>
> Signed-off-by: Sakib Sajal <sakib.sajal@windriver.com>
> Signed-off-by: Khem Raj <raj.khem@gmail.com>
> (cherry picked from commit f658a3b40ba0491aab2da3bd9b0d2ae7123a6f90)
> Signed-off-by: Sakib Sajal <sakib.sajal@windriver.com>
> ---
> meta-oe/recipes-dbs/lmdb/files/run-ptest | 25 +++++++++++++++
> meta-oe/recipes-dbs/lmdb/lmdb_0.9.29.bb | 39 ++++++++++++++++++++++++
> 2 files changed, 64 insertions(+)
> create mode 100644 meta-oe/recipes-dbs/lmdb/files/run-ptest
> create mode 100644 meta-oe/recipes-dbs/lmdb/lmdb_0.9.29.bb
>
> diff --git a/meta-oe/recipes-dbs/lmdb/files/run-ptest b/meta-oe/recipes-dbs/lmdb/files/run-ptest
> new file mode 100644
> index 000000000..a6a7549b9
> --- /dev/null
> +++ b/meta-oe/recipes-dbs/lmdb/files/run-ptest
> @@ -0,0 +1,25 @@
> +#!/bin/sh
> +
> +cd tests
> +
> +retval=0
> +for t in mtest*
> +do
> + mkdir testdb
> + ./$t > /dev/null && ./mdb_stat testdb > /dev/null
> + if [ $? -ne 0 ]; then
> + echo "FAIL: $t"
> + retval=$(( ${retval} + 1))
> + else
> + echo "PASS: $t"
> + fi
> + rm -rf testdb
> +done
> +
> +if [ $retval -eq 0 ] ; then
> + echo "PASS: lmdb"
> +else
> + echo "FAIL: lmdb"
> +fi
> +
> +exit $retval
> \ No newline at end of file
> diff --git a/meta-oe/recipes-dbs/lmdb/lmdb_0.9.29.bb b/meta-oe/recipes-dbs/lmdb/lmdb_0.9.29.bb
> new file mode 100644
> index 000000000..0746da141
> --- /dev/null
> +++ b/meta-oe/recipes-dbs/lmdb/lmdb_0.9.29.bb
> @@ -0,0 +1,39 @@
> +# SPDX-FileCopyrightText: 2017-2019 Volker Krause <vkrause@kde.org>
> +# SPDX-FileCopyrightText: 2019 Hannah Kiekens <hannahkiekens@gmail.com>
> +#
> +# SPDX-License-Identifier: MIT
> +
> +SUMMARY = "Lightning Memory-Mapped Database (LMDB)"
> +HOMEPAGE = "https://symas.com/lightning-memory-mapped-database/"
> +LICENSE = "OLDAP-2.8"
> +LIC_FILES_CHKSUM = "file://LICENSE;md5=153d07ef052c4a37a8fac23bc6031972"
> +
> +SRC_URI = "git://github.com/LMDB/lmdb.git;nobranch=1 \
> + file://run-ptest \
> +"
> +
> +SRCREV = "LMDB_${PV}"
> +
> +inherit base ptest
> +
> +S = "${WORKDIR}/git/libraries/liblmdb"
> +
> +LDFLAGS += "-Wl,-soname,lib${PN}.so.${PV}"
> +
> +do_compile() {
> + oe_runmake CC="${CC}" SOEXT=".so.${PV}" LDFLAGS="${LDFLAGS}"
> +}
> +
> +do_install() {
> + oe_runmake CC="${CC}" DESTDIR="${D}" prefix="${prefix}" libprefix="${libdir}" manprefix="${mandir}" SOEXT=".so.${PV}" LDFLAGS="${LDFLAGS}" install
> + cd ${D}/${libdir}
> + ln -s liblmdb.so.${PV} liblmdb.so
> + rm liblmdb.a
> +}
> +
> +do_install_ptest() {
> + install -d ${D}${PTEST_PATH}/tests
> + for test in mtest mtest2 mtest3 mtest4 mtest5 mdb_stat; do
> + install -m 755 ${S}/$test ${D}${PTEST_PATH}/tests
> + done
> +}
>
>
>
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [oe] [meta-oe][hardknott][PATCH 1/2] lmdb: add recipe
2021-09-13 21:50 ` [oe] [meta-oe][hardknott][PATCH 1/2] lmdb: add recipe Armin Kuster
@ 2021-09-14 17:00 ` Sakib Sajal
0 siblings, 0 replies; 4+ messages in thread
From: Sakib Sajal @ 2021-09-14 17:00 UTC (permalink / raw)
To: akuster808, openembedded-devel
On 2021-09-13 5:50 p.m., akuster808 wrote:
> [Please note: This e-mail is from an EXTERNAL e-mail address]
>
> On 9/13/21 2:21 PM, Sakib Sajal wrote:
>> lmdb provides a high-performance embedded transactional
>> database in the form of a key-value store.
> Thanks for the patch but adding a new packages is outside the scope of
> stable branch maintenance.
>
> - armin
Thanks for the information. Will try to keep in mind next time!
Sakib
>
>> Signed-off-by: Sakib Sajal <sakib.sajal@windriver.com>
>> Signed-off-by: Khem Raj <raj.khem@gmail.com>
>> (cherry picked from commit f658a3b40ba0491aab2da3bd9b0d2ae7123a6f90)
>> Signed-off-by: Sakib Sajal <sakib.sajal@windriver.com>
>> ---
>> meta-oe/recipes-dbs/lmdb/files/run-ptest | 25 +++++++++++++++
>> meta-oe/recipes-dbs/lmdb/lmdb_0.9.29.bb | 39 ++++++++++++++++++++++++
>> 2 files changed, 64 insertions(+)
>> create mode 100644 meta-oe/recipes-dbs/lmdb/files/run-ptest
>> create mode 100644 meta-oe/recipes-dbs/lmdb/lmdb_0.9.29.bb
>>
>> diff --git a/meta-oe/recipes-dbs/lmdb/files/run-ptest b/meta-oe/recipes-dbs/lmdb/files/run-ptest
>> new file mode 100644
>> index 000000000..a6a7549b9
>> --- /dev/null
>> +++ b/meta-oe/recipes-dbs/lmdb/files/run-ptest
>> @@ -0,0 +1,25 @@
>> +#!/bin/sh
>> +
>> +cd tests
>> +
>> +retval=0
>> +for t in mtest*
>> +do
>> + mkdir testdb
>> + ./$t > /dev/null && ./mdb_stat testdb > /dev/null
>> + if [ $? -ne 0 ]; then
>> + echo "FAIL: $t"
>> + retval=$(( ${retval} + 1))
>> + else
>> + echo "PASS: $t"
>> + fi
>> + rm -rf testdb
>> +done
>> +
>> +if [ $retval -eq 0 ] ; then
>> + echo "PASS: lmdb"
>> +else
>> + echo "FAIL: lmdb"
>> +fi
>> +
>> +exit $retval
>> \ No newline at end of file
>> diff --git a/meta-oe/recipes-dbs/lmdb/lmdb_0.9.29.bb b/meta-oe/recipes-dbs/lmdb/lmdb_0.9.29.bb
>> new file mode 100644
>> index 000000000..0746da141
>> --- /dev/null
>> +++ b/meta-oe/recipes-dbs/lmdb/lmdb_0.9.29.bb
>> @@ -0,0 +1,39 @@
>> +# SPDX-FileCopyrightText: 2017-2019 Volker Krause <vkrause@kde.org>
>> +# SPDX-FileCopyrightText: 2019 Hannah Kiekens <hannahkiekens@gmail.com>
>> +#
>> +# SPDX-License-Identifier: MIT
>> +
>> +SUMMARY = "Lightning Memory-Mapped Database (LMDB)"
>> +HOMEPAGE = "https://symas.com/lightning-memory-mapped-database/"
>> +LICENSE = "OLDAP-2.8"
>> +LIC_FILES_CHKSUM = "file://LICENSE;md5=153d07ef052c4a37a8fac23bc6031972"
>> +
>> +SRC_URI = "git://github.com/LMDB/lmdb.git;nobranch=1 \
>> + file://run-ptest \
>> +"
>> +
>> +SRCREV = "LMDB_${PV}"
>> +
>> +inherit base ptest
>> +
>> +S = "${WORKDIR}/git/libraries/liblmdb"
>> +
>> +LDFLAGS += "-Wl,-soname,lib${PN}.so.${PV}"
>> +
>> +do_compile() {
>> + oe_runmake CC="${CC}" SOEXT=".so.${PV}" LDFLAGS="${LDFLAGS}"
>> +}
>> +
>> +do_install() {
>> + oe_runmake CC="${CC}" DESTDIR="${D}" prefix="${prefix}" libprefix="${libdir}" manprefix="${mandir}" SOEXT=".so.${PV}" LDFLAGS="${LDFLAGS}" install
>> + cd ${D}/${libdir}
>> + ln -s liblmdb.so.${PV} liblmdb.so
>> + rm liblmdb.a
>> +}
>> +
>> +do_install_ptest() {
>> + install -d ${D}${PTEST_PATH}/tests
>> + for test in mtest mtest2 mtest3 mtest4 mtest5 mdb_stat; do
>> + install -m 755 ${S}/$test ${D}${PTEST_PATH}/tests
>> + done
>> +}
>>
>>
>>
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2021-09-14 17:00 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-09-13 21:21 [meta-oe][hardknott][PATCH 1/2] lmdb: add recipe Sakib Sajal
2021-09-13 21:21 ` [meta-oe][hardknott][PATCH 2/2] lmdb: use libprefix in Makefile to install libraries Sakib Sajal
2021-09-13 21:50 ` [oe] [meta-oe][hardknott][PATCH 1/2] lmdb: add recipe Armin Kuster
2021-09-14 17:00 ` Sakib Sajal
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.