diff options
| author | Chris Larson <clarson@kergoth.com> | 2004-11-09 00:36:47 +0000 |
|---|---|---|
| committer | Chris Larson <clarson@kergoth.com> | 2004-11-09 00:36:47 +0000 |
| commit | f96441b9faf769c9ecdd4d338b605ea3d0cc4010 (patch) | |
| tree | edb17ec2c4ea13c5acb1c7350957a249a820e28d /liblockfile/liblockfile-1.05 | |
| parent | b6588aa6851fb220cedc387d21c51513ef8d67f4 (diff) | |
Disable bk EOLN_NATIVE conversions on all files in packages FILESPATHs, to prevent it screwing up patches.
BKrev: 4190111fA4MuVozAqwE7xOSL9fr-TA
Diffstat (limited to 'liblockfile/liblockfile-1.05')
| -rw-r--r-- | liblockfile/liblockfile-1.05/configure.patch | 25 | ||||
| -rw-r--r-- | liblockfile/liblockfile-1.05/install.patch | 48 | ||||
| -rw-r--r-- | liblockfile/liblockfile-1.05/ldflags.patch | 21 |
3 files changed, 94 insertions, 0 deletions
diff --git a/liblockfile/liblockfile-1.05/configure.patch b/liblockfile/liblockfile-1.05/configure.patch index e69de29bb2..5471d43847 100644 --- a/liblockfile/liblockfile-1.05/configure.patch +++ b/liblockfile/liblockfile-1.05/configure.patch @@ -0,0 +1,25 @@ + +# +# 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$)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/liblockfile/liblockfile-1.05/install.patch b/liblockfile/liblockfile-1.05/install.patch index e69de29bb2..a9319ff1e3 100644 --- a/liblockfile/liblockfile-1.05/install.patch +++ b/liblockfile/liblockfile-1.05/install.patch @@ -0,0 +1,48 @@ + +# +# 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/liblockfile/liblockfile-1.05/ldflags.patch b/liblockfile/liblockfile-1.05/ldflags.patch index e69de29bb2..eb1d1478b8 100644 --- a/liblockfile/liblockfile-1.05/ldflags.patch +++ b/liblockfile/liblockfile-1.05/ldflags.patch @@ -0,0 +1,21 @@ + +# +# 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 |