diff options
| author |   Chris Larson <clarson@kergoth.com> | 2004-11-11 04:13:54 +0000 |
|---|---|---|
| committer | Chris Larson <clarson@kergoth.com> | 2004-11-11 04:13:54 +0000 |
| commit | 9cbeb648139688efaa245c18fd9a0ce09928e09b (patch) | |
| tree | 116d12f4f9a3b32a537c35f01ac3a7b03e0afc77 /classes/ccdv.oeclass | |
| parent | 80167192d7801cecf0ec9e53cefde5e6e1fe7a03 (diff) | |
| download | openembedded-9cbeb648139688efaa245c18fd9a0ce09928e09b.tar.gz | |
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
Diffstat (limited to 'classes/ccdv.oeclass')
| -rw-r--r-- | classes/ccdv.oeclass | 15 |
1 files changed, 10 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" |