From b6a645491b68f05476069f6a162d88be5b90b5bb Mon Sep 17 00:00:00 2001
From: Chris Larson <clarson@kergoth.com>
Date: Fri, 14 May 2004 23:02:30 +0000
Subject: Merge openembedded@openembedded.bkbits.net:packages into
 linux.local:/home/kergoth/code/packages

2004/05/14 17:50:22-05:00 (none)!kergoth
Merge kergoth@siasl.dyndns.org:code/packages
into odin.(none):/home/kergoth/code/packages

2004/05/14 16:32:02-05:00 (none)!kergoth
Adapt packages to make use of INHERIT_DEFAULT_DEPS.

BKrev: 40a55006XrXQTwGXgFD4W0J0dJRwkw
---
 glibc/glibc-initial_2.3.2.oe    | 2 +-
 glibc/glibc-initial_cvs.oe      | 2 +-
 glibc/glibc-intermediate_cvs.oe | 2 +-
 glibc/glibc_2.3.2.oe            | 3 ++-
 glibc/glibc_cvs.oe              | 3 ++-
 5 files changed, 7 insertions(+), 5 deletions(-)

(limited to 'glibc')

diff --git a/glibc/glibc-initial_2.3.2.oe b/glibc/glibc-initial_2.3.2.oe
index ad040c0701..361d93ff41 100644
--- a/glibc/glibc-initial_2.3.2.oe
+++ b/glibc/glibc-initial_2.3.2.oe
@@ -1,6 +1,6 @@
 include glibc_${PV}.oe
 
-DEPENDS = ""
+DEPENDS = "patcher-native"
 PROVIDES = "virtual/${TARGET_PREFIX}libc-initial"
 FILESDIR = "${@os.path.dirname(oe.data.getVar('FILE',d,1))}/glibc-${PV}"
 S = "${WORKDIR}/glibc-${PV}"
diff --git a/glibc/glibc-initial_cvs.oe b/glibc/glibc-initial_cvs.oe
index 25d1f82d58..00f6a9b19a 100644
--- a/glibc/glibc-initial_cvs.oe
+++ b/glibc/glibc-initial_cvs.oe
@@ -1,6 +1,6 @@
 include glibc_${PV}.oe
 
-DEPENDS = ""
+DEPENDS = "patcher-native"
 PROVIDES = "virtual/${TARGET_PREFIX}libc-initial"
 FILESDIR = "${@os.path.dirname(oe.data.getVar('FILE',d,1))}/glibc-cvs"
 
diff --git a/glibc/glibc-intermediate_cvs.oe b/glibc/glibc-intermediate_cvs.oe
index 1250bce73f..f35d819298 100644
--- a/glibc/glibc-intermediate_cvs.oe
+++ b/glibc/glibc-intermediate_cvs.oe
@@ -6,6 +6,6 @@ do_install () {
 
 PACKAGES = ""
 PROVIDES = "virtual/${TARGET_PREFIX}libc-for-gcc"
-DEPENDS = "virtual/${TARGET_PREFIX}gcc-initial"
+DEPENDS = "patcher-native virtual/${TARGET_PREFIX}gcc-initial"
 GLIBC_ADDONS = "linuxthreads"
 GLIBC_EXTRA_OECONF = ""
diff --git a/glibc/glibc_2.3.2.oe b/glibc/glibc_2.3.2.oe
index a44f897e0c..9678a185eb 100644
--- a/glibc/glibc_2.3.2.oe
+++ b/glibc/glibc_2.3.2.oe
@@ -23,7 +23,8 @@ python __anonymous () {
 PROVIDES = "virtual/libc virtual/${TARGET_PREFIX}libc-for-gcc"
 PACKAGES = "glibc glibc-dev glibc-doc glibc-i18n glibc-locale"
 
-DEPENDS = "virtual/${TARGET_PREFIX}gcc-initial"
+DEPENDS = "patcher-native virtual/${TARGET_PREFIX}gcc-initial"
+INHIBIT_DEFAULT_DEPS = "1"
 
 FILES_glibc_append = " ${datadir}/zoneinfo"
 FILES_glibc-dev_append = " ${libdir}/*.o"
diff --git a/glibc/glibc_cvs.oe b/glibc/glibc_cvs.oe
index 04000db628..f6bd42006d 100644
--- a/glibc/glibc_cvs.oe
+++ b/glibc/glibc_cvs.oe
@@ -30,7 +30,8 @@ PACKAGES = "glibc glibc-dev glibc-doc glibc-i18n glibc-locale"
 
 # nptl needs unwind support in gcc, which can't be built without glibc.
 PROVIDES = "virtual/libc ${@['virtual/${TARGET_PREFIX}libc-for-gcc', '']['nptl' in '${GLIBC_ADDONS}']}"
-DEPENDS = "${@['virtual/${TARGET_PREFIX}gcc-initial', 'virtual/${TARGET_PREFIX}gcc']['nptl' in '${GLIBC_ADDONS}']}"
+DEPENDS = "patcher-native ${@['virtual/${TARGET_PREFIX}gcc-initial', 'virtual/${TARGET_PREFIX}gcc']['nptl' in '${GLIBC_ADDONS}']}"
+INHIBIT_DEFAULT_DEPS = "1"
 
 FILES_glibc_append = " ${datadir}/zoneinfo"
 FILES_glibc-dev_append = " ${libdir}/*.o"
-- 
cgit v1.2.3