summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Schwarzott <zzam@gentoo.org>2006-09-19 19:31:33 +0000
committerMatthias Schwarzott <zzam@gentoo.org>2006-09-19 19:31:33 +0000
commit830b16167d53f43e35f12ff1f958cf81d49c99af (patch)
tree716c449a0cd9c4bf35bf175372158d1dabea783e /eclass/vdr-plugin.eclass
parentAdding strip to RESTRICT for bug #137819. (diff)
downloadhistorical-830b16167d53f43e35f12ff1f958cf81d49c99af.tar.gz
historical-830b16167d53f43e35f12ff1f958cf81d49c99af.tar.bz2
historical-830b16167d53f43e35f12ff1f958cf81d49c99af.zip
No longer transfer info between src_unpack and src_compile via variables, but now via files, as portage now cannot handle this always correct.
Diffstat (limited to 'eclass/vdr-plugin.eclass')
-rw-r--r--eclass/vdr-plugin.eclass9
1 files changed, 6 insertions, 3 deletions
diff --git a/eclass/vdr-plugin.eclass b/eclass/vdr-plugin.eclass
index b02dfb1b5976..4df88a5300b3 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.32 2006/09/10 10:29:21 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/vdr-plugin.eclass,v 1.33 2006/09/19 19:31:33 zzam Exp $
#
# Author:
# Matthias Schwarzott <zzam@gentoo.org>
@@ -187,7 +187,10 @@ vdr-plugin_src_unpack() {
-e '/^STRIP =/d' \
-e '/@.*\$(STRIP)/d'
eend $?
- PLUGIN_MAKEFILE_PATCHED=1
+
+ # Use a file instead of an variable as single-stepping via ebuild
+ # destroys environment.
+ touch ${WORKDIR}/.vdr-plugin_makefile_patched
;;
add_local_patch)
cd ${S}
@@ -237,7 +240,7 @@ vdr-plugin_src_compile() {
[[ -n "${VDRSOURCE_DIR}" ]] && vdr-plugin_copy_source_tree
;;
compile)
- if [[ -z ${PLUGIN_MAKEFILE_PATCHED} ]]; then
+ if [[ ! -f ${WORKDIR}/.vdr-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."