diff options
Diffstat (limited to 'meta-openembedded/meta-oe/recipes-extended/liblockfile/liblockfile-1.09')
5 files changed, 0 insertions, 168 deletions
diff --git a/meta-openembedded/meta-oe/recipes-extended/liblockfile/liblockfile-1.09/configure.patch b/meta-openembedded/meta-oe/recipes-extended/liblockfile/liblockfile-1.09/configure.patch deleted file mode 100644 index ea13e11d25..0000000000 --- a/meta-openembedded/meta-oe/recipes-extended/liblockfile/liblockfile-1.09/configure.patch +++ /dev/null @@ -1,25 +0,0 @@ - -# -# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher -# - ---- liblockfile-1.05/./configure.in~configure -+++ liblockfile-1.05/./configure.in -@@ -1,4 +1,5 @@ --AC_INIT(lockfile.c) -+AC_INIT -+AC_CONFIG_SRCDIR([lockfile.c]) - AC_CONFIG_HEADER(autoconf.h) - AC_REVISION($Revision: 1.0 $)dnl - -@@ -111,7 +112,8 @@ - AC_SUBST(INSTALL_TARGETS) - AC_SUBST(nfslockdir) - --AC_OUTPUT(\ -+AC_CONFIG_FILES([\ - ./Makefile \ - ./maillock.h \ --) -+]) -+AC_OUTPUT diff --git a/meta-openembedded/meta-oe/recipes-extended/liblockfile/liblockfile-1.09/install.patch b/meta-openembedded/meta-oe/recipes-extended/liblockfile/liblockfile-1.09/install.patch deleted file mode 100644 index a9319ff1e3..0000000000 --- a/meta-openembedded/meta-oe/recipes-extended/liblockfile/liblockfile-1.09/install.patch +++ /dev/null @@ -1,48 +0,0 @@ - -# -# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher -# - ---- liblockfile-1.05/Makefile.in~install -+++ liblockfile-1.05/Makefile.in -@@ -20,6 +20,7 @@ - includedir = @includedir@ - - MAILGROUP = @MAILGROUP@ -+INSTGRP = $(if $(MAILGROUP),-g $(MAILGROUP)) - - all: @TARGETS@ - install: @INSTALL_TARGETS@ -@@ -50,25 +51,27 @@ - $(CC) $(CFLAGS) -c lockfile.c -o xlockfile.o - - install_static: static install_common -+ install -d $(ROOT)$(libdir) - install -m 644 liblockfile.a $(ROOT)$(libdir) - - install_shared: shared install_common -+ install -d $(ROOT)$(libdir) - install -m 755 liblockfile.so \ - $(ROOT)$(libdir)/liblockfile.so.$(VER) - ln -s liblockfile.so.$(VER) $(ROOT)$(libdir)/liblockfile.so - if test "$(ROOT)" = ""; then @LDCONFIG@; fi - - install_common: -+ install -d $(ROOT)$(includedir) - install -m 644 lockfile.h maillock.h $(ROOT)$(includedir) -- if [ "$(MAILGROUP)" != "" ]; then\ -- install -g $(MAILGROUP) -m 2755 dotlockfile $(ROOT)$(bindir);\ -- else \ -- install -g root -m 755 dotlockfile $(ROOT)$(bindir); \ -- fi -+ install -d $(ROOT)$(bindir) -+ install -m 755 $(INSTGRP) dotlockfile $(ROOT)$(bindir) -+ install -d $(ROOT)$(mandir)/man1 $(ROOT)$(mandir)/man3 - install -m 644 *.1 $(ROOT)$(mandir)/man1 - install -m 644 *.3 $(ROOT)$(mandir)/man3 - - install_nfslib: nfslib -+ install -d $(ROOT)$(nfslockdir) - install -m 755 nfslock.so.$(VER) $(ROOT)$(nfslockdir) - if test "$(ROOT)" = ""; then @LDCONFIG@; fi - diff --git a/meta-openembedded/meta-oe/recipes-extended/liblockfile/liblockfile-1.09/ldflags.patch b/meta-openembedded/meta-oe/recipes-extended/liblockfile/liblockfile-1.09/ldflags.patch deleted file mode 100644 index eb1d1478b8..0000000000 --- a/meta-openembedded/meta-oe/recipes-extended/liblockfile/liblockfile-1.09/ldflags.patch +++ /dev/null @@ -1,21 +0,0 @@ - -# -# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher -# - ---- liblockfile-1.05/Makefile.in~ldflags -+++ liblockfile-1.05/Makefile.in -@@ -34,11 +34,11 @@ - - liblockfile.so: liblockfile.a - $(CC) -fPIC -shared -Wl,-soname,liblockfile.so.1 \ -- -o liblockfile.so lockfile.o -lc -+ -o liblockfile.so lockfile.o $(LDFLAGS) -lc - - nfslock.so.$(VER): nfslock.o - $(CC) -fPIC -shared -Wl,-soname,nfslock.so.0 \ -- -o nfslock.so.$(NVER) nfslock.o -+ -o nfslock.so.$(NVER) nfslock.o $(LDFLAGS) - - dotlockfile: dotlockfile.o xlockfile.o - $(CC) $(LDFLAGS) -o dotlockfile dotlockfile.o xlockfile.o diff --git a/meta-openembedded/meta-oe/recipes-extended/liblockfile/liblockfile-1.09/liblockfile-fix-install-so-to-man-dir.patch b/meta-openembedded/meta-oe/recipes-extended/liblockfile/liblockfile-1.09/liblockfile-fix-install-so-to-man-dir.patch deleted file mode 100644 index 27f760c832..0000000000 --- a/meta-openembedded/meta-oe/recipes-extended/liblockfile/liblockfile-1.09/liblockfile-fix-install-so-to-man-dir.patch +++ /dev/null @@ -1,20 +0,0 @@ -Upstream-Status: Inappropriate [no upstream] - -The extend so file is rename from nfslock.so.$(VER) to nfslock.so.$(NVER). That -causes file nfslock.so.0.1 is installed into manual directory. Fix it. - -Signed-off-by: Kai Kang <kai.kang@windriver.com> - -diff --git a/Makefile.in b/Makefile.in -index a589fb8..46a57e8 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -68,7 +68,7 @@ install_common: - install -d $(ROOT)$(bindir) - install -m 755 $(INSTGRP) dotlockfile $(ROOT)$(bindir) - install -d $(ROOT)$(mandir)/man1 $(ROOT)$(mandir)/man3 -- install -m 644 *.1 $(ROOT)$(mandir)/man1 -+ install -m 644 dotlockfile.1 $(ROOT)$(mandir)/man1 - install -m 644 *.3 $(ROOT)$(mandir)/man3 - - install_nfslib: nfslib diff --git a/meta-openembedded/meta-oe/recipes-extended/liblockfile/liblockfile-1.09/liblockfile-fix-nfslib-and-soname.patch b/meta-openembedded/meta-oe/recipes-extended/liblockfile/liblockfile-1.09/liblockfile-fix-nfslib-and-soname.patch deleted file mode 100644 index ffd7a40fab..0000000000 --- a/meta-openembedded/meta-oe/recipes-extended/liblockfile/liblockfile-1.09/liblockfile-fix-nfslib-and-soname.patch +++ /dev/null @@ -1,54 +0,0 @@ -Upstream-Status: Inappropriate [no upstream] - -* nfslib should use NVER instead of VER -* install the missing soname library - -Signed-off-by: Jackie Huang <jackie.huang@windriver.com> ---- - Makefile.in | 9 ++++++--- - 1 files changed, 5 insertions(+), 3 deletions(-) - -diff --git a/Makefile.in b/Makefile.in -index 836ca9b..a589fb8 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -27,7 +27,7 @@ install: @INSTALL_TARGETS@ - - static: liblockfile.a dotlockfile - shared: liblockfile.so dotlockfile --nfslib: nfslock.so.$(VER) -+nfslib: nfslock.so.$(NVER) - - liblockfile.a: lockfile.o - $(AR) rv liblockfile.a lockfile.o -@@ -36,7 +36,7 @@ liblockfile.so: liblockfile.a - $(CC) -fPIC -shared -Wl,-soname,liblockfile.so.1 \ - -o liblockfile.so lockfile.o $(LDFLAGS) -lc - --nfslock.so.$(VER): nfslock.o -+nfslock.so.$(NVER): nfslock.o - $(CC) -fPIC -shared -Wl,-soname,nfslock.so.0 \ - -o nfslock.so.$(NVER) nfslock.o $(LDFLAGS) - -@@ -59,6 +59,7 @@ install_shared: shared install_common - install -m 755 liblockfile.so \ - $(ROOT)$(libdir)/liblockfile.so.$(VER) - ln -s liblockfile.so.$(VER) $(ROOT)$(libdir)/liblockfile.so -+ ln -s liblockfile.so.$(VER) $(ROOT)$(libdir)/liblockfile.so.1 - if test "$(ROOT)" = ""; then @LDCONFIG@; fi - - install_common: -@@ -72,7 +73,9 @@ install_common: - - install_nfslib: nfslib - install -d $(ROOT)$(nfslockdir) -- install -m 755 nfslock.so.$(VER) $(ROOT)$(nfslockdir) -+ install -m 755 nfslock.so.$(NVER) $(ROOT)$(nfslockdir) -+ ln -sf nfslock.so.$(NVER) $(ROOT)$(libdir)/nfslock.so -+ ln -sf nfslock.so.$(NVER) $(ROOT)$(libdir)/nfslock.so.0 - if test "$(ROOT)" = ""; then @LDCONFIG@; fi - - clean: --- -1.7.9.5 - |