diff options
| author |   Simone Gotti <motaboy@gentoo.org> | 2004-11-29 16:08:57 +0000 |
|---|---|---|
| committer | Simone Gotti <motaboy@gentoo.org> | 2004-11-29 16:08:57 +0000 |
| commit | 6afe7855ebd626d54f3d7394b688f879d60e29f1 (patch) | |
| tree | 8067e3b2d47679d5e1d40a77399a686f35d0238d /kde-misc | |
| parent | oeps (Manifest recommit) (diff) | |
| download | gentoo-2-6afe7855ebd626d54f3d7394b688f879d60e29f1.tar.gz gentoo-2-6afe7855ebd626d54f3d7394b688f879d60e29f1.tar.bz2 gentoo-2-6afe7855ebd626d54f3d7394b688f879d60e29f1.zip | |
Fix problems with parallel make. Fixes bug #72779.
Diffstat (limited to 'kde-misc')
| -rw-r--r-- | kde-misc/komics/ChangeLog | 6 | ||||
| -rw-r--r-- | kde-misc/komics/files/komics-1.4-Makefiles.patch | 31 | ||||
| -rw-r--r-- | kde-misc/komics/komics-1.4.ebuild | 5 |
3 files changed, 39 insertions, 3 deletions
diff --git a/kde-misc/komics/ChangeLog b/kde-misc/komics/ChangeLog index 391c48007812..b2fbe851143e 100644 --- a/kde-misc/komics/ChangeLog +++ b/kde-misc/komics/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for kde-misc/komics # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-misc/komics/ChangeLog,v 1.3 2004/11/28 18:39:36 motaboy Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-misc/komics/ChangeLog,v 1.4 2004/11/29 16:08:57 motaboy Exp $ + + 29 Nov 2004; Simone Gotti <motaboy@gentoo.org> + +files/komics-1.4-Makefiles.patch, komics-1.4.ebuild: + Fix problems with parallel make. Fixes bug #72779. *komics-1.4 (28 Nov 2004) diff --git a/kde-misc/komics/files/komics-1.4-Makefiles.patch b/kde-misc/komics/files/komics-1.4-Makefiles.patch new file mode 100644 index 000000000000..f4737d2c5f3b --- /dev/null +++ b/kde-misc/komics/files/komics-1.4-Makefiles.patch @@ -0,0 +1,31 @@ +--- src/Makefile.am.orig 2004-11-29 10:27:33.000000000 +0000 ++++ src/Makefile.am 2004-11-29 10:28:01.000000000 +0000 +@@ -25,7 +25,7 @@ + bin_PROGRAMS = komics + komics_LDFLAGS = $(KDE_RPATH) $(all_libraries) + komics_SOURCES = main.cpp +-komics_LDADD = $(top_builddir)/src/libkomics.la $(LIB_KDEUI) $(LIB_KIO) ++komics_LDADD = libkomics.la $(LIB_KDEUI) $(LIB_KIO) + + #komics_bin_DATA = komics-bin.desktop + #komics_bindir = $(kde_datadir)/komics +--- src/Makefile.in.orig 2004-11-29 10:27:45.000000000 +0000 ++++ src/Makefile.in 2004-11-29 10:27:58.000000000 +0000 +@@ -273,7 +273,7 @@ + bin_PROGRAMS = komics + komics_LDFLAGS = $(KDE_RPATH) $(all_libraries) + komics_SOURCES = main.cpp +-komics_LDADD = $(top_builddir)/src/libkomics.la $(LIB_KDEUI) $(LIB_KIO) ++komics_LDADD = libkomics.la $(LIB_KDEUI) $(LIB_KIO) + + #komics_bin_DATA = komics-bin.desktop + #komics_bindir = $(kde_datadir)/komics +@@ -307,7 +307,7 @@ + #>- komics_OBJECTS = $(am_komics_OBJECTS) + #>+ 1 + komics_OBJECTS = main.$(OBJEXT) +-komics_DEPENDENCIES = $(top_builddir)/src/libkomics.la ++komics_DEPENDENCIES = libkomics.la + + DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) + depcomp = $(SHELL) $(top_srcdir)/admin/depcomp diff --git a/kde-misc/komics/komics-1.4.ebuild b/kde-misc/komics/komics-1.4.ebuild index 7a768d849733..9e4daf630214 100644 --- a/kde-misc/komics/komics-1.4.ebuild +++ b/kde-misc/komics/komics-1.4.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/kde-misc/komics/komics-1.4.ebuild,v 1.1 2004/11/28 18:39:36 motaboy Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-misc/komics/komics-1.4.ebuild,v 1.2 2004/11/29 16:08:57 motaboy Exp $ inherit kde @@ -11,7 +11,7 @@ SRC_URI="http://www.orson.it/~domine/komics/${P}.tar.bz2" SLOT="0" LICENSE="GPL-2" KEYWORDS="~x86 ~amd64 ~ppc" -IUSE="arts" +IUSE="" S=${WORKDIR}/komics @@ -25,5 +25,6 @@ src_unpack() { kde_src_unpack epatch ${FILESDIR}/${P}-gcc3.4.patch + epatch ${FILESDIR}/${P}-Makefiles.patch } |