diff options
Diffstat (limited to 'meta-oe/recipes-extended/liblockfile/liblockfile-1.09/liblockfile-fix-nfslib-and-soname.patch')
-rw-r--r-- | meta-oe/recipes-extended/liblockfile/liblockfile-1.09/liblockfile-fix-nfslib-and-soname.patch | 54 |
1 files changed, 0 insertions, 54 deletions
diff --git a/meta-oe/recipes-extended/liblockfile/liblockfile-1.09/liblockfile-fix-nfslib-and-soname.patch b/meta-oe/recipes-extended/liblockfile/liblockfile-1.09/liblockfile-fix-nfslib-and-soname.patch deleted file mode 100644 index ffd7a40fab..0000000000 --- a/meta-oe/recipes-extended/liblockfile/liblockfile-1.09/liblockfile-fix-nfslib-and-soname.patch +++ /dev/null | |||
@@ -1,54 +0,0 @@ | |||
1 | Upstream-Status: Inappropriate [no upstream] | ||
2 | |||
3 | * nfslib should use NVER instead of VER | ||
4 | * install the missing soname library | ||
5 | |||
6 | Signed-off-by: Jackie Huang <jackie.huang@windriver.com> | ||
7 | --- | ||
8 | Makefile.in | 9 ++++++--- | ||
9 | 1 files changed, 5 insertions(+), 3 deletions(-) | ||
10 | |||
11 | diff --git a/Makefile.in b/Makefile.in | ||
12 | index 836ca9b..a589fb8 100644 | ||
13 | --- a/Makefile.in | ||
14 | +++ b/Makefile.in | ||
15 | @@ -27,7 +27,7 @@ install: @INSTALL_TARGETS@ | ||
16 | |||
17 | static: liblockfile.a dotlockfile | ||
18 | shared: liblockfile.so dotlockfile | ||
19 | -nfslib: nfslock.so.$(VER) | ||
20 | +nfslib: nfslock.so.$(NVER) | ||
21 | |||
22 | liblockfile.a: lockfile.o | ||
23 | $(AR) rv liblockfile.a lockfile.o | ||
24 | @@ -36,7 +36,7 @@ liblockfile.so: liblockfile.a | ||
25 | $(CC) -fPIC -shared -Wl,-soname,liblockfile.so.1 \ | ||
26 | -o liblockfile.so lockfile.o $(LDFLAGS) -lc | ||
27 | |||
28 | -nfslock.so.$(VER): nfslock.o | ||
29 | +nfslock.so.$(NVER): nfslock.o | ||
30 | $(CC) -fPIC -shared -Wl,-soname,nfslock.so.0 \ | ||
31 | -o nfslock.so.$(NVER) nfslock.o $(LDFLAGS) | ||
32 | |||
33 | @@ -59,6 +59,7 @@ install_shared: shared install_common | ||
34 | install -m 755 liblockfile.so \ | ||
35 | $(ROOT)$(libdir)/liblockfile.so.$(VER) | ||
36 | ln -s liblockfile.so.$(VER) $(ROOT)$(libdir)/liblockfile.so | ||
37 | + ln -s liblockfile.so.$(VER) $(ROOT)$(libdir)/liblockfile.so.1 | ||
38 | if test "$(ROOT)" = ""; then @LDCONFIG@; fi | ||
39 | |||
40 | install_common: | ||
41 | @@ -72,7 +73,9 @@ install_common: | ||
42 | |||
43 | install_nfslib: nfslib | ||
44 | install -d $(ROOT)$(nfslockdir) | ||
45 | - install -m 755 nfslock.so.$(VER) $(ROOT)$(nfslockdir) | ||
46 | + install -m 755 nfslock.so.$(NVER) $(ROOT)$(nfslockdir) | ||
47 | + ln -sf nfslock.so.$(NVER) $(ROOT)$(libdir)/nfslock.so | ||
48 | + ln -sf nfslock.so.$(NVER) $(ROOT)$(libdir)/nfslock.so.0 | ||
49 | if test "$(ROOT)" = ""; then @LDCONFIG@; fi | ||
50 | |||
51 | clean: | ||
52 | -- | ||
53 | 1.7.9.5 | ||
54 | |||