diff options
| author |   Jeroen Roovers <jer@gentoo.org> | 2010-12-31 16:05:37 +0000 |
|---|---|---|
| committer | Jeroen Roovers <jer@gentoo.org> | 2010-12-31 16:05:37 +0000 |
| commit | 5237874fa23f8f1797f71379628e8a93dfa710a8 (patch) | |
| tree | 1dcf895f859981a2c12c458e2ba8dfa4dc4fc5a2 /dev-util/dirdiff | |
| parent | Stable on amd64 wrt bug #350005 (diff) | |
| download | gentoo-2-5237874fa23f8f1797f71379628e8a93dfa710a8.tar.gz gentoo-2-5237874fa23f8f1797f71379628e8a93dfa710a8.tar.bz2 gentoo-2-5237874fa23f8f1797f71379628e8a93dfa710a8.zip | |
Respect LDFLAGS (bug #335171), CC. Build PIC. Set SONAME (bug #214536). Set RDEPEND. Fix missing includes.
(Portage version: 2.2.0_alpha10/cvs/Linux i686)
Diffstat (limited to 'dev-util/dirdiff')
| -rw-r--r-- | dev-util/dirdiff/ChangeLog | 11 | ||||
| -rw-r--r-- | dev-util/dirdiff/dirdiff-2.1-r1.ebuild | 38 | ||||
| -rw-r--r-- | dev-util/dirdiff/files/dirdiff-2.1-include.patch | 10 |
3 files changed, 57 insertions, 2 deletions
diff --git a/dev-util/dirdiff/ChangeLog b/dev-util/dirdiff/ChangeLog index bfc162af11a0..a2b49e3e2ec9 100644 --- a/dev-util/dirdiff/ChangeLog +++ b/dev-util/dirdiff/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for dev-util/dirdiff -# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/dirdiff/ChangeLog,v 1.8 2007/02/09 03:06:13 flameeyes Exp $ +# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-util/dirdiff/ChangeLog,v 1.9 2010/12/31 16:05:37 jer Exp $ + +*dirdiff-2.1-r1 (31 Dec 2010) + + 31 Dec 2010; Jeroen Roovers <jer@gentoo.org> +dirdiff-2.1-r1.ebuild, + +files/dirdiff-2.1-include.patch: + Respect LDFLAGS (bug #335171), CC. Build PIC. Set SONAME (bug #214536). Set + RDEPEND. Fix missing includes. 09 Feb 2007; Diego Pettenò <flameeyes@gentoo.org> ChangeLog: Regenerate digest in Manifest2 format. diff --git a/dev-util/dirdiff/dirdiff-2.1-r1.ebuild b/dev-util/dirdiff/dirdiff-2.1-r1.ebuild new file mode 100644 index 000000000000..f090ef7cbc77 --- /dev/null +++ b/dev-util/dirdiff/dirdiff-2.1-r1.ebuild @@ -0,0 +1,38 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-util/dirdiff/dirdiff-2.1-r1.ebuild,v 1.1 2010/12/31 16:05:37 jer Exp $ + +EAPI="2" + +inherit eutils toolchain-funcs + +DESCRIPTION="A tool for differing and merging directories" +SRC_URI="http://samba.org/ftp/paulus/${P}.tar.gz" +HOMEPAGE="http://samba.org/ftp/paulus/" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~x86" +IUSE="" + +DEPEND="dev-lang/tk + dev-lang/tcl" +RDEPEND="${DEPEND}" + +src_prepare() { + epatch "${FILESDIR}"/${P}-include.patch + sed -i Makefile -e 's|=-O3|+=|g' || die "sed Makefile" +} + +src_compile() { + emake \ + CC=$(tc-getCC) \ + CFLAGS="${CFLAGS} -fPIC ${LDFLAGS} -Wl,-soname,libfilecmp.so.0" \ + || die +} + +src_install() { + dobin dirdiff || die + dolib.so libfilecmp.so.0.0 || die + dodoc README +} diff --git a/dev-util/dirdiff/files/dirdiff-2.1-include.patch b/dev-util/dirdiff/files/dirdiff-2.1-include.patch new file mode 100644 index 000000000000..acaed3cf8026 --- /dev/null +++ b/dev-util/dirdiff/files/dirdiff-2.1-include.patch @@ -0,0 +1,10 @@ +--- a/filecmp.c 2005-04-19 12:22:01.000000000 +0200 ++++ b/filecmp.c 2010-12-30 20:23:24.000000000 +0100 +@@ -11,6 +11,7 @@ + #include <ctype.h> + #include <tcl.h> + #include <sys/fcntl.h> ++#include <unistd.h> /* close() read() */ + + #define BSIZE 32768 + #define MAXTAGLEN 512 /* max tag length for sanity, < BSIZE */ |