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

liblockfile: fix do_install failure when ldconfig is not installed

Browse Source 
liblockfile do_install task will fail since syntax error when ldconfig
is not installed on the host.

Signed-off-by: Changqing Li <changqing.li@windriver.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
This commit is contained in:
Changqing Li
2023-03-02 13:00:59 +08:00
committed by Armin Kuster
parent 0342b7b6c3
commit 109b546307
2 changed files with 64 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-oe/recipes-extended/liblockfile/liblockfile/0001-Makefile.in-fix-install-failure-on-host-without-ldco.patch
+63
View File
@@ -0,0 +1,63 @@
From db9b4be854bb9a84319b81ce0afecd98f4f84ff7 Mon Sep 17 00:00:00 2001
From: Changqing Li <changqing.li@windriver.com>
Date: Mon, 27 Feb 2023 08:28:21 +0000
Subject: [PATCH] Makefile.in: fix install failure on host without ldconfig
fix syntax error when ldconfig is not installed on host
when ldconfig is not installed on the build host, install will failed with
error:
ln -sf nfslock.so.0.1 /mnt/tmp-glibc/work/core2-64-wrs-linux/liblockfile/1.14-r0/image/usr/lib64/nfslock.so.0
install -m 644 lockfile.h maillock.h /mnt/tmp-glibc/work/core2-64-wrs-linux/liblockfile/1.14-r0/image/usr/include
if test "/mnt/tmp-glibc/work/core2-64-wrs-linux/liblockfile/1.14-r0/image" = ""; then ; fi
if [ "mail" != "" ]; then\
install -g mail -m 2755 dotlockfile /mnt/tmp-glibc/work/core2-64-wrs-linux/liblockfile/1.14-r0/image/usr/bin;\
else \
install -g root -m 755 dotlockfile /mnt/tmp-glibc/work/core2-64-wrs-linux/liblockfile/1.14-r0/image/usr/bin; \
fi
/bin/sh: -c: line 1: syntax error near unexpected token `;'
/bin/sh: -c: line 1: `if test "/mnt/tmp-glibc/work/core2-64-wrs-linux/liblockfile/1.14-r0/image" = ""; then ; fi'
Upstream-Status: Submitted [https://github.com/miquels/liblockfile/pull/21]
Signed-off-by: Changqing Li <changqing.li@windriver.com>
---
Makefile.in | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/Makefile.in b/Makefile.in
index 6e53179..d003899 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -9,6 +9,10 @@ NFSVER = 0.1
CFLAGS = @CFLAGS@ -I.
LDFLAGS = @LDFLAGS@
CC = @CC@
+LDCONFIG = @LDCONFIG@
+ifeq ($(LDCONFIG),)
+ LDCONFIG = ":"
+endif
prefix = $(DESTDIR)@prefix@
exec_prefix = @exec_prefix@
@@ -58,7 +62,7 @@ install_shared: shared install_static install_common
$(libdir)/liblockfile.so.$(SOVER)
ln -s liblockfile.so.$(SOVER) $(libdir)/liblockfile.so.$(MAJOR)
ln -s liblockfile.so.$(SOVER) $(libdir)/liblockfile.so
- if test "$(DESTDIR)" = ""; then @LDCONFIG@; fi
+ if test "$(DESTDIR)" = ""; then $(LDCONFIG); fi
install_common:
install -d -m 755 -g root -p $(includedir)
@@ -79,7 +83,7 @@ install_nfslib: nfslib
install -m 755 nfslock.so.$(NFSVER) $(nfslockdir)
ln -sf nfslock.so.$(NFSVER) $(libdir)/nfslock.so
ln -sf nfslock.so.$(NFSVER) $(libdir)/nfslock.so.0
- if test "$(DESTDIR)" = ""; then @LDCONFIG@; fi
+ if test "$(DESTDIR)" = ""; then $(LDCONFIG); fi
clean:
rm -f *.a *.o *.so *.so.* dotlockfile
--
2.25.1
meta-oe/recipes-extended/liblockfile/liblockfile_1.14.bb
+1
View File
@@ -10,6 +10,7 @@ SRC_URI = "${DEBIAN_MIRROR}/main/libl/liblockfile/liblockfile_1.14.orig.tar.gz \
file://0001-Makefile.in-add-DESTDIR.patch \
file://0001-Makefile.in-install-nfslock-libs.patch \
file://liblockfile-fix-install-so-to-man-dir.patch \
file://0001-Makefile.in-fix-install-failure-on-host-without-ldco.patch \
"
SRC_URI[md5sum] = "420c056ba0cc4d1477e402f70ba2f5eb"