diff options
| author |   Kacper Kowalik <xarthisius@gentoo.org> | 2010-06-01 17:12:32 +0000 |
|---|---|---|
| committer | Kacper Kowalik <xarthisius@gentoo.org> | 2010-06-01 17:12:32 +0000 |
| commit | b535535f023ada154907a5053dda7a736ed3d620 (patch) | |
| tree | e03a75c3844672b7704ef8e3d938f9babc2fd99a /x11-wm/ratpoison | |
| parent | Don't strip binaries wrt bug 252124. Thanks Diego for report (diff) | |
| download | gentoo-2-b535535f023ada154907a5053dda7a736ed3d620.tar.gz gentoo-2-b535535f023ada154907a5053dda7a736ed3d620.tar.bz2 gentoo-2-b535535f023ada154907a5053dda7a736ed3d620.zip | |
Fixing build with as-needed wrt bug 310727. Thanks Diego for report.
(Portage version: 2.1.8.3/cvs/Linux x86_64)
Diffstat (limited to 'x11-wm/ratpoison')
| -rw-r--r-- | x11-wm/ratpoison/ChangeLog | 8 | ||||
| -rw-r--r-- | x11-wm/ratpoison/files/ratpoison-1.4.5-asneeded.patch | 18 | ||||
| -rw-r--r-- | x11-wm/ratpoison/ratpoison-1.4.5.ebuild | 10 |
3 files changed, 29 insertions, 7 deletions
diff --git a/x11-wm/ratpoison/ChangeLog b/x11-wm/ratpoison/ChangeLog index affa2e44a63c..1bcf378d2d2c 100644 --- a/x11-wm/ratpoison/ChangeLog +++ b/x11-wm/ratpoison/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for x11-wm/ratpoison -# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-wm/ratpoison/ChangeLog,v 1.79 2009/12/08 19:25:44 nixnut Exp $ +# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/x11-wm/ratpoison/ChangeLog,v 1.80 2010/06/01 17:12:31 xarthisius Exp $ + + 01 Jun 2010; Kacper Kowalik <xarthisius@gentoo.org> + ratpoison-1.4.5.ebuild, +files/ratpoison-1.4.5-asneeded.patch: + Fixing build with as-needed wrt bug 310727. Thanks Diego for report. 08 Dec 2009; nixnut <nixnut@gentoo.org> ratpoison-1.4.5.ebuild: ppc stable #293517 diff --git a/x11-wm/ratpoison/files/ratpoison-1.4.5-asneeded.patch b/x11-wm/ratpoison/files/ratpoison-1.4.5-asneeded.patch new file mode 100644 index 000000000000..bb70665fab8f --- /dev/null +++ b/x11-wm/ratpoison/files/ratpoison-1.4.5-asneeded.patch @@ -0,0 +1,18 @@ +Fixing as-needed issues + +http://bugs.gentoo.org/show_bug.cgi?id=310727 + +--- src/Makefile.am ++++ src/Makefile.am +@@ -22,8 +22,9 @@ + bin_PROGRAMS = ratpoison + MAINTAINERCLEANFILES = Makefile.in config.h.in + +-AM_LDFLAGS=${X_LDFLAGS} ${X_LIBS} ${X_EXTRA_LIBS} ${XFT_LIBS} ${HISTORY_LIBS} +-AM_CPPFLAGS=${X_CFLAGS} ${XFT_CFLAGS} ++ratpoison_LDFLAGS=${X_LDFLAGS} ++ratpoison_LDADD=${X_LIBS} ${X_EXTRA_LIBS} ${XFT_LIBS} ${HISTORY_LIBS} ++ratpoison_CFLAGS=${X_CFLAGS} ${XFT_CFLAGS} + + ratpoison_SOURCES = actions.c \ + actions.h \ diff --git a/x11-wm/ratpoison/ratpoison-1.4.5.ebuild b/x11-wm/ratpoison/ratpoison-1.4.5.ebuild index 6b3a6d85d805..c6288bb70d28 100644 --- a/x11-wm/ratpoison/ratpoison-1.4.5.ebuild +++ b/x11-wm/ratpoison/ratpoison-1.4.5.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2009 Gentoo Foundation +# Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-wm/ratpoison/ratpoison-1.4.5.ebuild,v 1.5 2009/12/08 19:25:44 nixnut Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-wm/ratpoison/ratpoison-1.4.5.ebuild,v 1.6 2010/06/01 17:12:31 xarthisius Exp $ EAPI=2 -inherit elisp-common eutils autotools +inherit autotools elisp-common eutils DESCRIPTION="Ratpoison is an extremely light-weight and barebones wm modelled after screen" HOMEPAGE="http://www.nongnu.org/ratpoison/" @@ -30,8 +30,8 @@ src_prepare() { epatch "${FILESDIR}/ratpoison.el-gentoo.patch" cd "${S}" - epatch "${FILESDIR}/${PN}-1.4.4-glibc210.patch" - + epatch "${FILESDIR}/${PN}-1.4.4-glibc210.patch" \ + "${FILESDIR}/${P}-asneeded.patch" eautoreconf } |