diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2010-01-08 14:56:34 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2010-01-08 14:56:34 +0000 |
| commit | 20c1fe837ed61d3743d207dd14976cbc735a0aeb (patch) | |
| tree | 7c1fdb574dc48fe1aef968754ad356b14dca3ad6 /x11-misc/accessx | |
| parent | Bump for #299814 (diff) | |
| download | gentoo-2-20c1fe837ed61d3743d207dd14976cbc735a0aeb.tar.gz gentoo-2-20c1fe837ed61d3743d207dd14976cbc735a0aeb.tar.bz2 gentoo-2-20c1fe837ed61d3743d207dd14976cbc735a0aeb.zip | |
Fix building with -Wl,--as-needed wrt #248546, thanks to Kacper Kowalik for patch.
(Portage version: 2.2_rc61/cvs/Linux x86_64)
Diffstat (limited to 'x11-misc/accessx')
| -rw-r--r-- | x11-misc/accessx/ChangeLog | 9 | ||||
| -rw-r--r-- | x11-misc/accessx/accessx-0951-r1.ebuild | 20 |
2 files changed, 18 insertions, 11 deletions
diff --git a/x11-misc/accessx/ChangeLog b/x11-misc/accessx/ChangeLog index 97b055fcc8ca..3346baa8ebe3 100644 --- a/x11-misc/accessx/ChangeLog +++ b/x11-misc/accessx/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for x11-misc/accessx -# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-misc/accessx/ChangeLog,v 1.27 2008/02/09 01:04:43 coldwind Exp $ +# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/x11-misc/accessx/ChangeLog,v 1.28 2010/01/08 14:56:34 ssuominen Exp $ + + 08 Jan 2010; Samuli Suominen <ssuominen@gentoo.org> + accessx-0951-r1.ebuild: + Fix building with -Wl,--as-needed wrt #248546, thanks to Kacper Kowalik + for patch. 09 Feb 2008; Santiago M. Mola <coldwind@gentoo.org> -accessx-0951.ebuild: Remove unused version. diff --git a/x11-misc/accessx/accessx-0951-r1.ebuild b/x11-misc/accessx/accessx-0951-r1.ebuild index b7609e565c71..1808fafc3d3c 100644 --- a/x11-misc/accessx/accessx-0951-r1.ebuild +++ b/x11-misc/accessx/accessx-0951-r1.ebuild @@ -1,7 +1,8 @@ -# Copyright 1999-2008 Gentoo Foundation +# Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-misc/accessx/accessx-0951-r1.ebuild,v 1.4 2008/01/10 18:19:04 nixnut Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-misc/accessx/accessx-0951-r1.ebuild,v 1.5 2010/01/08 14:56:34 ssuominen Exp $ +EAPI=2 inherit eutils multilib toolchain-funcs DESCRIPTION="Interface to the XKEYBOARD extension in X11" @@ -13,25 +14,26 @@ SLOT="0" KEYWORDS="~amd64 ppc sparc x86" IUSE="" -RDEPEND="x11-libs/libX11 +DEPEND="x11-libs/libX11 x11-libs/libXext dev-lang/tk" -DEPEND="${RDEPEND}" S=${WORKDIR}/${PN} -src_unpack() { - unpack ${A} - cd "${S}" +src_prepare() { epatch "${FILESDIR}"/${P}-build.patch + + sed -i \ + -e 's:$(CC) $(OPTS) ax.C:$(CC) $(LDFLAGS) $(OPTS) ax.C:' \ + Makefile || die } src_compile() { emake CC="$(tc-getCXX)" OPTS="${CXXFLAGS}" \ - XLIBDIR="-L/usr/$(get_libdir)" || die "emake failed." + XLIBDIR="-L/usr/$(get_libdir)" LLIBS="-lXext -lX11" || die } src_install() { - dobin accessx ax + dobin accessx ax || die dodoc CHANGES README } |