From f0d5e64482f524bbf617d5c700ba5bfaee0b2b19 Mon Sep 17 00:00:00 2001 From: Bertrand Jacquin Date: Tue, 6 Jul 2010 00:33:47 +0200 Subject: liblockfile for cross compile --- net-libs/liblockfile/files/1.08-stale_lock.patch | 20 +++++++++++ .../liblockfile-1.06-BJA-ldconfig-if-defined.diff | 11 ++++++ .../files/liblockfile-1.06-glibc24.patch | 14 ++++++++ .../files/liblockfile-1.06-respectflags.patch | 18 ++++++++++ .../files/liblockfile-orphan-file.patch | 19 ++++++++++ net-libs/liblockfile/liblockfile-1.06-r2.ebuild | 40 ++++++++++++++++++++++ 6 files changed, 122 insertions(+) create mode 100644 net-libs/liblockfile/files/1.08-stale_lock.patch create mode 100644 net-libs/liblockfile/files/liblockfile-1.06-BJA-ldconfig-if-defined.diff create mode 100644 net-libs/liblockfile/files/liblockfile-1.06-glibc24.patch create mode 100644 net-libs/liblockfile/files/liblockfile-1.06-respectflags.patch create mode 100644 net-libs/liblockfile/files/liblockfile-orphan-file.patch create mode 100644 net-libs/liblockfile/liblockfile-1.06-r2.ebuild (limited to 'net-libs/liblockfile') diff --git a/net-libs/liblockfile/files/1.08-stale_lock.patch b/net-libs/liblockfile/files/1.08-stale_lock.patch new file mode 100644 index 00000000..c64c5259 --- /dev/null +++ b/net-libs/liblockfile/files/1.08-stale_lock.patch @@ -0,0 +1,20 @@ +http://bugs.debian.org/505851 +--- liblockfile-1.08.orig/lockfile.c ++++ liblockfile-1.08/lockfile.c +@@ -391,13 +391,10 @@ + * Without a pid in the lockfile, the lock + * is valid if it is newer than 5 mins. + */ +-#if 0 ++ + if (now < st.st_mtime + 300) + return 0; +-#else +- if (now < st.st_mtime + 10) +- return 0; +-#endif ++ + return -1; + } + + diff --git a/net-libs/liblockfile/files/liblockfile-1.06-BJA-ldconfig-if-defined.diff b/net-libs/liblockfile/files/liblockfile-1.06-BJA-ldconfig-if-defined.diff new file mode 100644 index 00000000..39f3cc92 --- /dev/null +++ b/net-libs/liblockfile/files/liblockfile-1.06-BJA-ldconfig-if-defined.diff @@ -0,0 +1,11 @@ +--- Makefile.in.ori 2009-05-06 13:56:26.000000000 +0200 ++++ Makefile.in 2009-05-06 13:57:20.000000000 +0200 +@@ -58,7 +58,7 @@ + $(ROOT)$(libdir)/liblockfile.so.$(VER) + ln -s liblockfile.so.$(VER) $(ROOT)$(libdir)/liblockfile.so.$(MVER) + ln -s liblockfile.so.$(VER) $(ROOT)$(libdir)/liblockfile.so +- if test "$(ROOT)" = ""; then @LDCONFIG@; fi ++ if test -n "@LDCONFIG@"; then if test "$(ROOT)" = ""; then eval @LDCONFIG@ ; fi ; fi + + install_common: + install -m 644 lockfile.h maillock.h $(ROOT)$(includedir) diff --git a/net-libs/liblockfile/files/liblockfile-1.06-glibc24.patch b/net-libs/liblockfile/files/liblockfile-1.06-glibc24.patch new file mode 100644 index 00000000..8d74decd --- /dev/null +++ b/net-libs/liblockfile/files/liblockfile-1.06-glibc24.patch @@ -0,0 +1,14 @@ +Index: liblockfile-1.06/configure.in +=================================================================== +--- liblockfile-1.06.orig/configure.in ++++ liblockfile-1.06/configure.in +@@ -7,7 +7,7 @@ AC_PROG_CC + + dnl Set Default CFLAGS + if test "$GCC" = "yes"; then +- CFLAGS="$CFLAGS -Wall -D_GNU_SOURCE" ++ CFLAGS="$CFLAGS -Wall" + fi + + TARGETS="static" + diff --git a/net-libs/liblockfile/files/liblockfile-1.06-respectflags.patch b/net-libs/liblockfile/files/liblockfile-1.06-respectflags.patch new file mode 100644 index 00000000..1a8d0eb1 --- /dev/null +++ b/net-libs/liblockfile/files/liblockfile-1.06-respectflags.patch @@ -0,0 +1,18 @@ +Index: liblockfile-1.06/Makefile.in +=================================================================== +--- liblockfile-1.06.orig/Makefile.in ++++ liblockfile-1.06/Makefile.in +@@ -32,11 +32,11 @@ liblockfile.a: lockfile.o + ar rv liblockfile.a lockfile.o + + liblockfile.so: liblockfile.a +- $(CC) -fPIC -shared -Wl,-soname,liblockfile.so.1 \ ++ $(CC) $(LDFLAGS) -fPIC -shared -Wl,-soname,liblockfile.so.1 \ + -o liblockfile.so lockfile.o -lc + + nfslock.so.$(VER): nfslock.o +- $(CC) -fPIC -shared -Wl,-soname,nfslock.so.0 \ ++ $(CC) $(LDFLAGS) -fPIC -shared -Wl,-soname,nfslock.so.0 \ + -o nfslock.so.$(NVER) nfslock.o + + dotlockfile: dotlockfile.o xlockfile.o diff --git a/net-libs/liblockfile/files/liblockfile-orphan-file.patch b/net-libs/liblockfile/files/liblockfile-orphan-file.patch new file mode 100644 index 00000000..4a8c75ac --- /dev/null +++ b/net-libs/liblockfile/files/liblockfile-orphan-file.patch @@ -0,0 +1,19 @@ +diff -ur liblockfile-1.06-orig/Makefile.in liblockfile-1.06/Makefile.in +--- liblockfile-1.06-orig/Makefile.in 2006-11-28 06:19:09.000000000 +0100 ++++ liblockfile-1.06/Makefile.in 2006-11-28 06:24:30.000000000 +0100 +@@ -5,6 +5,7 @@ + # + + VER = 1.0 ++MVER = 1 + NVER = 0.1 + + CFLAGS = @CFLAGS@ -I. +@@ -55,6 +56,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.$(MVER) + ln -s liblockfile.so.$(VER) $(ROOT)$(libdir)/liblockfile.so + if test "$(ROOT)" = ""; then @LDCONFIG@; fi + diff --git a/net-libs/liblockfile/liblockfile-1.06-r2.ebuild b/net-libs/liblockfile/liblockfile-1.06-r2.ebuild new file mode 100644 index 00000000..3dfc0d88 --- /dev/null +++ b/net-libs/liblockfile/liblockfile-1.06-r2.ebuild @@ -0,0 +1,40 @@ +# Copyright 1999-2008 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-libs/liblockfile/liblockfile-1.06-r2.ebuild,v 1.13 2008/09/21 06:33:57 vapier Exp $ + +inherit eutils multilib autotools + +DESCRIPTION="Implements functions designed to lock the standard mailboxes" +HOMEPAGE="http://www.debian.org/" +SRC_URI="mirror://debian/pool/main/libl/${PN}/${PN}_${PV}.tar.gz" + +LICENSE="LGPL-2" +SLOT="0" +KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sh sparc ~sparc-fbsd x86 ~x86-fbsd" +IUSE="" + +src_unpack() { + unpack ${A} + cd "${S}" + + epatch "${FILESDIR}"/${P}-glibc24.patch + epatch "${FILESDIR}"/${P}-respectflags.patch + epatch "${FILESDIR}"/${PN}-orphan-file.patch + epatch "${FILESDIR}"/${P}-BJA-ldconfig-if-defined.diff + + # Rename an internal function so it does not conflict with + # libc's function. + sed -i -e 's/eaccess/egidaccess/g' *.c + + eautoreconf +} + +src_compile() { + econf --with-mailgroup=mail --enable-shared || die + emake || die +} + +src_install() { + dodir /usr/{bin,include,$(get_libdir)} /usr/share/man/{man1,man3} + emake ROOT="${D}" install || die +} -- cgit v1.2.3