diff options
| author |   Matthias Schwarzott <zzam@gentoo.org> | 2006-09-10 10:29:21 +0000 |
|---|---|---|
| committer | Matthias Schwarzott <zzam@gentoo.org> | 2006-09-10 10:29:21 +0000 |
| commit | c76bb55c2d61f590029a5af750070c716c7b966a (patch) | |
| tree | 7b8b438b0eb44cfcf126a09821cb4cc78e238463 /eclass | |
| parent | Version bump, migrated to new Java build system. (diff) | |
| download | historical-c76bb55c2d61f590029a5af750070c716c7b966a.tar.gz historical-c76bb55c2d61f590029a5af750070c716c7b966a.tar.bz2 historical-c76bb55c2d61f590029a5af750070c716c7b966a.zip | |
Modified vdr-plugin_copy_source_tree to stay in the same directory. Added code to detect a missing call to vdr-plugin_src_unpack.
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/vdr-plugin.eclass | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/eclass/vdr-plugin.eclass b/eclass/vdr-plugin.eclass index ec0cd70ed3a1..b02dfb1b5976 100644 --- a/eclass/vdr-plugin.eclass +++ b/eclass/vdr-plugin.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/vdr-plugin.eclass,v 1.31 2006/09/07 18:49:44 zzam Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/vdr-plugin.eclass,v 1.32 2006/09/10 10:29:21 zzam Exp $ # # Author: # Matthias Schwarzott <zzam@gentoo.org> @@ -187,6 +187,7 @@ vdr-plugin_src_unpack() { -e '/^STRIP =/d' \ -e '/@.*\$(STRIP)/d' eend $? + PLUGIN_MAKEFILE_PATCHED=1 ;; add_local_patch) cd ${S} @@ -205,6 +206,7 @@ vdr-plugin_src_unpack() { } vdr-plugin_copy_source_tree() { + pushd . >/dev/null cp -r ${S} ${T}/source-tree cd ${T}/source-tree mv Makefile.orig Makefile @@ -213,6 +215,7 @@ vdr-plugin_copy_source_tree() { -e 's:^CXXFLAGS:#CXXFLAGS:' \ -e 's:-I$(DVBDIR)/include:-I$(DVBDIR):' \ -e 's:-I$(VDRDIR) -I$(DVBDIR):-I$(DVBDIR) -I$(VDRDIR):' + popd >/dev/null } vdr-plugin_install_source_tree() { @@ -234,6 +237,14 @@ vdr-plugin_src_compile() { [[ -n "${VDRSOURCE_DIR}" ]] && vdr-plugin_copy_source_tree ;; compile) + if [[ -z ${PLUGIN_MAKEFILE_PATCHED} ]]; then + eerror "Wrong use of vdr-plugin.eclass." + eerror "An ebuild for a vdr-plugin will not work without" + eerror "calling vdr-plugin_src_unpack to patch the Makefile." + echo + eerror "Please report this at bugs.gentoo.org." + die "vdr-plugin_src_unpack not called!" + fi cd ${S} emake ${BUILD_PARAMS} ${VDRPLUGIN_MAKE_TARGET:-all} || die "emake failed" |