diff options
| author |   Matthias Schwarzott <zzam@gentoo.org> | 2009-07-09 20:36:25 +0000 |
|---|---|---|
| committer | Matthias Schwarzott <zzam@gentoo.org> | 2009-07-09 20:36:25 +0000 |
| commit | 77c9f18c2daf0f21212d26b8d01a7ce9b5f7f971 (patch) | |
| tree | 027697dfcfd0a73416627d9213aa8e4833eba318 /media-plugins | |
| parent | Disable test that is broken with gcc-4.4 and that never worked as it needs fu... (diff) | |
| download | gentoo-2-77c9f18c2daf0f21212d26b8d01a7ce9b5f7f971.tar.gz gentoo-2-77c9f18c2daf0f21212d26b8d01a7ce9b5f7f971.tar.bz2 gentoo-2-77c9f18c2daf0f21212d26b8d01a7ce9b5f7f971.zip | |
Fix makefile recursion.
(Portage version: 2.1.6.13/cvs/Linux i686)
Diffstat (limited to 'media-plugins')
| -rw-r--r-- | media-plugins/vdr-burn/ChangeLog | 7 | ||||
| -rw-r--r-- | media-plugins/vdr-burn/files/0.1.0_pre21/vdr-burn-0.1.0_pre21-makefile.diff | 22 | ||||
| -rw-r--r-- | media-plugins/vdr-burn/vdr-burn-0.1.0_pre21-r6.ebuild | 5 |
3 files changed, 31 insertions, 3 deletions
diff --git a/media-plugins/vdr-burn/ChangeLog b/media-plugins/vdr-burn/ChangeLog index 043a70d78334..ab5dc633df71 100644 --- a/media-plugins/vdr-burn/ChangeLog +++ b/media-plugins/vdr-burn/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for media-plugins/vdr-burn # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-burn/ChangeLog,v 1.40 2009/07/09 20:25:46 zzam Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-burn/ChangeLog,v 1.41 2009/07/09 20:36:24 zzam Exp $ + + 09 Jul 2009; Matthias Schwarzott <zzam@gentoo.org> + vdr-burn-0.1.0_pre21-r6.ebuild, + +files/0.1.0_pre21/vdr-burn-0.1.0_pre21-makefile.diff: + Fix makefile recursion. 09 Jul 2009; Matthias Schwarzott <zzam@gentoo.org> vdr-burn-0.1.0_pre21-r6.ebuild: diff --git a/media-plugins/vdr-burn/files/0.1.0_pre21/vdr-burn-0.1.0_pre21-makefile.diff b/media-plugins/vdr-burn/files/0.1.0_pre21/vdr-burn-0.1.0_pre21-makefile.diff new file mode 100644 index 000000000000..d066b85abe0b --- /dev/null +++ b/media-plugins/vdr-burn/files/0.1.0_pre21/vdr-burn-0.1.0_pre21-makefile.diff @@ -0,0 +1,22 @@ +Index: burn-0.1.0-pre21/Makefile +=================================================================== +--- burn-0.1.0-pre21.orig/Makefile ++++ burn-0.1.0-pre21/Makefile +@@ -133,7 +133,7 @@ all: libvdr-$(PLUGIN).so burn-buffers i1 + + SUBDIRS: + @for dir in $(SUBDIRS); do \ +- make -C $$dir CXX="$(CXX)" CXXFLAGS="$(CXXFLAGS)" lib$$dir.a ; \ ++ $(MAKE) -C $$dir CXX="$(CXX)" CXXFLAGS="$(CXXFLAGS)" lib$$dir.a ; \ + done + + libvdr-$(PLUGIN).so: $(OBJS) SUBDIRS Makefile +@@ -165,7 +165,7 @@ clean: + @-rm -f *.o genindex/*.o $(DEPFILE) *.so *.tgz core* *~ burn-buffers \ + scan-test test t/*.o + @for dir in $(SUBDIRS); do \ +- make -C $$dir clean ; \ ++ $(MAKE) -C $$dir clean ; \ + done + + ### Implicit rules: diff --git a/media-plugins/vdr-burn/vdr-burn-0.1.0_pre21-r6.ebuild b/media-plugins/vdr-burn/vdr-burn-0.1.0_pre21-r6.ebuild index 0275e8dd8dcf..1e93d6427772 100644 --- a/media-plugins/vdr-burn/vdr-burn-0.1.0_pre21-r6.ebuild +++ b/media-plugins/vdr-burn/vdr-burn-0.1.0_pre21-r6.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-burn/vdr-burn-0.1.0_pre21-r6.ebuild,v 1.3 2009/07/09 20:25:46 zzam Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-burn/vdr-burn-0.1.0_pre21-r6.ebuild,v 1.4 2009/07/09 20:36:24 zzam Exp $ EAPI="2" @@ -28,7 +28,8 @@ PATCHES=("${FILESDIR}/${PV}/i18n.diff" "${FILESDIR}/${PV}/${P}_setdefaults-V2.diff" "${FILESDIR}/${PV}/requantfactor.diff" "${FILESDIR}/${PV}/charset-vdr-1.5.diff" - "${FILESDIR}/${PV}/${P}-gcc43.patch") + "${FILESDIR}/${PV}/${P}-gcc43.patch" + "${FILESDIR}/${PV}/${P}-makefile.diff") DEPEND=">=media-video/vdr-1.4 >=dev-libs/libcdio-0.71 |