mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-06-04 14:39:54 +00:00
Code Issues Projects Releases Wiki Activity

lmdb: use libprefix in Makefile to install libraries

Browse Source 
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>
This commit is contained in:
Sakib Sajal
2021-08-18 11:28:11 -04:00
committed by Khem Raj
parent b65c646b25
commit 15ee78730a
2 changed files with 36 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-oe/recipes-dbs/lmdb/files/0001-Makefile-use-libprefix-instead-of-libdir.patch
+33
View File
@@ -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
meta-oe/recipes-dbs/lmdb/lmdb_0.9.29.bb
+3 -2
View File
@@ -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
}