diff options
| author |   Sergei Trofimovich <slyfox@gentoo.org> | 2012-10-02 21:52:26 +0000 |
|---|---|---|
| committer | Sergei Trofimovich <slyfox@gentoo.org> | 2012-10-02 21:52:26 +0000 |
| commit | 45bd3390e1e056a23160f02e94a5f887471cf15a (patch) | |
| tree | efcae1cb6e5d224e7152b07c87e809f7395be9e4 /dev-util/bdelta | |
| parent | stable ppc ppc64, bug #436816 (diff) | |
| download | gentoo-2-45bd3390e1e056a23160f02e94a5f887471cf15a.tar.gz gentoo-2-45bd3390e1e056a23160f02e94a5f887471cf15a.tar.bz2 gentoo-2-45bd3390e1e056a23160f02e94a5f887471cf15a.zip | |
Fix missing soname for libbdelta.so (bug #436990 by Ilya Gordeev).
(Portage version: 2.2.0_alpha124_p5/cvs/Linux x86_64)
Diffstat (limited to 'dev-util/bdelta')
| -rw-r--r-- | dev-util/bdelta/ChangeLog | 8 | ||||
| -rw-r--r-- | dev-util/bdelta/bdelta-0.3.0-r1.ebuild (renamed from dev-util/bdelta/bdelta-0.3.0.ebuild) | 8 | ||||
| -rw-r--r-- | dev-util/bdelta/files/bdelta-0.3.0-soname.patch | 24 |
3 files changed, 37 insertions, 3 deletions
diff --git a/dev-util/bdelta/ChangeLog b/dev-util/bdelta/ChangeLog index 6ab3b827b0c2..7f34f743701e 100644 --- a/dev-util/bdelta/ChangeLog +++ b/dev-util/bdelta/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for dev-util/bdelta # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/bdelta/ChangeLog,v 1.13 2012/09/27 22:13:54 slyfox Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/bdelta/ChangeLog,v 1.14 2012/10/02 21:52:26 slyfox Exp $ + +*bdelta-0.3.0-r1 (02 Oct 2012) + + 02 Oct 2012; Sergei Trofimovich <slyfox@gentoo.org> +bdelta-0.3.0-r1.ebuild, + +files/bdelta-0.3.0-soname.patch, -bdelta-0.3.0.ebuild: + Fix missing soname for libbdelta.so (bug #436990 by Ilya Gordeev). 27 Sep 2012; Sergei Trofimovich <slyfox@gentoo.org> bdelta-0.3.0.ebuild, bdelta-9999.ebuild: diff --git a/dev-util/bdelta/bdelta-0.3.0.ebuild b/dev-util/bdelta/bdelta-0.3.0-r1.ebuild index 0f7d52a87c41..e7693ada6557 100644 --- a/dev-util/bdelta/bdelta-0.3.0.ebuild +++ b/dev-util/bdelta/bdelta-0.3.0-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/bdelta/bdelta-0.3.0.ebuild,v 1.2 2012/09/27 22:13:54 slyfox Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/bdelta/bdelta-0.3.0-r1.ebuild,v 1.1 2012/10/02 21:52:26 slyfox Exp $ EAPI=4 @@ -12,7 +12,7 @@ else UNPACKER_ECLASS="vcs-snapshot" fi -inherit multilib toolchain-funcs ${UNPACKER_ECLASS} +inherit eutils multilib toolchain-funcs ${UNPACKER_ECLASS} if [[ -z ${LIVE_EBUILD} ]]; then KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86 ~x86-linux" @@ -26,6 +26,10 @@ SLOT="0" LICENSE="GPL-2" IUSE="" +src_prepare() { + epatch "${FILESDIR}"/${P}-soname.patch +} + src_compile() { emake -C src \ CXX="$(tc-getCXX)" \ diff --git a/dev-util/bdelta/files/bdelta-0.3.0-soname.patch b/dev-util/bdelta/files/bdelta-0.3.0-soname.patch new file mode 100644 index 000000000000..ed7c320485f1 --- /dev/null +++ b/dev-util/bdelta/files/bdelta-0.3.0-soname.patch @@ -0,0 +1,24 @@ +Gentoo-bug: https://bugs.gentoo.org/show_bug.cgi?id=436990 +Reported-by: lya Gordeev + +Assign simple soname to library. +diff --git a/src/Makefile b/src/Makefile +index 18a28e8..1b16203 100644 +--- a/src/Makefile ++++ b/src/Makefile +@@ -3,13 +3,14 @@ PREFIX ?= /usr + BINDIR ?= $(PREFIX)/bin + LIBDIR ?= ${PREFIX}/lib + CXXFLAGS += -O2 ++DYLIB_LDFLAGS ?= -Wl,-soname,libbdelta.so + + ALL_TARGETS = bpatch libbdelta.so bdelta + + all: $(ALL_TARGETS) + + libbdelta.so: libbdelta.cpp compatibility.h checksum.h file.h +- $(CXX) -shared -fPIC $(CXXFLAGS) $(LDFLAGS) $< -o $@ ++ $(CXX) -shared -fPIC $(CXXFLAGS) $(LDFLAGS) $(DYLIB_LDFLAGS) $< -o $@ + + bdelta: bdelta.cpp bdelta.h compatibility.h file.h libbdelta.so + $(CXX) $< -o $@ $(CXXFLAGS) $(LDFLAGS) -L. -lbdelta |