diff mbox series

[kirkstone,meta-oe,V2] liblockfile: fix do_install failure when ldconfig is not installed

Message ID 20230224043904.3306228-1-changqing.li@windriver.com
State New
Headers show
Series [kirkstone,meta-oe,V2] liblockfile: fix do_install failure when ldconfig is not installed | expand

Commit Message

Changqing Li Feb. 24, 2023, 4:39 a.m. UTC
From: Changqing Li <changqing.li@windriver.com>

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>
---
 ...install-failure-on-host-without-ldco.patch | 62 +++++++++++++++++++
 .../liblockfile/liblockfile_1.14.bb           |  1 +
 2 files changed, 63 insertions(+)
 create mode 100644 meta-oe/recipes-extended/liblockfile/liblockfile/0001-Makefile.in-fix-install-failure-on-host-without-ldco.patch

Comments

akuster808 Feb. 25, 2023, 5:19 p.m. UTC | #1
whats in V2?

-armin

On 2/23/23 11:39 PM, Changqing Li wrote:
> From: Changqing Li <changqing.li@windriver.com>
>
> 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>
> ---
>   ...install-failure-on-host-without-ldco.patch | 62 +++++++++++++++++++
>   .../liblockfile/liblockfile_1.14.bb           |  1 +
>   2 files changed, 63 insertions(+)
>   create mode 100644 meta-oe/recipes-extended/liblockfile/liblockfile/0001-Makefile.in-fix-install-failure-on-host-without-ldco.patch
>
> diff --git a/meta-oe/recipes-extended/liblockfile/liblockfile/0001-Makefile.in-fix-install-failure-on-host-without-ldco.patch b/meta-oe/recipes-extended/liblockfile/liblockfile/0001-Makefile.in-fix-install-failure-on-host-without-ldco.patch
> new file mode 100644
> index 000000000..5103f910d
> --- /dev/null
> +++ b/meta-oe/recipes-extended/liblockfile/liblockfile/0001-Makefile.in-fix-install-failure-on-host-without-ldco.patch
> @@ -0,0 +1,62 @@
> +From 0f78a746fee8553082c73beb2217d08fc5aaaa83 Mon Sep 17 00:00:00 2001
> +From: Changqing Li <changqing.li@windriver.com>
> +Date: Fri, 24 Feb 2023 02:57:35 +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'
> +
> +* only run ldconfig when it exists
> +
> +Upstream-Status: Submitted [https://github.com/miquels/liblockfile/pull/21]
> +
> +Signed-off-by: Changqing Li <changqing.li@windriver.com>
> +---
> + Makefile.in | 5 +++--
> + 1 file changed, 3 insertions(+), 2 deletions(-)
> +
> +diff --git a/Makefile.in b/Makefile.in
> +index bfa0acb..e29763e 100644
> +--- a/Makefile.in
> ++++ b/Makefile.in
> +@@ -9,6 +9,7 @@ NFSVER		= 0.1
> + CFLAGS		= @CFLAGS@ -I.
> + LDFLAGS		= @LDFLAGS@
> + CC		= @CC@
> ++LDCONFIG        = @LDCONFIG@
> +
> + prefix		= $(DESTDIR)@prefix@
> + exec_prefix	= @exec_prefix@
> +@@ -58,7 +59,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)" = "" -a -n "$(LDCONFIG)"; then $(LDCONFIG); fi
> +
> + install_common:
> + 		install -d -m 755 -g root -p $(includedir)
> +@@ -79,7 +80,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)" = "" -a -n "$(LDCONFIG)"; then $(LDCONFIG); fi
> +
> + clean:
> + 		rm -f *.a *.o *.so *.so.* dotlockfile
> +--
> +2.32.0
> +
> diff --git a/meta-oe/recipes-extended/liblockfile/liblockfile_1.14.bb b/meta-oe/recipes-extended/liblockfile/liblockfile_1.14.bb
> index bac3a2c0b..eefc25dc4 100644
> --- a/meta-oe/recipes-extended/liblockfile/liblockfile_1.14.bb
> +++ b/meta-oe/recipes-extended/liblockfile/liblockfile_1.14.bb
> @@ -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"
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#101245): https://lists.openembedded.org/g/openembedded-devel/message/101245
> Mute This Topic: https://lists.openembedded.org/mt/97200207/3616698
> Group Owner: openembedded-devel+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [akuster808@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
Changqing Li Feb. 27, 2023, 2:25 a.m. UTC | #2
On 2/26/23 01:19, akuster808 wrote:
> CAUTION: This email comes from a non Wind River email account!
> Do not click links or open attachments unless you recognize the sender 
> and know the content is safe.
>
> whats in V2?

In V2, I changed to a better solution and upstream it.

https://github.com/miquels/liblockfile/pull/21

Regards

Sandy

>
> -armin
>
> On 2/23/23 11:39 PM, Changqing Li wrote:
>> From: Changqing Li <changqing.li@windriver.com>
>>
>> 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>
>> ---
>>   ...install-failure-on-host-without-ldco.patch | 62 +++++++++++++++++++
>>   .../liblockfile/liblockfile_1.14.bb           |  1 +
>>   2 files changed, 63 insertions(+)
>>   create mode 100644 
>> meta-oe/recipes-extended/liblockfile/liblockfile/0001-Makefile.in-fix-install-failure-on-host-without-ldco.patch
>>
>> diff --git 
>> a/meta-oe/recipes-extended/liblockfile/liblockfile/0001-Makefile.in-fix-install-failure-on-host-without-ldco.patch 
>> b/meta-oe/recipes-extended/liblockfile/liblockfile/0001-Makefile.in-fix-install-failure-on-host-without-ldco.patch 
>>
>> new file mode 100644
>> index 000000000..5103f910d
>> --- /dev/null
>> +++ 
>> b/meta-oe/recipes-extended/liblockfile/liblockfile/0001-Makefile.in-fix-install-failure-on-host-without-ldco.patch
>> @@ -0,0 +1,62 @@
>> +From 0f78a746fee8553082c73beb2217d08fc5aaaa83 Mon Sep 17 00:00:00 2001
>> +From: Changqing Li <changqing.li@windriver.com>
>> +Date: Fri, 24 Feb 2023 02:57:35 +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'
>> +
>> +* only run ldconfig when it exists
>> +
>> +Upstream-Status: Submitted 
>> [https://github.com/miquels/liblockfile/pull/21]
>> +
>> +Signed-off-by: Changqing Li <changqing.li@windriver.com>
>> +---
>> + Makefile.in | 5 +++--
>> + 1 file changed, 3 insertions(+), 2 deletions(-)
>> +
>> +diff --git a/Makefile.in b/Makefile.in
>> +index bfa0acb..e29763e 100644
>> +--- a/Makefile.in
>> ++++ b/Makefile.in
>> +@@ -9,6 +9,7 @@ NFSVER               = 0.1
>> + CFLAGS              = @CFLAGS@ -I.
>> + LDFLAGS             = @LDFLAGS@
>> + CC          = @CC@
>> ++LDCONFIG        = @LDCONFIG@
>> +
>> + prefix              = $(DESTDIR)@prefix@
>> + exec_prefix = @exec_prefix@
>> +@@ -58,7 +59,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)" = "" -a -n "$(LDCONFIG)"; then 
>> $(LDCONFIG); fi
>> +
>> + install_common:
>> +             install -d -m 755 -g root -p $(includedir)
>> +@@ -79,7 +80,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)" = "" -a -n "$(LDCONFIG)"; then 
>> $(LDCONFIG); fi
>> +
>> + clean:
>> +             rm -f *.a *.o *.so *.so.* dotlockfile
>> +--
>> +2.32.0
>> +
>> diff --git a/meta-oe/recipes-extended/liblockfile/liblockfile_1.14.bb 
>> b/meta-oe/recipes-extended/liblockfile/liblockfile_1.14.bb
>> index bac3a2c0b..eefc25dc4 100644
>> --- a/meta-oe/recipes-extended/liblockfile/liblockfile_1.14.bb
>> +++ b/meta-oe/recipes-extended/liblockfile/liblockfile_1.14.bb
>> @@ -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"
>>
>> -=-=-=-=-=-=-=-=-=-=-=-
>> Links: You receive all messages sent to this group.
>> View/Reply Online (#101245): 
>> https://lists.openembedded.org/g/openembedded-devel/message/101245
>> Mute This Topic: https://lists.openembedded.org/mt/97200207/3616698
>> Group Owner: openembedded-devel+owner@lists.openembedded.org
>> Unsubscribe: 
>> https://lists.openembedded.org/g/openembedded-devel/unsub 
>> [akuster808@gmail.com]
>> -=-=-=-=-=-=-=-=-=-=-=-
>>
>
Changqing Li Feb. 27, 2023, 6:38 a.m. UTC | #3
On 2/27/23 10:25, Changqing Li wrote:
>
> On 2/26/23 01:19, akuster808 wrote:
>> CAUTION: This email comes from a non Wind River email account!
>> Do not click links or open attachments unless you recognize the 
>> sender and know the content is safe.
>>
>> whats in V2?
>
> In V2, I changed to a better solution and upstream it.
>
> https://github.com/miquels/liblockfile/pull/21
>
> Regards
>
> Sandy

Hi,

Sorry, this patch still have issue,  please ignore this V2,  I need 
resend an V3.

Regards
Sandy

>
>>
>> -armin
>>
>> On 2/23/23 11:39 PM, Changqing Li wrote:
>>> From: Changqing Li <changqing.li@windriver.com>
>>>
>>> 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>
>>> ---
>>>   ...install-failure-on-host-without-ldco.patch | 62 
>>> +++++++++++++++++++
>>>   .../liblockfile/liblockfile_1.14.bb           |  1 +
>>>   2 files changed, 63 insertions(+)
>>>   create mode 100644 
>>> meta-oe/recipes-extended/liblockfile/liblockfile/0001-Makefile.in-fix-install-failure-on-host-without-ldco.patch
>>>
>>> diff --git 
>>> a/meta-oe/recipes-extended/liblockfile/liblockfile/0001-Makefile.in-fix-install-failure-on-host-without-ldco.patch 
>>> b/meta-oe/recipes-extended/liblockfile/liblockfile/0001-Makefile.in-fix-install-failure-on-host-without-ldco.patch 
>>>
>>> new file mode 100644
>>> index 000000000..5103f910d
>>> --- /dev/null
>>> +++ 
>>> b/meta-oe/recipes-extended/liblockfile/liblockfile/0001-Makefile.in-fix-install-failure-on-host-without-ldco.patch
>>> @@ -0,0 +1,62 @@
>>> +From 0f78a746fee8553082c73beb2217d08fc5aaaa83 Mon Sep 17 00:00:00 2001
>>> +From: Changqing Li <changqing.li@windriver.com>
>>> +Date: Fri, 24 Feb 2023 02:57:35 +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'
>>> +
>>> +* only run ldconfig when it exists
>>> +
>>> +Upstream-Status: Submitted 
>>> [https://github.com/miquels/liblockfile/pull/21]
>>> +
>>> +Signed-off-by: Changqing Li <changqing.li@windriver.com>
>>> +---
>>> + Makefile.in | 5 +++--
>>> + 1 file changed, 3 insertions(+), 2 deletions(-)
>>> +
>>> +diff --git a/Makefile.in b/Makefile.in
>>> +index bfa0acb..e29763e 100644
>>> +--- a/Makefile.in
>>> ++++ b/Makefile.in
>>> +@@ -9,6 +9,7 @@ NFSVER               = 0.1
>>> + CFLAGS              = @CFLAGS@ -I.
>>> + LDFLAGS             = @LDFLAGS@
>>> + CC          = @CC@
>>> ++LDCONFIG        = @LDCONFIG@
>>> +
>>> + prefix              = $(DESTDIR)@prefix@
>>> + exec_prefix = @exec_prefix@
>>> +@@ -58,7 +59,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)" = "" -a -n "$(LDCONFIG)"; then 
>>> $(LDCONFIG); fi
>>> +
>>> + install_common:
>>> +             install -d -m 755 -g root -p $(includedir)
>>> +@@ -79,7 +80,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)" = "" -a -n "$(LDCONFIG)"; then 
>>> $(LDCONFIG); fi
>>> +
>>> + clean:
>>> +             rm -f *.a *.o *.so *.so.* dotlockfile
>>> +--
>>> +2.32.0
>>> +
>>> diff --git 
>>> a/meta-oe/recipes-extended/liblockfile/liblockfile_1.14.bb 
>>> b/meta-oe/recipes-extended/liblockfile/liblockfile_1.14.bb
>>> index bac3a2c0b..eefc25dc4 100644
>>> --- a/meta-oe/recipes-extended/liblockfile/liblockfile_1.14.bb
>>> +++ b/meta-oe/recipes-extended/liblockfile/liblockfile_1.14.bb
>>> @@ -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"
>>>
>>>
>>>
>>
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#101260): https://lists.openembedded.org/g/openembedded-devel/message/101260
> Mute This Topic: https://lists.openembedded.org/mt/97200207/3616873
> Group Owner: openembedded-devel+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [changqing.li@eng.windriver.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
diff mbox series

Patch

diff --git a/meta-oe/recipes-extended/liblockfile/liblockfile/0001-Makefile.in-fix-install-failure-on-host-without-ldco.patch b/meta-oe/recipes-extended/liblockfile/liblockfile/0001-Makefile.in-fix-install-failure-on-host-without-ldco.patch
new file mode 100644
index 000000000..5103f910d
--- /dev/null
+++ b/meta-oe/recipes-extended/liblockfile/liblockfile/0001-Makefile.in-fix-install-failure-on-host-without-ldco.patch
@@ -0,0 +1,62 @@ 
+From 0f78a746fee8553082c73beb2217d08fc5aaaa83 Mon Sep 17 00:00:00 2001
+From: Changqing Li <changqing.li@windriver.com>
+Date: Fri, 24 Feb 2023 02:57:35 +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'
+
+* only run ldconfig when it exists
+
+Upstream-Status: Submitted [https://github.com/miquels/liblockfile/pull/21]
+
+Signed-off-by: Changqing Li <changqing.li@windriver.com>
+---
+ Makefile.in | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index bfa0acb..e29763e 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -9,6 +9,7 @@ NFSVER		= 0.1
+ CFLAGS		= @CFLAGS@ -I.
+ LDFLAGS		= @LDFLAGS@
+ CC		= @CC@
++LDCONFIG        = @LDCONFIG@
+ 
+ prefix		= $(DESTDIR)@prefix@
+ exec_prefix	= @exec_prefix@
+@@ -58,7 +59,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)" = "" -a -n "$(LDCONFIG)"; then $(LDCONFIG); fi
+ 
+ install_common:
+ 		install -d -m 755 -g root -p $(includedir)
+@@ -79,7 +80,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)" = "" -a -n "$(LDCONFIG)"; then $(LDCONFIG); fi
+ 
+ clean:
+ 		rm -f *.a *.o *.so *.so.* dotlockfile
+-- 
+2.32.0
+
diff --git a/meta-oe/recipes-extended/liblockfile/liblockfile_1.14.bb b/meta-oe/recipes-extended/liblockfile/liblockfile_1.14.bb
index bac3a2c0b..eefc25dc4 100644
--- a/meta-oe/recipes-extended/liblockfile/liblockfile_1.14.bb
+++ b/meta-oe/recipes-extended/liblockfile/liblockfile_1.14.bb
@@ -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"