From 9cbeb648139688efaa245c18fd9a0ce09928e09b Mon Sep 17 00:00:00 2001
From: Chris Larson <clarson@kergoth.com>
Date: Thu, 11 Nov 2004 04:13:54 +0000
Subject: Merge openembedded@openembedded.bkbits.net:packages-devel into
 handhelds.org:/home/kergoth/code/packages

2004/11/10 22:13:53-06:00 handhelds.org!kergoth
Enhance local source distribution oeclass to have a few modes, controlled by the SRC_DIST_LOCAL variable.  Read the comments in the oeclass for details.

2004/11/10 17:51:55-06:00 handhelds.org!kergoth
Unbork the ccdv oeclass when its inherited by the ccdv-native build.  Needed to prevent the dependency on itself.

BKrev: 4192e702VZp8pNEh6j6Iq5HRCPvbSA
---
 classes/ccdv.oeclass                 | 15 ++++++++++-----
 classes/src_distribute_local.oeclass | 24 ++++++++++++++++++++++++
 2 files changed, 34 insertions(+), 5 deletions(-)

diff --git a/classes/ccdv.oeclass b/classes/ccdv.oeclass
index 6ebc7bf0c2..d2af78b9e1 100644
--- a/classes/ccdv.oeclass
+++ b/classes/ccdv.oeclass
@@ -1,8 +1,11 @@
-DEPENDS =+ "ccdv-native"
-CCDV = "ccdv"
-CC =+ "${CCDV}"
-BUILD_CC =+ "${CCDV}"
-CCLD =+ "${CCDV}"
+python () {
+	if oe.data.getVar('PN', d, 1) != 'ccdv-native':
+		if not oe.data.getVar('INHIBIT_DEFAULT_DEPS', d, 1):
+			oe.data.setVar("DEPENDS", '%s %s' % ("ccdv-native", oe.data.getVar("DEPENDS", d, 1) or ""), d)
+		oe.data.setVar("CC", '%s %s' % ("ccdv", oe.data.getVar("CC", d, 1) or ""), d)
+		oe.data.setVar("BUILD_CC", '%s %s' % ("ccdv", oe.data.getVar("BUILD_CC", d, 1) or ""), d)
+		oe.data.setVar("CCLD", '%s %s' % ("ccdv", oe.data.getVar("CCLD", d, 1) or ""), d)
+}
 
 def quiet_libtool(oe,d):
 	deps = (oe.data.getVar('DEPENDS', d, 1) or "").split()
@@ -12,5 +15,7 @@ def quiet_libtool(oe,d):
 		return "'LIBTOOL=${B}/${HOST_SYS}-libtool --silent'"
 	else:
 		return ""
+
+CCDV = "ccdv"
 EXTRA_OEMAKE_append = " ${@quiet_libtool(oe,d)}"
 MAKE += "-s"
diff --git a/classes/src_distribute_local.oeclass b/classes/src_distribute_local.oeclass
index e69de29bb2..05ec117649 100644
--- a/classes/src_distribute_local.oeclass
+++ b/classes/src_distribute_local.oeclass
@@ -0,0 +1,24 @@
+inherit src_distribute
+
+# SRC_DIST_LOCAL possible values:
+# copy		copies the files from ${A} to the distributedir
+# symlink	symlinks the files from ${A} to the distributedir
+# move+symlink	moves the files into distributedir, and symlinks them back
+SRC_DIST_LOCAL ?= "move+symlink"
+SRC_DISTRIBUTEDIR ?= "${DEPLOY_DIR}/sources"
+SRC_DISTRIBUTECOMMAND () {
+	s="${SRC}"
+	mkdir -p ${SRC_DISTRIBUTEDIR}
+	case "${SRC_DIST_LOCAL}" in
+		copy)
+			cp -f $s ${SRC_DISTRIBUTEDIR}/
+			;;
+		symlink)
+			ln -sf $s ${SRC_DISTRIBUTEDIR}/
+			;;
+		move+symlink)
+			mv $s ${SRC_DISTRIBUTEDIR}/
+			ln -sf ${SRC_DISTRIBUTEDIR}/`basename $s` $s
+			;;
+	esac
+}
-- 
cgit v1.2.3