diff options
| author |   Markos Chandras <hwoarang@gentoo.org> | 2010-06-23 12:24:47 +0000 |
|---|---|---|
| committer | Markos Chandras <hwoarang@gentoo.org> | 2010-06-23 12:24:47 +0000 |
| commit | 37432a87c4fc95d715ed171763d53b670cc3d6da (patch) | |
| tree | b3dca777c355b1a48b44749b75ba919c306952e4 /x11-misc/xrmap | |
| parent | emacs-23.2 is segfaulting too, extend mask (diff) | |
| download | gentoo-2-37432a87c4fc95d715ed171763d53b670cc3d6da.tar.gz gentoo-2-37432a87c4fc95d715ed171763d53b670cc3d6da.tar.bz2 gentoo-2-37432a87c4fc95d715ed171763d53b670cc3d6da.zip | |
Fix makefile to allow parallel compilation. Fixes bug #323065
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'x11-misc/xrmap')
| -rw-r--r-- | x11-misc/xrmap/ChangeLog | 5 | ||||
| -rw-r--r-- | x11-misc/xrmap/xrmap-2.33.ebuild | 5 |
2 files changed, 7 insertions, 3 deletions
diff --git a/x11-misc/xrmap/ChangeLog b/x11-misc/xrmap/ChangeLog index a9a0fdff5a6b..b28f5d4108ac 100644 --- a/x11-misc/xrmap/ChangeLog +++ b/x11-misc/xrmap/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for x11-misc/xrmap # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-misc/xrmap/ChangeLog,v 1.19 2010/06/11 18:36:55 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-misc/xrmap/ChangeLog,v 1.20 2010/06/23 12:24:47 hwoarang Exp $ + + 23 Jun 2010; Markos Chandras <hwoarang@gentoo.org> xrmap-2.33.ebuild: + Fix makefile to allow parallel compilation. Fixes bug #323065 11 Jun 2010; Samuli Suominen <ssuominen@gentoo.org> xrmap-2.33.ebuild: Fix imagemagick vs. graphicsmagick depend wrt #314405 by Mikael Magnusson. diff --git a/x11-misc/xrmap/xrmap-2.33.ebuild b/x11-misc/xrmap/xrmap-2.33.ebuild index 1c1a2a7c21fd..68abcb8fbc54 100644 --- a/x11-misc/xrmap/xrmap-2.33.ebuild +++ b/x11-misc/xrmap/xrmap-2.33.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-misc/xrmap/xrmap-2.33.ebuild,v 1.3 2010/06/11 18:36:55 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-misc/xrmap/xrmap-2.33.ebuild,v 1.4 2010/06/23 12:24:47 hwoarang Exp $ EAPI=2 inherit eutils @@ -52,7 +52,8 @@ src_compile() { sed -i -e 's,^\(#define RCFILE \)SHAREDIR\",\1\"/etc/xrmap,g' \ -e 's,^\(#define SHAREDIR \"/usr/share/\),\1x,g' xrmap.h || die # bug #323065 - emake -j1 || die + sed -i "/^image.o/s/image.o:/& numdefs.h/" Makefile || die + emake || die cd tools emake || die cd jpd2else |