diff options
| author |   Pacho Ramos <pacho@gentoo.org> | 2013-10-13 14:17:37 +0000 |
|---|---|---|
| committer | Pacho Ramos <pacho@gentoo.org> | 2013-10-13 14:17:37 +0000 |
| commit | a1371c1ef6e265af11802631c4e70927232ea026 (patch) | |
| tree | c23e0a0b2f5116e44b34749be332bb72df31f694 /app-portage | |
| parent | Fix cross compile issue (#446968) (diff) | |
| download | gentoo-2-a1371c1ef6e265af11802631c4e70927232ea026.tar.gz gentoo-2-a1371c1ef6e265af11802631c4e70927232ea026.tar.bz2 gentoo-2-a1371c1ef6e265af11802631c4e70927232ea026.zip | |
Fix underlinking bug 455758
(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)
Diffstat (limited to 'app-portage')
| -rw-r--r-- | app-portage/deltup/ChangeLog | 6 | ||||
| -rw-r--r-- | app-portage/deltup/deltup-0.4.5-r1.ebuild | 8 | ||||
| -rw-r--r-- | app-portage/deltup/files/deltup-0.4.5-underlink.patch | 11 |
3 files changed, 21 insertions, 4 deletions
diff --git a/app-portage/deltup/ChangeLog b/app-portage/deltup/ChangeLog index 6a206bf6aa53..275ae8b26bd9 100644 --- a/app-portage/deltup/ChangeLog +++ b/app-portage/deltup/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-portage/deltup # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-portage/deltup/ChangeLog,v 1.28 2013/07/20 12:11:44 creffett Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-portage/deltup/ChangeLog,v 1.29 2013/10/13 14:17:37 pacho Exp $ + + 13 Oct 2013; Pacho Ramos <pacho@gentoo.org> + +files/deltup-0.4.5-underlink.patch, deltup-0.4.5-r1.ebuild: + Fix underlinking bug 455758 20 Jul 2013; Chris Reffett <creffett@gentoo.org> -deltup-0.4.4.ebuild: Remove old. diff --git a/app-portage/deltup/deltup-0.4.5-r1.ebuild b/app-portage/deltup/deltup-0.4.5-r1.ebuild index f57e82b6e9f2..653ec4e8fbcb 100644 --- a/app-portage/deltup/deltup-0.4.5-r1.ebuild +++ b/app-portage/deltup/deltup-0.4.5-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-portage/deltup/deltup-0.4.5-r1.ebuild,v 1.1 2013/07/07 13:13:59 creffett Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-portage/deltup/deltup-0.4.5-r1.ebuild,v 1.2 2013/10/13 14:17:37 pacho Exp $ EAPI=5 @@ -25,14 +25,16 @@ RDEPEND="${DEPEND} src_prepare () { epatch "${FILESDIR}"/${PN}-0.4.4-gcc47.patch epatch "${FILESDIR}"/${PN}-0.4.4-zlib-1.2.5.2.patch + epatch "${FILESDIR}"/${PN}-0.4.5-underlink.patch + epatch_user } src_compile () { - emake CXX=$(tc-getCXX) || die "emake getdelta failed" + emake CXX=$(tc-getCXX) } src_install () { - emake DESTDIR="${D}" install || die "emake install failed" + emake DESTDIR="${D}" install dodoc README ChangeLog doman deltup.1 } diff --git a/app-portage/deltup/files/deltup-0.4.5-underlink.patch b/app-portage/deltup/files/deltup-0.4.5-underlink.patch new file mode 100644 index 000000000000..d0637b0caadf --- /dev/null +++ b/app-portage/deltup/files/deltup-0.4.5-underlink.patch @@ -0,0 +1,11 @@ +--- deltup-0.4.5/Makefile.orig 2009-06-26 00:38:01.000000000 +0400 ++++ deltup-0.4.5/Makefile 2013-08-21 07:24:33.606691559 +0400 +@@ -5,7 +5,7 @@ + CC = g++ + + objfiles=bpatch.o bzip2.o file.o system.o tmpstore.o deltup.o +-libs=-lstdc++ -lz -lbz2 -lssl ++libs=-lstdc++ -lz -lbz2 -lcrypto + + #edelta: edelta.cpp deltup + # gcc edelta.cpp ${CXXFLAGS} -o edelta |