diff options
| author |   Victor Ostorga <vostorga@gentoo.org> | 2009-07-11 17:35:56 +0000 |
|---|---|---|
| committer | Victor Ostorga <vostorga@gentoo.org> | 2009-07-11 17:35:56 +0000 |
| commit | d3d252ba003847633d2d63c7227128bf548381bd (patch) | |
| tree | 1af6f9729a9505e854e18a066ea8d5443ecf1020 /dev-util/bdelta | |
| parent | INSTALL.gz -> INSTALL (#272937) (diff) | |
| download | gentoo-2-d3d252ba003847633d2d63c7227128bf548381bd.tar.gz gentoo-2-d3d252ba003847633d2d63c7227128bf548381bd.tar.bz2 gentoo-2-d3d252ba003847633d2d63c7227128bf548381bd.zip | |
Respecting LDFLAGS, wrt bug #246188
(Portage version: 2.1.6.13/cvs/Linux i686)
Diffstat (limited to 'dev-util/bdelta')
| -rw-r--r-- | dev-util/bdelta/ChangeLog | 8 | ||||
| -rw-r--r-- | dev-util/bdelta/bdelta-0.1.0.ebuild | 12 | ||||
| -rw-r--r-- | dev-util/bdelta/files/bdelta-0.1.0-ldflags.patch | 23 |
3 files changed, 36 insertions, 7 deletions
diff --git a/dev-util/bdelta/ChangeLog b/dev-util/bdelta/ChangeLog index 9f586ec300fa..82578c167a2e 100644 --- a/dev-util/bdelta/ChangeLog +++ b/dev-util/bdelta/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-util/bdelta -# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/bdelta/ChangeLog,v 1.6 2007/08/29 18:02:30 genstef Exp $ +# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-util/bdelta/ChangeLog,v 1.7 2009/07/11 17:35:56 vostorga Exp $ + + 11 Jul 2009; Víctor Ostorga <vostorga@gentoo.org> + +files/bdelta-0.1.0-ldflags.patch, bdelta-0.1.0.ebuild: + Respecting LDFLAGS, wrt bug #246188 *bdelta-0.1.0.ebuild (29 Aug 2007) diff --git a/dev-util/bdelta/bdelta-0.1.0.ebuild b/dev-util/bdelta/bdelta-0.1.0.ebuild index f3bca79fce44..e99002b5a66c 100644 --- a/dev-util/bdelta/bdelta-0.1.0.ebuild +++ b/dev-util/bdelta/bdelta-0.1.0.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2007 Gentoo Foundation +# Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/bdelta/bdelta-0.1.0.ebuild,v 1.5 2007/08/29 18:02:30 genstef Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/bdelta/bdelta-0.1.0.ebuild,v 1.6 2009/07/11 17:35:56 vostorga Exp $ -inherit multilib toolchain-funcs +inherit multilib toolchain-funcs eutils DESCRIPTION="Binary Delta - Efficient difference algorithm and format" HOMEPAGE="http://deltup.sourceforge.net" @@ -17,7 +17,9 @@ src_unpack() { unpack ${A} # Set correct libdir sed -i -e "s:\(LIBDIR=\${PREFIX}/\)lib:\1$(get_libdir):" \ - ${S}/Makefile || die "sed failed" + "${S}"/Makefile || die "sed failed" + # Fixing ldflags + epatch "${FILESDIR}"/${P}-ldflags.patch } src_compile() { @@ -26,6 +28,6 @@ src_compile() { src_install() { dodir /usr/$(get_libdir) - make DESTDIR=${D} install || die "make install failed" + make DESTDIR="${D}" install || die "make install failed" dodoc README } diff --git a/dev-util/bdelta/files/bdelta-0.1.0-ldflags.patch b/dev-util/bdelta/files/bdelta-0.1.0-ldflags.patch new file mode 100644 index 000000000000..587dace27415 --- /dev/null +++ b/dev-util/bdelta/files/bdelta-0.1.0-ldflags.patch @@ -0,0 +1,23 @@ +diff -NrU5 bdelta-0.1.0.original/Makefile bdelta-0.1.0/Makefile +--- bdelta-0.1.0.original/Makefile 2009-07-11 10:50:13.000000000 -0600 ++++ bdelta-0.1.0/Makefile 2009-07-11 11:01:30.000000000 -0600 +@@ -4,16 +4,16 @@ + LIBDIR=${PREFIX}/lib + CXXFLAGS=-O2 + + all: bpatch libbdelta.so bdelta + libbdelta.so: libbdelta.cpp container.h +- ${CC} -shared -fPIC ${CXXFLAGS} $< -o $@ ++ ${CC} -shared -fPIC ${CXXFLAGS} ${LDFLAGS} $< -o $@ + bdelta: bdelta.cpp container.h file.h +- ${CC} $< -o $@ ${CXXFLAGS} -L. -lbdelta -lstdc++ ++ ${CC} $< -o $@ ${CXXFLAGS} ${LDFLAGS} -L. -lbdelta -lstdc++ + bpatch: bpatch.cpp file.h + % : %.cpp +- ${CC} $< -o $@ ${CXXFLAGS} -lstdc++ ++ ${CC} $< -o $@ ${CXXFLAGS} ${LDFLAGS} -lstdc++ + install: libbdelta.so bdelta bpatch + mkdir -p $(DESTDIR)$(BINDIR) + install -m 755 libbdelta.so $(DESTDIR)$(LIBDIR) + install -m 755 bdelta $(DESTDIR)$(BINDIR) + install -m 755 bpatch $(DESTDIR)$(BINDIR) |