| Andrew Geissler | 6aa7eec | 2023-03-03 12:41:14 -0600 | [diff] [blame^] | 1 | From 5876bd17caac96df70ef400bfeebb155c0bd7359 Mon Sep 17 00:00:00 2001 |
| 2 | From: Changqing Li <changqing.li@windriver.com> |
| 3 | Date: Wed, 8 Feb 2023 10:34:45 +0800 |
| 4 | Subject: [PATCH] Makefile.in: Don't try to run ldconfig |
| 5 | |
| 6 | when ldconfig is not installed on the build host, do_install |
| 7 | will failed with error: |
| 8 | ln -sf nfslock.so.0.1 /mnt/tmp-glibc/work/core2-64-wrs-linux/liblockfile/1.14-r0/image/usr/lib64/nfslock.so.0 |
| 9 | install -m 644 lockfile.h maillock.h /mnt/tmp-glibc/work/core2-64-wrs-linux/liblockfile/1.14-r0/image/usr/include |
| 10 | if test "/mnt/tmp-glibc/work/core2-64-wrs-linux/liblockfile/1.14-r0/image" = ""; then ; fi |
| 11 | if [ "mail" != "" ]; then\ |
| 12 | install -g mail -m 2755 dotlockfile /mnt/tmp-glibc/work/core2-64-wrs-linux/liblockfile/1.14-r0/image/usr/bin;\ |
| 13 | else \ |
| 14 | install -g root -m 755 dotlockfile /mnt/tmp-glibc/work/core2-64-wrs-linux/liblockfile/1.14-r0/image/usr/bin; \ |
| 15 | fi |
| 16 | /bin/sh: -c: line 1: syntax error near unexpected token `;' |
| 17 | /bin/sh: -c: line 1: `if test "/mnt/tmp-glibc/work/core2-64-wrs-linux/liblockfile/1.14-r0/image" = ""; then ; fi' |
| 18 | |
| 19 | Deleted line is not needed for OE, as it is cross-compile. And |
| 20 | it can also fix above error |
| 21 | |
| 22 | Upstream-Status: Inappropriate [oe specific] |
| 23 | |
| 24 | Signed-off-by: Changqing Li <changqing.li@windriver.com> |
| 25 | --- |
| 26 | Makefile.in | 2 -- |
| 27 | 1 file changed, 2 deletions(-) |
| 28 | |
| 29 | diff --git a/Makefile.in b/Makefile.in |
| 30 | index bfa0acb..ae5be56 100644 |
| 31 | --- a/Makefile.in |
| 32 | +++ b/Makefile.in |
| 33 | @@ -58,7 +58,6 @@ install_shared: shared install_static install_common |
| 34 | $(libdir)/liblockfile.so.$(SOVER) |
| 35 | ln -s liblockfile.so.$(SOVER) $(libdir)/liblockfile.so.$(MAJOR) |
| 36 | ln -s liblockfile.so.$(SOVER) $(libdir)/liblockfile.so |
| 37 | - if test "$(DESTDIR)" = ""; then @LDCONFIG@; fi |
| 38 | |
| 39 | install_common: |
| 40 | install -d -m 755 -g root -p $(includedir) |
| 41 | @@ -79,7 +78,6 @@ install_nfslib: nfslib |
| 42 | install -m 755 nfslock.so.$(NFSVER) $(nfslockdir) |
| 43 | ln -sf nfslock.so.$(NFSVER) $(libdir)/nfslock.so |
| 44 | ln -sf nfslock.so.$(NFSVER) $(libdir)/nfslock.so.0 |
| 45 | - if test "$(DESTDIR)" = ""; then @LDCONFIG@; fi |
| 46 | |
| 47 | clean: |
| 48 | rm -f *.a *.o *.so *.so.* dotlockfile |
| 49 | -- |
| 50 | 2.25.1 |
| 51 | |