| 1 |
ssuominen 10/01/08 14:56:35 |
| 2 |
|
| 3 |
Modified: ChangeLog accessx-0951-r1.ebuild |
| 4 |
Log: |
| 5 |
Fix building with -Wl,--as-needed wrt #248546, thanks to Kacper Kowalik for patch. |
| 6 |
(Portage version: 2.2_rc61/cvs/Linux x86_64) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.28 x11-misc/accessx/ChangeLog |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-misc/accessx/ChangeLog?rev=1.28&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-misc/accessx/ChangeLog?rev=1.28&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-misc/accessx/ChangeLog?r1=1.27&r2=1.28 |
| 14 |
|
| 15 |
Index: ChangeLog |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/x11-misc/accessx/ChangeLog,v |
| 18 |
retrieving revision 1.27 |
| 19 |
retrieving revision 1.28 |
| 20 |
diff -u -r1.27 -r1.28 |
| 21 |
--- ChangeLog 9 Feb 2008 01:04:43 -0000 1.27 |
| 22 |
+++ ChangeLog 8 Jan 2010 14:56:34 -0000 1.28 |
| 23 |
@@ -1,6 +1,11 @@ |
| 24 |
# ChangeLog for x11-misc/accessx |
| 25 |
-# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 |
| 26 |
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/accessx/ChangeLog,v 1.27 2008/02/09 01:04:43 coldwind Exp $ |
| 27 |
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/accessx/ChangeLog,v 1.28 2010/01/08 14:56:34 ssuominen Exp $ |
| 29 |
+ |
| 30 |
+ 08 Jan 2010; Samuli Suominen <ssuominen@g.o> |
| 31 |
+ accessx-0951-r1.ebuild: |
| 32 |
+ Fix building with -Wl,--as-needed wrt #248546, thanks to Kacper Kowalik |
| 33 |
+ for patch. |
| 34 |
|
| 35 |
09 Feb 2008; Santiago M. Mola <coldwind@g.o> -accessx-0951.ebuild: |
| 36 |
Remove unused version. |
| 37 |
|
| 38 |
|
| 39 |
|
| 40 |
1.5 x11-misc/accessx/accessx-0951-r1.ebuild |
| 41 |
|
| 42 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-misc/accessx/accessx-0951-r1.ebuild?rev=1.5&view=markup |
| 43 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-misc/accessx/accessx-0951-r1.ebuild?rev=1.5&content-type=text/plain |
| 44 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-misc/accessx/accessx-0951-r1.ebuild?r1=1.4&r2=1.5 |
| 45 |
|
| 46 |
Index: accessx-0951-r1.ebuild |
| 47 |
=================================================================== |
| 48 |
RCS file: /var/cvsroot/gentoo-x86/x11-misc/accessx/accessx-0951-r1.ebuild,v |
| 49 |
retrieving revision 1.4 |
| 50 |
retrieving revision 1.5 |
| 51 |
diff -u -r1.4 -r1.5 |
| 52 |
--- accessx-0951-r1.ebuild 10 Jan 2008 18:19:04 -0000 1.4 |
| 53 |
+++ accessx-0951-r1.ebuild 8 Jan 2010 14:56:34 -0000 1.5 |
| 54 |
@@ -1,7 +1,8 @@ |
| 55 |
-# Copyright 1999-2008 Gentoo Foundation |
| 56 |
+# Copyright 1999-2010 Gentoo Foundation |
| 57 |
# Distributed under the terms of the GNU General Public License v2 |
| 58 |
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/accessx/accessx-0951-r1.ebuild,v 1.4 2008/01/10 18:19:04 nixnut Exp $ |
| 59 |
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/accessx/accessx-0951-r1.ebuild,v 1.5 2010/01/08 14:56:34 ssuominen Exp $ |
| 60 |
|
| 61 |
+EAPI=2 |
| 62 |
inherit eutils multilib toolchain-funcs |
| 63 |
|
| 64 |
DESCRIPTION="Interface to the XKEYBOARD extension in X11" |
| 65 |
@@ -13,25 +14,26 @@ |
| 66 |
KEYWORDS="~amd64 ppc sparc x86" |
| 67 |
IUSE="" |
| 68 |
|
| 69 |
-RDEPEND="x11-libs/libX11 |
| 70 |
+DEPEND="x11-libs/libX11 |
| 71 |
x11-libs/libXext |
| 72 |
dev-lang/tk" |
| 73 |
-DEPEND="${RDEPEND}" |
| 74 |
|
| 75 |
S=${WORKDIR}/${PN} |
| 76 |
|
| 77 |
-src_unpack() { |
| 78 |
- unpack ${A} |
| 79 |
- cd "${S}" |
| 80 |
+src_prepare() { |
| 81 |
epatch "${FILESDIR}"/${P}-build.patch |
| 82 |
+ |
| 83 |
+ sed -i \ |
| 84 |
+ -e 's:$(CC) $(OPTS) ax.C:$(CC) $(LDFLAGS) $(OPTS) ax.C:' \ |
| 85 |
+ Makefile || die |
| 86 |
} |
| 87 |
|
| 88 |
src_compile() { |
| 89 |
emake CC="$(tc-getCXX)" OPTS="${CXXFLAGS}" \ |
| 90 |
- XLIBDIR="-L/usr/$(get_libdir)" || die "emake failed." |
| 91 |
+ XLIBDIR="-L/usr/$(get_libdir)" LLIBS="-lXext -lX11" || die |
| 92 |
} |
| 93 |
|
| 94 |
src_install() { |
| 95 |
- dobin accessx ax |
| 96 |
+ dobin accessx ax || die |
| 97 |
dodoc CHANGES README |
| 98 |
} |
Archives