From 988dc86e7d6520de28747b2739a9f7697f9acfee Mon Sep 17 00:00:00 2001 From: Florian Boor Date: Thu, 3 Aug 2006 23:32:02 +0000 Subject: task-sdk: add libcontactsdb-dev to gpe development libraries. --- packages/tasks/task-sdk.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/tasks/task-sdk.bb b/packages/tasks/task-sdk.bb index 57def09e49..d35f07f30a 100644 --- a/packages/tasks/task-sdk.bb +++ b/packages/tasks/task-sdk.bb @@ -1,5 +1,5 @@ DESCRIPTION = "SDK packages for Opie and GPE" -PR = "r4" +PR = "r5" LICENSE = MIT ALLOW_EMPTY = "1" @@ -107,6 +107,7 @@ RDEPENDS_task-sdk-x11-ext := "\ # libxss-dev \ RDEPENDS_task-sdk-gpe := "\ + libcontactsdb-dev \ esound-gpe-dev \ libeventdb-dev \ libgpepimc-dev \ -- cgit v1.2.3 From 4042eaede5d5bb03450f85e941ca603917497f3d Mon Sep 17 00:00:00 2001 From: Frans Meulenbroeks Date: Fri, 4 Aug 2006 14:24:08 +0000 Subject: Added patch (from gcc fix for bug 27363). This makes alsa work with gcc 4.1.1 (after this at least the pcm module needs to be compiled and reloaded) --- packages/gcc/gcc-4.1.1/cse.patch | 75 ++++++++++++++++++++++++++++++++++++++++ packages/gcc/gcc-cross_4.1.1.bb | 2 +- packages/gcc/gcc_4.1.1.bb | 5 +-- 3 files changed, 79 insertions(+), 3 deletions(-) create mode 100644 packages/gcc/gcc-4.1.1/cse.patch diff --git a/packages/gcc/gcc-4.1.1/cse.patch b/packages/gcc/gcc-4.1.1/cse.patch new file mode 100644 index 0000000000..88b22c714f --- /dev/null +++ b/packages/gcc/gcc-4.1.1/cse.patch @@ -0,0 +1,75 @@ +-- gcc-4_1-branch/gcc/cse.c 2006/07/20 14:20:26 115619 ++++ gcc-4_1-branch/gcc/cse.c 2006/07/20 15:07:25 115620 +@@ -4697,6 +4697,8 @@ + unsigned src_const_hash; + /* Table entry for constant equivalent for SET_SRC, if any. */ + struct table_elt *src_const_elt; ++ /* Table entry for the destination address. */ ++ struct table_elt *dest_addr_elt; + }; + + static void +@@ -5936,6 +5938,40 @@ + so that the destination goes into that class. */ + sets[i].src_elt = src_eqv_elt; + ++ /* Record destination addresses in the hash table. This allows us to ++ check if they are invalidated by other sets. */ ++ for (i = 0; i < n_sets; i++) ++ { ++ if (sets[i].rtl) ++ { ++ rtx x = sets[i].inner_dest; ++ struct table_elt *elt; ++ enum machine_mode mode; ++ unsigned hash; ++ ++ if (MEM_P (x)) ++ { ++ x = XEXP (x, 0); ++ mode = GET_MODE (x); ++ hash = HASH (x, mode); ++ elt = lookup (x, hash, mode); ++ if (!elt) ++ { ++ if (insert_regs (x, NULL, 0)) ++ { ++ rehash_using_reg (x); ++ hash = HASH (x, mode); ++ } ++ elt = insert (x, NULL, hash, mode); ++ } ++ ++ sets[i].dest_addr_elt = elt; ++ } ++ else ++ sets[i].dest_addr_elt = NULL; ++ } ++ } ++ + invalidate_from_clobbers (x); + + /* Some registers are invalidated by subroutine calls. Memory is +@@ -6028,12 +6064,20 @@ + } + + /* We may have just removed some of the src_elt's from the hash table. +- So replace each one with the current head of the same class. */ ++ So replace each one with the current head of the same class. ++ Also check if destination addresses have been removed. */ + + for (i = 0; i < n_sets; i++) + if (sets[i].rtl) + { +- if (sets[i].src_elt && sets[i].src_elt->first_same_value == 0) ++ if (sets[i].dest_addr_elt ++ && sets[i].dest_addr_elt->first_same_value == 0) ++ { ++ /* The elt was removed, which means this destination s not ++ valid after this instruction. */ ++ sets[i].rtl = NULL_RTX; ++ } ++ else if (sets[i].src_elt && sets[i].src_elt->first_same_value == 0) + /* If elt was removed, find current head of same class, + or 0 if nothing remains of that class. */ + { diff --git a/packages/gcc/gcc-cross_4.1.1.bb b/packages/gcc/gcc-cross_4.1.1.bb index 4e3805b676..12053f43d8 100644 --- a/packages/gcc/gcc-cross_4.1.1.bb +++ b/packages/gcc/gcc-cross_4.1.1.bb @@ -5,7 +5,7 @@ inherit cross FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}" # NOTE: split PR. If the main .oe changes something that affects its *build* # remember to increment this one too. -PR = "r5" +PR = "r6" DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc gmp-native mpfr-native" PROVIDES = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++" diff --git a/packages/gcc/gcc_4.1.1.bb b/packages/gcc/gcc_4.1.1.bb index c5af490b17..f9706649db 100644 --- a/packages/gcc/gcc_4.1.1.bb +++ b/packages/gcc/gcc_4.1.1.bb @@ -1,4 +1,4 @@ -PR = "r5" +PR = "r6" DESCRIPTION = "The GNU cc and gcc C compilers." HOMEPAGE = "http://www.gnu.org/software/gcc/" SECTION = "devel" @@ -25,7 +25,8 @@ SRC_URI = "http://ftp.gnu.org/pub/gnu/gcc/gcc-4.1.1/gcc-4.1.1.tar.bz2 \ file://gcc41-configure.in.patch;patch=1 \ file://arm-thumb.patch;patch=1 \ file://arm-thumb-cache.patch;patch=1 \ - file://ldflags.patch;patch=1" + file://ldflags.patch;patch=1 \ + file://cse.patch;patch=1" SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 " -- cgit v1.2.3 From 2284beb65e8c2ae4f0b9778b7e6f8adc7798c2a9 Mon Sep 17 00:00:00 2001 From: Florian Boor Date: Fri, 4 Aug 2006 14:29:18 +0000 Subject: libmimedir: Add update patch not applied to cvs. Add new cvs version with fixed date. --- packages/libmimedir/files/mimedir-update.patch | 403 +++++++++++++++++++++++ packages/libmimedir/libmimedir_0.3.1-20060804.bb | 26 ++ packages/libmimedir/libmimedir_cvs.bb | 6 +- 3 files changed, 433 insertions(+), 2 deletions(-) create mode 100644 packages/libmimedir/files/mimedir-update.patch create mode 100644 packages/libmimedir/libmimedir_0.3.1-20060804.bb diff --git a/packages/libmimedir/files/mimedir-update.patch b/packages/libmimedir/files/mimedir-update.patch new file mode 100644 index 0000000000..f3be39eb53 --- /dev/null +++ b/packages/libmimedir/files/mimedir-update.patch @@ -0,0 +1,403 @@ +diff -Nur libmimedir_orig/Makefile.am libmimedir/Makefile.am +--- libmimedir_orig/Makefile.am 2002-08-15 15:36:01.000000000 +0200 ++++ libmimedir/Makefile.am 2006-08-04 15:51:06.000000000 +0200 +@@ -5,7 +5,22 @@ + mimedir-1.0.pc.in \ + intltool-extract.in \ + intltool-merge.in \ +- intltool-update.in ++ intltool-update.in \ ++ debian/changelog \ ++ debian/copyright \ ++ debian/control \ ++ debian/compat \ ++ debian/rules \ ++ debian/libmimedir0.files \ ++ debian/libmimedir-dev.files ++ + + pkgconfigdir = $(libdir)/pkgconfig + pkgconfig_DATA = mimedir-1.0.pc ++ ++deb: dist ++ -mkdir $(top_builddir)/debian-build ++ cd $(top_builddir)/debian-build && tar zxf ../$(top_builddir)/$(PACKAGE)-$(VERSION).tar.gz ++ cd $(top_builddir)/debian-build/$(PACKAGE)-$(VERSION) && dpkg-buildpackage -S -D -rfakeroot ++ cd $(top_builddir)/debian-build/$(PACKAGE)-$(VERSION) && dpkg-buildpackage -D -rfakeroot ++ -rm -rf $(top_builddir)/debian-build/$(PACKAGE)-$(VERSION) +diff -Nur libmimedir_orig/configure.in libmimedir/configure.in +--- libmimedir_orig/configure.in 2006-02-09 13:30:13.000000000 +0100 ++++ libmimedir/configure.in 2006-08-04 15:51:06.000000000 +0200 +@@ -3,7 +3,7 @@ + AC_INIT(MIME Directory Library, 0.4.0, mailto:srittau@jroger.in-berlin.de, libmimedir) + AC_PREREQ(2.53) + AC_CONFIG_SRCDIR(mimedir/mimedir-attribute.c) +-AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION) ++AM_INIT_AUTOMAKE(libmimedir, AC_PACKAGE_VERSION) + AC_PROG_INTLTOOL + AM_CONFIG_HEADER(config.h) + +diff -Nur libmimedir_orig/mimedir/Makefile.am libmimedir/mimedir/Makefile.am +--- libmimedir_orig/mimedir/Makefile.am 2002-12-19 16:21:27.000000000 +0100 ++++ libmimedir/mimedir/Makefile.am 2006-08-04 15:56:36.000000000 +0200 +@@ -26,6 +26,7 @@ + mimedir-period.c \ + mimedir-profile.c \ + mimedir-recurrence.c \ ++ mimedir-recurrence-rule.c \ + mimedir-utils.c \ + mimedir-utils.h \ + mimedir-valarm.c \ +@@ -52,6 +53,7 @@ + mimedir-period.h \ + mimedir-profile.h \ + mimedir-recurrence.h \ ++ mimedir-recurrence-rule.h \ + mimedir-valarm.h \ + mimedir-vcal.h \ + mimedir-vcard.h \ +diff -Nur libmimedir_orig/mimedir/mimedir-attribute.c libmimedir/mimedir/mimedir-attribute.c +--- libmimedir_orig/mimedir/mimedir-attribute.c 2006-01-01 04:38:29.000000000 +0100 ++++ libmimedir/mimedir/mimedir-attribute.c 2006-08-04 15:51:06.000000000 +0200 +@@ -1417,7 +1417,7 @@ + g_return_val_if_fail (parameter != NULL, FALSE); + + p = mimedir_attribute_get_parameter (attribute, parameter); +- if (p) ++ if (p && p->values) + return (gchar *) p->values->data; + else + return NULL; +diff -Nur libmimedir_orig/mimedir/mimedir-recurrence-rule.c libmimedir/mimedir/mimedir-recurrence-rule.c +--- libmimedir_orig/mimedir/mimedir-recurrence-rule.c 1970-01-01 01:00:00.000000000 +0100 ++++ libmimedir/mimedir/mimedir-recurrence-rule.c 2006-08-04 15:52:39.000000000 +0200 +@@ -0,0 +1,171 @@ ++/* RFC 2445 iCal Recurrence Rule Object ++ * Copyright (C) 2004 Phil Blundell ++ * ++ * $Id: mimedir-recurrence.h,v 1.1 2002/08/28 04:57:12 srittau Exp $ ++ * ++ * This library is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU Lesser General Public ++ * License as published by the Free Software Foundation; either ++ * version 2.1 of the License, or (at your option) any later version. ++ * ++ * This library is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ * Lesser General Public License for more details. ++ * ++ * You should have received a copy of the GNU Lesser General Public ++ * License along with this library; if not, write to the Free Software ++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ */ ++ ++#ifdef HAVE_CONFIG_H ++#include ++#endif ++ ++#include "mimedir-recurrence-rule.h" ++ ++ ++#ifndef _ ++#define _(x) (dgettext(GETTEXT_PACKAGE, (x))) ++#endif ++ ++ ++static void mimedir_recurrence_rule_class_init (MIMEDirRecurrenceRuleClass *klass); ++static void mimedir_recurrence_rule_init (MIMEDirRecurrenceRule *recurrence); ++static void mimedir_recurrence_rule_dispose (GObject *object); ++ ++ ++struct _MIMEDirRecurrenceRulePriv { ++ MIMEDirRecurrenceFrequency frequency; ++ int interval; ++}; ++ ++static GObjectClass *parent_class = NULL; ++ ++/* ++ * Class and Object Management ++ */ ++ ++GType ++mimedir_recurrence_rule_get_type (void) ++{ ++ static GType mimedir_recurrence_rule_type = 0; ++ ++ if (!mimedir_recurrence_rule_type) { ++ static const GTypeInfo mimedir_recurrence_rule_info = { ++ sizeof (MIMEDirRecurrenceRuleClass), ++ NULL, /* base_init */ ++ NULL, /* base_finalize */ ++ (GClassInitFunc) mimedir_recurrence_rule_class_init, ++ NULL, /* class_finalize */ ++ NULL, /* class_data */ ++ sizeof (MIMEDirRecurrenceRule), ++ 1, /* n_preallocs */ ++ (GInstanceInitFunc) mimedir_recurrence_rule_init, ++ }; ++ ++ mimedir_recurrence_rule_type = g_type_register_static (G_TYPE_OBJECT, ++ "MIMEDirRecurrenceRule", ++ &mimedir_recurrence_rule_info, ++ 0); ++ } ++ ++ return mimedir_recurrence_rule_type; ++} ++ ++ ++static void ++mimedir_recurrence_rule_class_init (MIMEDirRecurrenceRuleClass *klass) ++{ ++ GObjectClass *gobject_class; ++ ++ g_return_if_fail (klass != NULL); ++ g_return_if_fail (MIMEDIR_IS_RECURRENCE_RULE_CLASS (klass)); ++ ++ gobject_class = G_OBJECT_CLASS (klass); ++ ++ gobject_class->dispose = mimedir_recurrence_rule_dispose; ++ ++ parent_class = g_type_class_peek_parent (klass); ++} ++ ++ ++static void ++mimedir_recurrence_rule_init (MIMEDirRecurrenceRule *rule) ++{ ++ MIMEDirRecurrenceRulePriv *priv; ++ ++ g_return_if_fail (rule != NULL); ++ g_return_if_fail (MIMEDIR_IS_RECURRENCE_RULE (rule)); ++ ++ priv = g_new0 (MIMEDirRecurrenceRulePriv, 1); ++ rule->priv = priv; ++} ++ ++ ++static void ++mimedir_recurrence_rule_dispose (GObject *object) ++{ ++ MIMEDirRecurrenceRule *rule; ++ ++ g_return_if_fail (object != NULL); ++ g_return_if_fail (MIMEDIR_IS_RECURRENCE_RULE (object)); ++ ++ rule = MIMEDIR_RECURRENCE_RULE (object); ++ ++ g_free (rule->priv); ++ rule->priv = NULL; ++ ++ G_OBJECT_CLASS (parent_class)->dispose (object); ++} ++ ++/* ++ * Public Methods ++ */ ++ ++/** ++ * mimedir_recurrence_rule_new: ++ * ++ * Creates a new iCal recurrence object. ++ * ++ * Return value: a new recurrence object ++ **/ ++MIMEDirRecurrenceRule * ++mimedir_recurrence_rule_new (void) ++{ ++ MIMEDirRecurrenceRule *rule; ++ ++ rule = g_object_new (MIMEDIR_TYPE_RECURRENCE_RULE, NULL); ++ ++ return rule; ++} ++ ++/** ++ * mimedir_recurrence_rule_get_frequency: ++ * ++ * Retrieves the base frequency for the corresponding recurrence object. ++ * ++ * Return value: a #MIMEDirRecurrenceFrequency ++ **/ ++MIMEDirRecurrenceFrequency ++mimedir_recurrence_rule_get_frequency (MIMEDirRecurrenceRule *rule) ++{ ++ g_return_val_if_fail (MIMEDIR_IS_RECURRENCE_RULE (rule), 0); ++ ++ return rule->priv->frequency; ++} ++ ++/** ++ * mimedir_recurrence_rule_get_interval: ++ * ++ * Retrieves the interval for the corresponding recurrence object. ++ * ++ * Return value: an #int ++ **/ ++int ++mimedir_recurrence_rule_get_interval (MIMEDirRecurrenceRule *rule) ++{ ++ g_return_val_if_fail (MIMEDIR_IS_RECURRENCE_RULE (rule), 0); ++ ++ return rule->priv->interval; ++} +diff -Nur libmimedir_orig/mimedir/mimedir-recurrence-rule.h libmimedir/mimedir/mimedir-recurrence-rule.h +--- libmimedir_orig/mimedir/mimedir-recurrence-rule.h 1970-01-01 01:00:00.000000000 +0100 ++++ libmimedir/mimedir/mimedir-recurrence-rule.h 2006-08-04 15:52:39.000000000 +0200 +@@ -0,0 +1,74 @@ ++/* RFC 2445 iCal Recurrence Rule Object ++ * Copyright (C) 2004 Phil Blundell ++ * ++ * $Id: mimedir-recurrence.h,v 1.1 2002/08/28 04:57:12 srittau Exp $ ++ * ++ * This library is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU Lesser General Public ++ * License as published by the Free Software Foundation; either ++ * version 2.1 of the License, or (at your option) any later version. ++ * ++ * This library is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ * Lesser General Public License for more details. ++ * ++ * You should have received a copy of the GNU Lesser General Public ++ * License along with this library; if not, write to the Free Software ++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ */ ++ ++#ifndef __MIMEDIR_RECURRENCE_RULE_H__ ++#define __MIMEDIR_RECURRENCE_RULE_H__ ++ ++#include ++#include ++ ++#include "mimedir/mimedir-datetime.h" ++ ++#define MIMEDIR_TYPE_RECURRENCE_RULE (mimedir_recurrence_get_type()) ++#define MIMEDIR_RECURRENCE_RULE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), MIMEDIR_TYPE_RECURRENCE_RULE, MIMEDirRecurrenceRule)) ++#define MIMEDIR_RECURRENCE_RULE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), MIMEDIR_TYPE_RECURRENCE_RULE, MIMEDirRecurrenceRuleClass)) ++#define MIMEDIR_IS_RECURRENCE_RULE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), MIMEDIR_TYPE_RECURRENCE_RULE)) ++#define MIMEDIR_IS_RECURRENCE_RULE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), MIMEDIR_TYPE_RECURRENCE_RULE)) ++ ++typedef struct _MIMEDirRecurrenceRule MIMEDirRecurrenceRule; ++typedef struct _MIMEDirRecurrenceRulePriv MIMEDirRecurrenceRulePriv; ++typedef struct _MIMEDirRecurrenceRuleClass MIMEDirRecurrenceRuleClass; ++ ++typedef enum { ++ MIMEDIR_RECURRENCE_RULE_SECONDLY, ++ MIMEDIR_RECURRENCE_RULE_MINUTELY, ++ MIMEDIR_RECURRENCE_RULE_HOURLY, ++ MIMEDIR_RECURRENCE_RULE_DAILY, ++ MIMEDIR_RECURRENCE_RULE_WEEKLY, ++ MIMEDIR_RECURRENCE_RULE_MONTHLY, ++ MIMEDIR_RECURRENCE_RULE_YEARLY, ++} MIMEDirRecurrenceFrequency; ++ ++struct _MIMEDirRecurrenceRule ++{ ++ GObject parent; ++ ++ MIMEDirRecurrenceRulePriv *priv; ++}; ++ ++struct _MIMEDirRecurrenceRuleClass ++{ ++ GObjectClass parent_class; ++}; ++ ++MIMEDirRecurrenceFrequency mimedir_recurrence_rule_get_frequency (MIMEDirRecurrenceRule *); ++int mimedir_recurrence_rule_get_interval (MIMEDirRecurrenceRule *); ++int mimedir_recurrence_rule_get_count (MIMEDirRecurrenceRule *); ++MIMEDirDateTime *mimedir_recurrence_rule_get_end_date (MIMEDirRecurrenceRule *); ++ ++void mimedir_recurrence_rule_set (MIMEDirRecurrenceRule *, ++ MIMEDirRecurrenceFrequency freq, ++ int interval); ++ ++GType mimedir_recurrence_rule_get_type (void); ++MIMEDirRecurrenceRule *mimedir_recurrence_rule_new (void); ++ ++#endif ++ +diff -Nur libmimedir_orig/mimedir/mimedir-vcomponent.c libmimedir/mimedir/mimedir-vcomponent.c +--- libmimedir_orig/mimedir/mimedir-vcomponent.c 2005-11-26 16:40:20.000000000 +0100 ++++ libmimedir/mimedir/mimedir-vcomponent.c 2006-08-04 15:51:06.000000000 +0200 +@@ -951,52 +951,33 @@ + + s++; + +- num = mimedir_vcomponent_parse_number (name, "DURATION", &s, &err); +- if (err) { +- g_propagate_error (error, err); +- return 0; +- } +- if (s[0] != 'H') { +- g_set_error (error, MIMEDIR_ATTRIBUTE_ERROR, MIMEDIR_ATTRIBUTE_ERROR_INVALID_FORMAT, MIMEDIR_ATTRIBUTE_ERROR_INVALID_FORMAT_STR, "DURATION", name); +- return 0; +- } +- s++; +- duration += num * SECS_PER_HOUR; +- +- if (s[0]) { ++ while (s[0] != '\0') { + num = mimedir_vcomponent_parse_number (name, "DURATION", &s, &err); + if (err) { + g_propagate_error (error, err); + return 0; + } +- if (s[0] != 'M') { +- g_set_error (error, MIMEDIR_ATTRIBUTE_ERROR, MIMEDIR_ATTRIBUTE_ERROR_INVALID_FORMAT, MIMEDIR_ATTRIBUTE_ERROR_INVALID_FORMAT_STR, "DURATION", name); +- return 0; +- } +- s++; +- duration += num * SECS_PER_MINUTE; +- } + +- if (s[0]) { +- num = mimedir_vcomponent_parse_number (name, "DURATION", &s, &err); +- if (err) { +- g_propagate_error (error, err); +- return 0; +- } +- if (s[0] != 'S') { ++ switch (s[0]) { ++ case 'H': ++ s++; ++ duration += num * SECS_PER_HOUR; ++ break; ++ case 'M': ++ s++; ++ duration += num * SECS_PER_MINUTE; ++ break; ++ case 'S': ++ s++; ++ duration += num; ++ break; ++ default: + g_set_error (error, MIMEDIR_ATTRIBUTE_ERROR, MIMEDIR_ATTRIBUTE_ERROR_INVALID_FORMAT, MIMEDIR_ATTRIBUTE_ERROR_INVALID_FORMAT_STR, "DURATION", name); + return 0; + } +- s++; +- duration += num; + } + } + +- if (s[0] != '\0') { +- g_set_error (error, MIMEDIR_ATTRIBUTE_ERROR, MIMEDIR_ATTRIBUTE_ERROR_INVALID_FORMAT, MIMEDIR_ATTRIBUTE_ERROR_INVALID_FORMAT_STR, "DURATION", name); +- return 0; +- } +- + return neg ? -duration : duration; + } + +@@ -2996,7 +2977,7 @@ + g_free (priv->location); + g_free (priv->location_alt); + priv->location = g_strdup (location); +- priv->location_alt = g_strdup (uri); ++ priv->location_alt = uri ? g_strdup (uri) : NULL; + } + + /** diff --git a/packages/libmimedir/libmimedir_0.3.1-20060804.bb b/packages/libmimedir/libmimedir_0.3.1-20060804.bb new file mode 100644 index 0000000000..cf6b9890a8 --- /dev/null +++ b/packages/libmimedir/libmimedir_0.3.1-20060804.bb @@ -0,0 +1,26 @@ +DESCRIPTION = "RFC2425 MIME Directory Profile library, supporting vCard and iCalendar" +SECTION = "libs" +PRIORITY = "optional" +LICENSE = "LGPL" +DEPENDS = "intltool-native glib-2.0" +PR = "r0" +SRCDATE = "20060804" +#Remove the dash below when 0.3.1 changes in PV +PV = "0.3.1+cvs-${SRCDATE}" + +SRC_URI = "cvs://anonymous@anoncvs.gnome.org/cvs/gnome;module=libmimedir \ + file://mimedir-update.patch;patch=1" + +S = "${WORKDIR}/libmimedir" + +inherit autotools pkgconfig + +EXTRA_OECONF = "--disable-gtk-doc" + +do_stage() { + autotools_stage_all +} + +PACKAGES += libmimedir-utils +FILES_libmimedir-utils = "${bindir}" +FILES_${PN} = "${libdir}" diff --git a/packages/libmimedir/libmimedir_cvs.bb b/packages/libmimedir/libmimedir_cvs.bb index 33e918b278..502420c30c 100644 --- a/packages/libmimedir/libmimedir_cvs.bb +++ b/packages/libmimedir/libmimedir_cvs.bb @@ -3,13 +3,15 @@ SECTION = "libs" PRIORITY = "optional" LICENSE = "LGPL" DEPENDS = "intltool-native" -PR = "r1" +PR = "r2" #Remove the dash below when 0.3.1 changes in PV PV = "0.3.1+cvs-${SRCDATE}" DEFAULT_PREFERENCE = -1 -SRC_URI = "cvs://anonymous@anoncvs.gnome.org/cvs/gnome;module=libmimedir" +SRC_URI = "cvs://anonymous@anoncvs.gnome.org/cvs/gnome;module=libmimedir \ + file://mimedir-update.patch;patch=1" + S = "${WORKDIR}/libmimedir" inherit autotools pkgconfig -- cgit v1.2.3 From c71e702c271582fbce2e7f053161fd63eb50a81b Mon Sep 17 00:00:00 2001 From: Frans Meulenbroeks Date: Fri, 4 Aug 2006 15:19:09 +0000 Subject: slugos-packages: added flite --- packages/meta/slugos-packages.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/meta/slugos-packages.bb b/packages/meta/slugos-packages.bb index f729c7f22b..fc0830d7dc 100644 --- a/packages/meta/slugos-packages.bb +++ b/packages/meta/slugos-packages.bb @@ -6,7 +6,7 @@ DESCRIPTION = "Packages that are compatible with the SlugOS firmware" MAINTAINER = "NSLU2 Linux " HOMEPAGE = "http://www.nslu2-linux.org" LICENSE = "MIT" -PR = "r6" +PR = "r7" CONFLICTS = "db3" PROVIDES += "${SLUGOS_IMAGENAME}-packages" @@ -61,6 +61,7 @@ SLUGOS_PACKAGES = "\ findutils \ flac \ flex \ + flite \ ftpd-topfield \ gawk \ gcc \ -- cgit v1.2.3 From a5894e850262e62e8d03579da7a46016a8fe747e Mon Sep 17 00:00:00 2001 From: Frans Meulenbroeks Date: Fri, 4 Aug 2006 16:50:02 +0000 Subject: slugos-packages: added madplay --- packages/meta/slugos-packages.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/meta/slugos-packages.bb b/packages/meta/slugos-packages.bb index fc0830d7dc..df2b252813 100644 --- a/packages/meta/slugos-packages.bb +++ b/packages/meta/slugos-packages.bb @@ -6,7 +6,7 @@ DESCRIPTION = "Packages that are compatible with the SlugOS firmware" MAINTAINER = "NSLU2 Linux " HOMEPAGE = "http://www.nslu2-linux.org" LICENSE = "MIT" -PR = "r7" +PR = "r8" CONFLICTS = "db3" PROVIDES += "${SLUGOS_IMAGENAME}-packages" @@ -101,6 +101,7 @@ SLUGOS_PACKAGES = "\ lsof \ lvm2 \ m4 \ + madplay \ madwifi-ng \ mailx \ make \ -- cgit v1.2.3 From 26740980c00dae3b17a8272c8bc0c04848b398e6 Mon Sep 17 00:00:00 2001 From: Frans Meulenbroeks Date: Fri, 4 Aug 2006 21:35:36 +0000 Subject: linphone: upgraded to 1.3.99 (console), courtesy of Thomas Reitmayr --- packages/linphone/linphone-1.3.99.8/.mtn2git_empty | 0 packages/linphone/linphone-1.3.99.8/conf.patch | 33 ++++++++++++++++++++++ packages/linphone/linphone_1.3.99.8.bb | 27 ++++++++++++++++++ 3 files changed, 60 insertions(+) create mode 100644 packages/linphone/linphone-1.3.99.8/.mtn2git_empty create mode 100644 packages/linphone/linphone-1.3.99.8/conf.patch create mode 100644 packages/linphone/linphone_1.3.99.8.bb diff --git a/packages/linphone/linphone-1.3.99.8/.mtn2git_empty b/packages/linphone/linphone-1.3.99.8/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/linphone/linphone-1.3.99.8/conf.patch b/packages/linphone/linphone-1.3.99.8/conf.patch new file mode 100644 index 0000000000..e8fbdf22c8 --- /dev/null +++ b/packages/linphone/linphone-1.3.99.8/conf.patch @@ -0,0 +1,33 @@ +--- a/configure.in ++++ b/configure.in +@@ -30,7 +30,7 @@ + AM_PROG_CC_STDC + AC_HEADER_STDC + dnl localization tools +-ifdef([IT_PROG_INTLTOOL],[IT_PROG_INTLTOOL],[AC_PROG_INTLTOOL]) ++dnl ifdef([IT_PROG_INTLTOOL],[IT_PROG_INTLTOOL],[AC_PROG_INTLTOOL]) + dnl Initialize libtool + AC_PROG_LIBTOOL + AM_PROG_LIBTOOL +@@ -62,7 +62,7 @@ + gnome_ui=false + fi + +-CFLAGS="$CFLAGS -I\$(prefix)/include" ++dnl CFLAGS="$CFLAGS -I\$(prefix)/include" + + if test "$gnome_ui" = "true" ; then + +--- a/mediastreamer2/configure.ac ++++ b/mediastreamer2/configure.ac +@@ -47,8 +47,8 @@ + [wall_werror=yes] + ) + +-CFLAGS="-DORTP_INET6 $CFLAGS -I\$(prefix)/include" +-LIBS="$LIBS -L\$(prefix)/lib" ++dnl CFLAGS="-DORTP_INET6 $CFLAGS -I\$(prefix)/include" ++dnl LIBS="$LIBS -L\$(prefix)/lib" + + dnl enable ipv6 support + AC_ARG_ENABLE(ipv6, diff --git a/packages/linphone/linphone_1.3.99.8.bb b/packages/linphone/linphone_1.3.99.8.bb new file mode 100644 index 0000000000..05998f889d --- /dev/null +++ b/packages/linphone/linphone_1.3.99.8.bb @@ -0,0 +1,27 @@ +DESCRIPTION = "SIP-based IP phone (Console edition)" +HOMEPAGE = "http://www.linphone.org/?lang=us" +LICENSE = "GPL-2" +DEPENDS = "libosip2 speex libogg alsa-lib readline" +PR = "r0" + +SRC_URI = "http://download.savannah.nongnu.org/releases/linphone/unstable/source/linphone-${PV}.tar.gz \ + file://conf.patch;patch=1" + +S = "${WORKDIR}/linphone-${PV}" + +FILES_${PN} += "${datadir}/linphonec" + +inherit autotools + +EXTRA_OECONF = "--disable-gnome_ui --disable-gtk-doc --without-ffmpeg \ + --without-sdl --disable-video --enable-alsa \ + --with-osip=${STAGING_DIR}/${HOST_SYS} \ + --with-readline=${STAGING_DIR}/${HOST_SYS} \ + --with-speex=${STAGING_DIR}/${HOST_SYS} \ + --disable-truespeech --disable-manual \ + --disable-glibtest --disable-glib" + +do_install_append() { + rm -f ${D}${datadir}/sounds/linphone/hello*.wav + rm -f ${D}${datadir}/sounds/linphone/rings/oldphone.wav +} -- cgit v1.2.3 From a9b96c7308bcb4bfaf5d1fba983375d54f4b386f Mon Sep 17 00:00:00 2001 From: Frans Meulenbroeks Date: Fri, 4 Aug 2006 21:37:08 +0000 Subject: slugos-packages.bb: added linphone --- packages/meta/slugos-packages.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/meta/slugos-packages.bb b/packages/meta/slugos-packages.bb index df2b252813..3ac59c3719 100644 --- a/packages/meta/slugos-packages.bb +++ b/packages/meta/slugos-packages.bb @@ -6,7 +6,7 @@ DESCRIPTION = "Packages that are compatible with the SlugOS firmware" MAINTAINER = "NSLU2 Linux " HOMEPAGE = "http://www.nslu2-linux.org" LICENSE = "MIT" -PR = "r8" +PR = "r9" CONFLICTS = "db3" PROVIDES += "${SLUGOS_IMAGENAME}-packages" @@ -96,6 +96,7 @@ SLUGOS_PACKAGES = "\ libusb \ libvorbis \ libxml2 \ + linphone \ lirc \ lrzsz \ lsof \ -- cgit v1.2.3 From 724605880f14b284a20d341cc39c7578e1b1c35d Mon Sep 17 00:00:00 2001 From: Justin Patrin Date: Fri, 4 Aug 2006 21:59:07 +0000 Subject: entice: add explicit esmart RDEPENDS --- packages/e17/entice_20060128.bb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/e17/entice_20060128.bb b/packages/e17/entice_20060128.bb index ffc07f7661..271bcc0e8f 100644 --- a/packages/e17/entice_20060128.bb +++ b/packages/e17/entice_20060128.bb @@ -2,10 +2,12 @@ DESCRIPTION = "Entice is the E17 picture viewer" # can also depend on GIMP for editing DEPENDS = "edb evas-x11 ecore-x11 edje epsilon esmart-x11" LICENSE = "MIT" -PR = "r1" +PR = "r2" inherit e +RDEPENDS += "esmart-x11" + SRC_URI = "${E_CVS};module=e17/apps/entice;date=${PV}" S = "${WORKDIR}/entice" -- cgit v1.2.3 From e9de7a29dfc59a02a854ee89b8e3b1e897a83792 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Sat, 5 Aug 2006 10:28:21 +0000 Subject: python-native 2.4.0 don't modify first shebang line when installing packages via distutils. closes #1271 --- .../python-native-2.4.0/dont-modify-shebang-line.patch | 16 ++++++++++++++++ packages/python/python-native_2.4.0.bb | 10 ++++++---- 2 files changed, 22 insertions(+), 4 deletions(-) create mode 100644 packages/python/python-native-2.4.0/dont-modify-shebang-line.patch diff --git a/packages/python/python-native-2.4.0/dont-modify-shebang-line.patch b/packages/python/python-native-2.4.0/dont-modify-shebang-line.patch new file mode 100644 index 0000000000..54109afd62 --- /dev/null +++ b/packages/python/python-native-2.4.0/dont-modify-shebang-line.patch @@ -0,0 +1,16 @@ + +# +# Signed off by Michael 'Mickey' Lauer +# + +--- Python-2.4/Lib/distutils/command/build_scripts.py~dont-modify-shebang-line ++++ Python-2.4/Lib/distutils/command/build_scripts.py +@@ -87,7 +87,7 @@ + continue + + match = first_line_re.match(first_line) +- if match: ++ if False: #match: + adjust = 1 + post_interp = match.group(1) or '' + diff --git a/packages/python/python-native_2.4.0.bb b/packages/python/python-native_2.4.0.bb index 00092d1e15..4f5db82569 100644 --- a/packages/python/python-native_2.4.0.bb +++ b/packages/python/python-native_2.4.0.bb @@ -5,13 +5,14 @@ SECTION = "devel/python" PRIORITY = "optional" MAINTAINER = "Michael 'Mickey' Lauer " DEPENDS = "" -PR = "r0" +PR = "r1" EXCLUDE_FROM_WORLD = "1" SRC_URI = "http://www.python.org/ftp/python/2.4/Python-2.4.tar.bz2 \ - file://bindir-libdir.patch;patch=1 \ - file://cross-distutils.patch;patch=1" + file://bindir-libdir.patch;patch=1 \ + file://cross-distutils.patch;patch=1 \ + file://dont-modify-shebang-line.patch;patch=1" S = "${WORKDIR}/Python-2.4" inherit autotools native @@ -20,7 +21,8 @@ EXTRA_OECONF = "--with-threads --with-pymalloc --with-cyclic-gc --without-cxx -- --with-prefix=${STAGING_DIR} --with-exec-prefix=${STAGING_DIR}/${BUILD_SYS}" EXTRA_OEMAKE = 'BUILD_SYS="" HOST_SYS=""' -do_configure () { +do_configure() { + # the autofoo stuff is too old to allow regenerating oe_runconf } -- cgit v1.2.3 From 7f055c4ffb2bddec2da28bbf35069ef28396cd5b Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Sat, 5 Aug 2006 10:29:04 +0000 Subject: python-native 2.3.3 remove --- packages/python/python-native-2.3.3/.mtn2git_empty | 0 .../python/python-native-2.3.3/bindir-libdir.patch | 18 ---------- .../python-native-2.3.3/cross-distutils.patch | 38 ---------------------- packages/python/python-native_2.3.3.bb | 29 ----------------- 4 files changed, 85 deletions(-) delete mode 100644 packages/python/python-native-2.3.3/.mtn2git_empty delete mode 100644 packages/python/python-native-2.3.3/bindir-libdir.patch delete mode 100644 packages/python/python-native-2.3.3/cross-distutils.patch delete mode 100644 packages/python/python-native_2.3.3.bb diff --git a/packages/python/python-native-2.3.3/.mtn2git_empty b/packages/python/python-native-2.3.3/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/python/python-native-2.3.3/bindir-libdir.patch b/packages/python/python-native-2.3.3/bindir-libdir.patch deleted file mode 100644 index 999bddc449..0000000000 --- a/packages/python/python-native-2.3.3/bindir-libdir.patch +++ /dev/null @@ -1,18 +0,0 @@ - -# -# Made by http://www.mn-logistik.de/unsupported/pxa250/patcher -# - ---- Python-2.3.1/Makefile.pre.in~bindir-libdir 2003-09-20 12:50:28.000000000 +0200 -+++ Python-2.3.1/Makefile.pre.in 2003-11-02 19:53:17.000000000 +0100 -@@ -78,8 +78,8 @@ - exec_prefix= @exec_prefix@ - - # Expanded directories --BINDIR= $(exec_prefix)/bin --LIBDIR= $(exec_prefix)/lib -+BINDIR= @bindir@ -+LIBDIR= @libdir@ - MANDIR= @mandir@ - INCLUDEDIR= @includedir@ - CONFINCLUDEDIR= $(exec_prefix)/include diff --git a/packages/python/python-native-2.3.3/cross-distutils.patch b/packages/python/python-native-2.3.3/cross-distutils.patch deleted file mode 100644 index 76ae883c1d..0000000000 --- a/packages/python/python-native-2.3.3/cross-distutils.patch +++ /dev/null @@ -1,38 +0,0 @@ - -# -# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher -# - ---- Python-2.3.3/Lib/distutils/sysconfig.py~cross-distutils 2003-02-10 15:02:33.000000000 +0100 -+++ Python-2.3.3/Lib/distutils/sysconfig.py 2004-03-02 20:15:05.000000000 +0100 -@@ -19,8 +19,8 @@ - from errors import DistutilsPlatformError - - # These are needed in a couple of spots, so just compute them once. --PREFIX = os.path.normpath(sys.prefix) --EXEC_PREFIX = os.path.normpath(sys.exec_prefix) -+PREFIX = os.path.normpath(sys.prefix).replace( os.getenv("BUILD_SYS"), os.getenv("HOST_SYS") ) -+EXEC_PREFIX = os.path.normpath(sys.exec_prefix).replace( os.getenv("BUILD_SYS"), os.getenv("HOST_SYS") ) - - # python_build: (Boolean) if true, we're either building Python or - # building an extension with an un-installed Python, so we use -@@ -192,7 +192,8 @@ - else: - # The name of the config.h file changed in 2.2 - config_h = 'pyconfig.h' -- return os.path.join(inc_dir, config_h) -+ print "NOTE: sysconfig.get_config_h_filename() altered for OpenEmbedded" -+ return os.path.join(inc_dir, config_h).replace( os.getenv("BUILD_SYS"), os.getenv("HOST_SYS") ) - - - def get_makefile_filename(): -@@ -200,7 +201,8 @@ - if python_build: - return os.path.join(os.path.dirname(sys.executable), "Makefile") - lib_dir = get_python_lib(plat_specific=1, standard_lib=1) -- return os.path.join(lib_dir, "config", "Makefile") -+ print "NOTE: sysconfig.get_config_h_filename() altered for OpenEmbedded" -+ return os.path.join(lib_dir, "config", "Makefile").replace( os.getenv("BUILD_SYS"), os.getenv("HOST_SYS") ) - - - def parse_config_h(fp, g=None): diff --git a/packages/python/python-native_2.3.3.bb b/packages/python/python-native_2.3.3.bb deleted file mode 100644 index 8f2e782a7b..0000000000 --- a/packages/python/python-native_2.3.3.bb +++ /dev/null @@ -1,29 +0,0 @@ -DESCRIPTION = "Python Programming Language" -HOMEPAGE = "http://www.python.org" -LICENSE = "PSF" -SECTION = "devel/python" -PRIORITY = "optional" -MAINTAINER = "Michael 'Mickey' Lauer " -DEPENDS = "" -PR = "r1" - -SRC_URI = "http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.bz2 \ - file://bindir-libdir.patch;patch=1 \ - file://cross-distutils.patch;patch=1" -S = "${WORKDIR}/Python-${PV}" - -inherit autotools native - -EXTRA_OECONF = "--with-threads --with-pymalloc --with-cyclic-gc --without-cxx --with-signal-module --with-wctype-functions \ - --with-prefix=${STAGING_DIR} --with-exec-prefix=${STAGING_DIR}/${BUILD_SYS}" -EXTRA_OEMAKE = 'BUILD_SYS="" HOST_SYS=""' - -do_configure () { - oe_runconf -} - -do_stage_append() { - # install pgen for later usage with non-native builds - install Parser/pgen ${STAGING_DIR}/${BUILD_SYS}/bin/ -} - -- cgit v1.2.3 From f865d07dd9fd79c0e504199c6845e63c735262ef Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Sat, 5 Aug 2006 13:15:40 +0000 Subject: entice: "esmart-x11" doesn't exist in packageland, libesmart0 does --- packages/e17/entice_20060128.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/e17/entice_20060128.bb b/packages/e17/entice_20060128.bb index 271bcc0e8f..48c37c72a2 100644 --- a/packages/e17/entice_20060128.bb +++ b/packages/e17/entice_20060128.bb @@ -2,11 +2,11 @@ DESCRIPTION = "Entice is the E17 picture viewer" # can also depend on GIMP for editing DEPENDS = "edb evas-x11 ecore-x11 edje epsilon esmart-x11" LICENSE = "MIT" -PR = "r2" +PR = "r3" inherit e -RDEPENDS += "esmart-x11" +RDEPENDS += "libesmart-container-plugins libesmart-thumb0 libesmart-trans-x11-0 libesmart-file-dialog0" SRC_URI = "${E_CVS};module=e17/apps/entice;date=${PV}" S = "${WORKDIR}/entice" -- cgit v1.2.3 From 13955e0d155fdc82909879a27e28ad95de214778 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Sat, 5 Aug 2006 13:17:14 +0000 Subject: angstrom 2006.9: fix typo spotted by Philipp Zabel --- conf/distro/angstrom-2006.9.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/distro/angstrom-2006.9.conf b/conf/distro/angstrom-2006.9.conf index 020e3f98a3..058f39214e 100644 --- a/conf/distro/angstrom-2006.9.conf +++ b/conf/distro/angstrom-2006.9.conf @@ -51,7 +51,7 @@ PREFERRED_VERSION_freetype = "2.2.1" #Small machines prefer kdrive, but we might ship full Xorg in other images PREFERRED_PROVIDER_virtual/xserver ?= "xserver-kdrive" -PREFERRED_PROVIDER_xserver ?= "xserver-drive" +PREFERRED_PROVIDER_xserver ?= "xserver-kdrive" require conf/distro/include/preferred-xorg-versions-X11R7.1.inc -- cgit v1.2.3 From d82b6c19757a5f26f82a853d468820585bdd2031 Mon Sep 17 00:00:00 2001 From: Holger Freyther Date: Sat, 5 Aug 2006 13:32:08 +0000 Subject: packages/gcc: Use require instead of include for the 'base' files --- packages/gcc/gcc-cross-initial_3.3.3.bb | 2 +- packages/gcc/gcc-cross-initial_3.3.4.bb | 2 +- packages/gcc/gcc-cross-initial_3.4.3.bb | 2 +- packages/gcc/gcc-cross-initial_3.4.4.bb | 2 +- packages/gcc/gcc-cross-initial_4.0.2.bb | 2 +- packages/gcc/gcc-cross-initial_4.1-20060217.bb | 2 +- packages/gcc/gcc-cross-initial_4.1.0.bb | 2 +- packages/gcc/gcc-cross-initial_4.1.1.bb | 2 +- packages/gcc/gcc-cross-initial_csl-arm-2005q3.bb | 2 +- packages/gcc/gcc-cross-initial_csl-arm-cvs.bb | 2 +- packages/gcc/gcc-cross-kernel-3.3.3_3.3.3.bb | 2 +- packages/gcc/gcc-cross-kernel-3.3.4_3.3.4.bb | 2 +- packages/gcc/gcc-cross-kernel-3.4.4_3.4.4.bb | 2 +- packages/gcc/gcc-cross-sdk_3.3.4.bb | 6 +++--- packages/gcc/gcc-cross-sdk_3.4.3.bb | 6 +++--- packages/gcc/gcc-cross-sdk_3.4.4.bb | 6 +++--- packages/gcc/gcc-cross-sdk_4.1.0.bb | 6 +++--- packages/gcc/gcc-cross_3.3.3.bb | 2 +- packages/gcc/gcc-cross_3.3.4.bb | 8 ++++---- packages/gcc/gcc-cross_3.4.3.bb | 8 ++++---- packages/gcc/gcc-cross_3.4.4.bb | 8 ++++---- packages/gcc/gcc-cross_4.0.0.bb | 8 ++++---- packages/gcc/gcc-cross_4.0.2.bb | 8 ++++---- packages/gcc/gcc-cross_4.1-20060217.bb | 8 ++++---- packages/gcc/gcc-cross_4.1.0.bb | 8 ++++---- packages/gcc/gcc-cross_4.1.1.bb | 8 ++++---- packages/gcc/gcc-cross_4.2-20060513.bb | 8 ++++---- packages/gcc/gcc-cross_csl-arm-2005q3.bb | 8 ++++---- packages/gcc/gcc-cross_csl-arm-cvs.bb | 8 ++++---- packages/gcc/gcc-cross_csl-arm.bb | 8 ++++---- packages/gcc/gcc_3.4.3.bb | 4 ++-- packages/gcc/gcc_3.4.4.bb | 4 ++-- packages/gcc/gcc_4.0.0.bb | 4 ++-- packages/gcc/gcc_4.0.2.bb | 4 ++-- packages/gcc/gcc_4.1-20060217.bb | 4 ++-- packages/gcc/gcc_4.1.0.bb | 4 ++-- packages/gcc/gcc_4.1.1.bb | 4 ++-- packages/gcc/gcc_4.2-20060513.bb | 4 ++-- packages/gcc/gcc_csl-arm-2005q3.bb | 4 ++-- packages/gcc/gcc_csl-arm-cvs.bb | 2 +- packages/gcc/gcc_csl-arm.bb | 4 ++-- 41 files changed, 95 insertions(+), 95 deletions(-) diff --git a/packages/gcc/gcc-cross-initial_3.3.3.bb b/packages/gcc/gcc-cross-initial_3.3.3.bb index e3b365da18..c650e4fe57 100644 --- a/packages/gcc/gcc-cross-initial_3.3.3.bb +++ b/packages/gcc/gcc-cross-initial_3.3.3.bb @@ -1,5 +1,5 @@ SECTION = "devel" -include gcc-cross_${PV}.bb +require gcc-cross_${PV}.bb DEPENDS = "virtual/${TARGET_PREFIX}binutils" DEPENDS += "${@['virtual/${TARGET_PREFIX}libc-initial',''][bb.data.getVar('TARGET_ARCH', d, 1) in ['arm', 'armeb', 'mips', 'mipsel']]}" diff --git a/packages/gcc/gcc-cross-initial_3.3.4.bb b/packages/gcc/gcc-cross-initial_3.3.4.bb index e3b365da18..c650e4fe57 100644 --- a/packages/gcc/gcc-cross-initial_3.3.4.bb +++ b/packages/gcc/gcc-cross-initial_3.3.4.bb @@ -1,5 +1,5 @@ SECTION = "devel" -include gcc-cross_${PV}.bb +require gcc-cross_${PV}.bb DEPENDS = "virtual/${TARGET_PREFIX}binutils" DEPENDS += "${@['virtual/${TARGET_PREFIX}libc-initial',''][bb.data.getVar('TARGET_ARCH', d, 1) in ['arm', 'armeb', 'mips', 'mipsel']]}" diff --git a/packages/gcc/gcc-cross-initial_3.4.3.bb b/packages/gcc/gcc-cross-initial_3.4.3.bb index 48c80864e2..307c6f7d4c 100644 --- a/packages/gcc/gcc-cross-initial_3.4.3.bb +++ b/packages/gcc/gcc-cross-initial_3.4.3.bb @@ -1,4 +1,4 @@ -include gcc-cross_${PV}.bb +require gcc-cross_${PV}.bb DEPENDS = "virtual/${TARGET_PREFIX}binutils" DEPENDS += "${@['virtual/${TARGET_PREFIX}libc-initial',''][bb.data.getVar('TARGET_ARCH', d, 1) in ['arm', 'armeb', 'mips', 'mipsel']]}" diff --git a/packages/gcc/gcc-cross-initial_3.4.4.bb b/packages/gcc/gcc-cross-initial_3.4.4.bb index 48c80864e2..307c6f7d4c 100644 --- a/packages/gcc/gcc-cross-initial_3.4.4.bb +++ b/packages/gcc/gcc-cross-initial_3.4.4.bb @@ -1,4 +1,4 @@ -include gcc-cross_${PV}.bb +require gcc-cross_${PV}.bb DEPENDS = "virtual/${TARGET_PREFIX}binutils" DEPENDS += "${@['virtual/${TARGET_PREFIX}libc-initial',''][bb.data.getVar('TARGET_ARCH', d, 1) in ['arm', 'armeb', 'mips', 'mipsel']]}" diff --git a/packages/gcc/gcc-cross-initial_4.0.2.bb b/packages/gcc/gcc-cross-initial_4.0.2.bb index 68dafe3f1a..037f3032a6 100644 --- a/packages/gcc/gcc-cross-initial_4.0.2.bb +++ b/packages/gcc/gcc-cross-initial_4.0.2.bb @@ -1,4 +1,4 @@ -include gcc-cross_${PV}.bb +require gcc-cross_${PV}.bb DEPENDS = "virtual/${TARGET_PREFIX}binutils" DEPENDS += "${@['virtual/${TARGET_PREFIX}libc-initial',''][bb.data.getVar('TARGET_ARCH', d, 1) in ['arm', 'armeb', 'mips', 'mipsel']]}" diff --git a/packages/gcc/gcc-cross-initial_4.1-20060217.bb b/packages/gcc/gcc-cross-initial_4.1-20060217.bb index 68dafe3f1a..037f3032a6 100644 --- a/packages/gcc/gcc-cross-initial_4.1-20060217.bb +++ b/packages/gcc/gcc-cross-initial_4.1-20060217.bb @@ -1,4 +1,4 @@ -include gcc-cross_${PV}.bb +require gcc-cross_${PV}.bb DEPENDS = "virtual/${TARGET_PREFIX}binutils" DEPENDS += "${@['virtual/${TARGET_PREFIX}libc-initial',''][bb.data.getVar('TARGET_ARCH', d, 1) in ['arm', 'armeb', 'mips', 'mipsel']]}" diff --git a/packages/gcc/gcc-cross-initial_4.1.0.bb b/packages/gcc/gcc-cross-initial_4.1.0.bb index 63308c2cfe..1e23ef9330 100644 --- a/packages/gcc/gcc-cross-initial_4.1.0.bb +++ b/packages/gcc/gcc-cross-initial_4.1.0.bb @@ -1,4 +1,4 @@ -include gcc-cross_${PV}.bb +require gcc-cross_${PV}.bb DEPENDS = "virtual/${TARGET_PREFIX}binutils" DEPENDS += "${@['virtual/${TARGET_PREFIX}libc-initial',''][bb.data.getVar('TARGET_ARCH', d, 1) in ['arm', 'armeb', 'mips', 'mipsel']]}" diff --git a/packages/gcc/gcc-cross-initial_4.1.1.bb b/packages/gcc/gcc-cross-initial_4.1.1.bb index 63308c2cfe..1e23ef9330 100644 --- a/packages/gcc/gcc-cross-initial_4.1.1.bb +++ b/packages/gcc/gcc-cross-initial_4.1.1.bb @@ -1,4 +1,4 @@ -include gcc-cross_${PV}.bb +require gcc-cross_${PV}.bb DEPENDS = "virtual/${TARGET_PREFIX}binutils" DEPENDS += "${@['virtual/${TARGET_PREFIX}libc-initial',''][bb.data.getVar('TARGET_ARCH', d, 1) in ['arm', 'armeb', 'mips', 'mipsel']]}" diff --git a/packages/gcc/gcc-cross-initial_csl-arm-2005q3.bb b/packages/gcc/gcc-cross-initial_csl-arm-2005q3.bb index 48c80864e2..307c6f7d4c 100644 --- a/packages/gcc/gcc-cross-initial_csl-arm-2005q3.bb +++ b/packages/gcc/gcc-cross-initial_csl-arm-2005q3.bb @@ -1,4 +1,4 @@ -include gcc-cross_${PV}.bb +require gcc-cross_${PV}.bb DEPENDS = "virtual/${TARGET_PREFIX}binutils" DEPENDS += "${@['virtual/${TARGET_PREFIX}libc-initial',''][bb.data.getVar('TARGET_ARCH', d, 1) in ['arm', 'armeb', 'mips', 'mipsel']]}" diff --git a/packages/gcc/gcc-cross-initial_csl-arm-cvs.bb b/packages/gcc/gcc-cross-initial_csl-arm-cvs.bb index 48c80864e2..307c6f7d4c 100644 --- a/packages/gcc/gcc-cross-initial_csl-arm-cvs.bb +++ b/packages/gcc/gcc-cross-initial_csl-arm-cvs.bb @@ -1,4 +1,4 @@ -include gcc-cross_${PV}.bb +require gcc-cross_${PV}.bb DEPENDS = "virtual/${TARGET_PREFIX}binutils" DEPENDS += "${@['virtual/${TARGET_PREFIX}libc-initial',''][bb.data.getVar('TARGET_ARCH', d, 1) in ['arm', 'armeb', 'mips', 'mipsel']]}" diff --git a/packages/gcc/gcc-cross-kernel-3.3.3_3.3.3.bb b/packages/gcc/gcc-cross-kernel-3.3.3_3.3.3.bb index 7db2409093..7f274bee30 100644 --- a/packages/gcc/gcc-cross-kernel-3.3.3_3.3.3.bb +++ b/packages/gcc/gcc-cross-kernel-3.3.3_3.3.3.bb @@ -2,7 +2,7 @@ SECTION = "devel" # cut-down gcc for kernel builds # only installs ${TARGET_PREFIX}gcc-${PV}, not ${TARGET_PREFIX}gcc. -include gcc-cross-initial_${PV}.bb +require gcc-cross-initial_${PV}.bb PROVIDES = "virtual/${TARGET_PREFIX}gcc-${PV}" diff --git a/packages/gcc/gcc-cross-kernel-3.3.4_3.3.4.bb b/packages/gcc/gcc-cross-kernel-3.3.4_3.3.4.bb index 7db2409093..7f274bee30 100644 --- a/packages/gcc/gcc-cross-kernel-3.3.4_3.3.4.bb +++ b/packages/gcc/gcc-cross-kernel-3.3.4_3.3.4.bb @@ -2,7 +2,7 @@ SECTION = "devel" # cut-down gcc for kernel builds # only installs ${TARGET_PREFIX}gcc-${PV}, not ${TARGET_PREFIX}gcc. -include gcc-cross-initial_${PV}.bb +require gcc-cross-initial_${PV}.bb PROVIDES = "virtual/${TARGET_PREFIX}gcc-${PV}" diff --git a/packages/gcc/gcc-cross-kernel-3.4.4_3.4.4.bb b/packages/gcc/gcc-cross-kernel-3.4.4_3.4.4.bb index 368cbb1e47..03c6ce2b86 100644 --- a/packages/gcc/gcc-cross-kernel-3.4.4_3.4.4.bb +++ b/packages/gcc/gcc-cross-kernel-3.4.4_3.4.4.bb @@ -2,7 +2,7 @@ SECTION = "devel" # cut-down gcc for kernel builds # only installs ${TARGET_PREFIX}gcc-${PV}, not ${TARGET_PREFIX}gcc. -include gcc-cross-initial_${PV}.bb +require gcc-cross-initial_${PV}.bb PROVIDES = "virtual/${TARGET_PREFIX}gcc-${PV}" diff --git a/packages/gcc/gcc-cross-sdk_3.3.4.bb b/packages/gcc/gcc-cross-sdk_3.3.4.bb index deb92c9b32..4b2c583fcb 100644 --- a/packages/gcc/gcc-cross-sdk_3.3.4.bb +++ b/packages/gcc/gcc-cross-sdk_3.3.4.bb @@ -2,7 +2,7 @@ DESCRIPTION = "The GNU cc and gcc C compilers." HOMEPAGE = "http://www.gnu.org/software/gcc/" SECTION = "devel" LICENSE = "GPL" -include gcc_${PV}.bb +require gcc_${PV}.bb PR = "r3" inherit sdk @@ -12,5 +12,5 @@ FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}" DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc" PACKAGES = "${PN}" -include gcc3-build-sdk.inc -include gcc-package-sdk.inc +require gcc3-build-sdk.inc +require gcc-package-sdk.inc diff --git a/packages/gcc/gcc-cross-sdk_3.4.3.bb b/packages/gcc/gcc-cross-sdk_3.4.3.bb index 205606331e..e6907deb1b 100644 --- a/packages/gcc/gcc-cross-sdk_3.4.3.bb +++ b/packages/gcc/gcc-cross-sdk_3.4.3.bb @@ -2,7 +2,7 @@ DESCRIPTION = "The GNU cc and gcc C compilers." HOMEPAGE = "http://www.gnu.org/software/gcc/" SECTION = "devel" LICENSE = "GPL" -include gcc_${PV}.bb +require gcc_${PV}.bb PR = "r0" inherit sdk @@ -12,5 +12,5 @@ FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}" DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc" PACKAGES = "${PN}" -include gcc3-build-sdk.inc -include gcc-package-sdk.inc +require gcc3-build-sdk.inc +require gcc-package-sdk.inc diff --git a/packages/gcc/gcc-cross-sdk_3.4.4.bb b/packages/gcc/gcc-cross-sdk_3.4.4.bb index 205606331e..e6907deb1b 100644 --- a/packages/gcc/gcc-cross-sdk_3.4.4.bb +++ b/packages/gcc/gcc-cross-sdk_3.4.4.bb @@ -2,7 +2,7 @@ DESCRIPTION = "The GNU cc and gcc C compilers." HOMEPAGE = "http://www.gnu.org/software/gcc/" SECTION = "devel" LICENSE = "GPL" -include gcc_${PV}.bb +require gcc_${PV}.bb PR = "r0" inherit sdk @@ -12,5 +12,5 @@ FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}" DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc" PACKAGES = "${PN}" -include gcc3-build-sdk.inc -include gcc-package-sdk.inc +require gcc3-build-sdk.inc +require gcc-package-sdk.inc diff --git a/packages/gcc/gcc-cross-sdk_4.1.0.bb b/packages/gcc/gcc-cross-sdk_4.1.0.bb index 671ee68b36..7233f79504 100644 --- a/packages/gcc/gcc-cross-sdk_4.1.0.bb +++ b/packages/gcc/gcc-cross-sdk_4.1.0.bb @@ -2,7 +2,7 @@ DESCRIPTION = "The GNU cc and gcc C compilers." HOMEPAGE = "http://www.gnu.org/software/gcc/" SECTION = "devel" LICENSE = "GPL" -include gcc_${PV}.bb +require gcc_${PV}.bb PR = "r0" inherit sdk @@ -12,5 +12,5 @@ FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}" DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc" PACKAGES = "${PN}" -include gcc4-build-sdk.inc -include gcc-package-sdk.inc +require gcc4-build-sdk.inc +require gcc-package-sdk.inc diff --git a/packages/gcc/gcc-cross_3.3.3.bb b/packages/gcc/gcc-cross_3.3.3.bb index 44ba65269e..a24752fe89 100644 --- a/packages/gcc/gcc-cross_3.3.3.bb +++ b/packages/gcc/gcc-cross_3.3.3.bb @@ -1,5 +1,5 @@ SECTION = "devel" -include gcc_${PV}.bb +require gcc_${PV}.bb inherit cross FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}" diff --git a/packages/gcc/gcc-cross_3.3.4.bb b/packages/gcc/gcc-cross_3.3.4.bb index 597b47fba8..f7a2cded51 100644 --- a/packages/gcc/gcc-cross_3.3.4.bb +++ b/packages/gcc/gcc-cross_3.3.4.bb @@ -1,6 +1,6 @@ SECTION = "devel" -include gcc_${PV}.bb -include gcc-paths-cross.inc +require gcc_${PV}.bb +require gcc-paths-cross.inc inherit cross FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}" @@ -9,5 +9,5 @@ PR="r3" DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc" PROVIDES = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++" -include gcc3-build-cross.inc -include gcc-package-cross.inc \ No newline at end of file +require gcc3-build-cross.inc +require gcc-package-cross.inc \ No newline at end of file diff --git a/packages/gcc/gcc-cross_3.4.3.bb b/packages/gcc/gcc-cross_3.4.3.bb index a5d1bda170..b61223b39c 100644 --- a/packages/gcc/gcc-cross_3.4.3.bb +++ b/packages/gcc/gcc-cross_3.4.3.bb @@ -1,6 +1,6 @@ -include gcc_${PV}.bb +require gcc_${PV}.bb # path mangling, needed by the cross packaging -include gcc-paths-cross.inc +require gcc-paths-cross.inc inherit cross FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}" # NOTE: split PR. If the main .oe changes something that affects its *build* @@ -11,6 +11,6 @@ DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc PROVIDES = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++" # cross build -include gcc3-build-cross.inc +require gcc3-build-cross.inc # cross packaging -include gcc-package-cross.inc +require gcc-package-cross.inc diff --git a/packages/gcc/gcc-cross_3.4.4.bb b/packages/gcc/gcc-cross_3.4.4.bb index d965e5b399..ef679365e1 100644 --- a/packages/gcc/gcc-cross_3.4.4.bb +++ b/packages/gcc/gcc-cross_3.4.4.bb @@ -1,6 +1,6 @@ -include gcc_${PV}.bb +require gcc_${PV}.bb # path mangling, needed by the cross packaging -include gcc-paths-cross.inc +require gcc-paths-cross.inc inherit cross FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}" # NOTE: split PR. If the main .oe changes something that affects its *build* @@ -11,6 +11,6 @@ DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc PROVIDES = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++" # cross build -include gcc3-build-cross.inc +require gcc3-build-cross.inc # cross packaging -include gcc-package-cross.inc +require gcc-package-cross.inc diff --git a/packages/gcc/gcc-cross_4.0.0.bb b/packages/gcc/gcc-cross_4.0.0.bb index 6e299e8299..d2dc240126 100644 --- a/packages/gcc/gcc-cross_4.0.0.bb +++ b/packages/gcc/gcc-cross_4.0.0.bb @@ -1,6 +1,6 @@ -include gcc_${PV}.bb +require gcc_${PV}.bb # path mangling, needed by the cross packaging -include gcc-paths-cross.inc +require gcc-paths-cross.inc inherit cross FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}" # NOTE: split PR. If the main .oe changes something that affects its *build* @@ -11,6 +11,6 @@ DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc PROVIDES = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++" # cross build -include gcc3-build-cross.inc +require gcc3-build-cross.inc # cross packaging -include gcc-package-cross.inc +require gcc-package-cross.inc diff --git a/packages/gcc/gcc-cross_4.0.2.bb b/packages/gcc/gcc-cross_4.0.2.bb index 6e299e8299..d2dc240126 100644 --- a/packages/gcc/gcc-cross_4.0.2.bb +++ b/packages/gcc/gcc-cross_4.0.2.bb @@ -1,6 +1,6 @@ -include gcc_${PV}.bb +require gcc_${PV}.bb # path mangling, needed by the cross packaging -include gcc-paths-cross.inc +require gcc-paths-cross.inc inherit cross FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}" # NOTE: split PR. If the main .oe changes something that affects its *build* @@ -11,6 +11,6 @@ DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc PROVIDES = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++" # cross build -include gcc3-build-cross.inc +require gcc3-build-cross.inc # cross packaging -include gcc-package-cross.inc +require gcc-package-cross.inc diff --git a/packages/gcc/gcc-cross_4.1-20060217.bb b/packages/gcc/gcc-cross_4.1-20060217.bb index 6e299e8299..d2dc240126 100644 --- a/packages/gcc/gcc-cross_4.1-20060217.bb +++ b/packages/gcc/gcc-cross_4.1-20060217.bb @@ -1,6 +1,6 @@ -include gcc_${PV}.bb +require gcc_${PV}.bb # path mangling, needed by the cross packaging -include gcc-paths-cross.inc +require gcc-paths-cross.inc inherit cross FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}" # NOTE: split PR. If the main .oe changes something that affects its *build* @@ -11,6 +11,6 @@ DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc PROVIDES = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++" # cross build -include gcc3-build-cross.inc +require gcc3-build-cross.inc # cross packaging -include gcc-package-cross.inc +require gcc-package-cross.inc diff --git a/packages/gcc/gcc-cross_4.1.0.bb b/packages/gcc/gcc-cross_4.1.0.bb index 4b0b5a1311..4e380c5f66 100644 --- a/packages/gcc/gcc-cross_4.1.0.bb +++ b/packages/gcc/gcc-cross_4.1.0.bb @@ -1,6 +1,6 @@ -include gcc_${PV}.bb +require gcc_${PV}.bb # path mangling, needed by the cross packaging -include gcc-paths-cross.inc +require gcc-paths-cross.inc inherit cross FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}" # NOTE: split PR. If the main .oe changes something that affects its *build* @@ -11,8 +11,8 @@ DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc PROVIDES = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++" # cross build -include gcc3-build-cross.inc +require gcc3-build-cross.inc # cross packaging -include gcc-package-cross.inc +require gcc-package-cross.inc EXTRA_OECONF += "--with-mpfr=${STAGING_DIR}/${BUILD_SYS}" diff --git a/packages/gcc/gcc-cross_4.1.1.bb b/packages/gcc/gcc-cross_4.1.1.bb index 12053f43d8..4c530175f3 100644 --- a/packages/gcc/gcc-cross_4.1.1.bb +++ b/packages/gcc/gcc-cross_4.1.1.bb @@ -1,6 +1,6 @@ -include gcc_${PV}.bb +require gcc_${PV}.bb # path mangling, needed by the cross packaging -include gcc-paths-cross.inc +require gcc-paths-cross.inc inherit cross FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}" # NOTE: split PR. If the main .oe changes something that affects its *build* @@ -11,8 +11,8 @@ DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc PROVIDES = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++" # cross build -include gcc3-build-cross.inc +require gcc3-build-cross.inc # cross packaging -include gcc-package-cross.inc +require gcc-package-cross.inc EXTRA_OECONF += "--with-mpfr=${STAGING_DIR}/${BUILD_SYS}" diff --git a/packages/gcc/gcc-cross_4.2-20060513.bb b/packages/gcc/gcc-cross_4.2-20060513.bb index 4b0b5a1311..4e380c5f66 100644 --- a/packages/gcc/gcc-cross_4.2-20060513.bb +++ b/packages/gcc/gcc-cross_4.2-20060513.bb @@ -1,6 +1,6 @@ -include gcc_${PV}.bb +require gcc_${PV}.bb # path mangling, needed by the cross packaging -include gcc-paths-cross.inc +require gcc-paths-cross.inc inherit cross FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}" # NOTE: split PR. If the main .oe changes something that affects its *build* @@ -11,8 +11,8 @@ DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc PROVIDES = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++" # cross build -include gcc3-build-cross.inc +require gcc3-build-cross.inc # cross packaging -include gcc-package-cross.inc +require gcc-package-cross.inc EXTRA_OECONF += "--with-mpfr=${STAGING_DIR}/${BUILD_SYS}" diff --git a/packages/gcc/gcc-cross_csl-arm-2005q3.bb b/packages/gcc/gcc-cross_csl-arm-2005q3.bb index 044383cb84..96eaee7682 100644 --- a/packages/gcc/gcc-cross_csl-arm-2005q3.bb +++ b/packages/gcc/gcc-cross_csl-arm-2005q3.bb @@ -1,6 +1,6 @@ -include gcc_csl-arm-2005q3.bb +require gcc_csl-arm-2005q3.bb # path mangling, needed by the cross packaging -include gcc-paths-cross.inc +require gcc-paths-cross.inc inherit cross # NOTE: split PR. If the main .oe changes something that affects its *build* # remember to increment this one too. @@ -10,6 +10,6 @@ DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc PROVIDES = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++" # cross build -include gcc3-cross-build.inc +require gcc3-cross-build.inc # cross packaging -include gcc-package-cross.inc +require gcc-package-cross.inc diff --git a/packages/gcc/gcc-cross_csl-arm-cvs.bb b/packages/gcc/gcc-cross_csl-arm-cvs.bb index f83de2598d..22fdd3701a 100644 --- a/packages/gcc/gcc-cross_csl-arm-cvs.bb +++ b/packages/gcc/gcc-cross_csl-arm-cvs.bb @@ -1,6 +1,6 @@ -include gcc_csl-arm-cvs.bb +require gcc_csl-arm-cvs.bb # path mangling, needed by the cross packaging -include gcc-paths-cross.inc +require gcc-paths-cross.inc inherit cross # NOTE: split PR. If the main .oe changes something that affects its *build* # remember to increment this one too. @@ -10,6 +10,6 @@ DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc PROVIDES = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++" # cross build -include gcc3-cross-build.inc +require gcc3-cross-build.inc # cross packaging -include gcc-package-cross.inc +require gcc-package-cross.inc diff --git a/packages/gcc/gcc-cross_csl-arm.bb b/packages/gcc/gcc-cross_csl-arm.bb index 3be3c603a5..6cd825d079 100644 --- a/packages/gcc/gcc-cross_csl-arm.bb +++ b/packages/gcc/gcc-cross_csl-arm.bb @@ -1,6 +1,6 @@ -include gcc_csl-arm.bb +require gcc_csl-arm.bb # path mangling, needed by the cross packaging -include gcc-paths-cross.inc +require gcc-paths-cross.inc inherit cross # NOTE: split PR. If the main .oe changes something that affects its *build* # remember to increment this one too. @@ -10,6 +10,6 @@ DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc PROVIDES = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++" # cross build -include gcc3-cross-build.inc +require gcc3-cross-build.inc # cross packaging -include gcc-package-cross.inc +require gcc-package-cross.inc diff --git a/packages/gcc/gcc_3.4.3.bb b/packages/gcc/gcc_3.4.3.bb index 1cd108aa34..c7c6d3e8c9 100644 --- a/packages/gcc/gcc_3.4.3.bb +++ b/packages/gcc/gcc_3.4.3.bb @@ -7,7 +7,7 @@ MAINTAINER = "Gerald Britton " inherit autotools gettext -include gcc-package.inc +require gcc-package.inc SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \ file://gcc34-reverse-compare.patch;patch=1 \ @@ -25,4 +25,4 @@ SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \ file://always-fixincperm.patch;patch=1 \ file://GCOV_PREFIX_STRIP-cross-profile_3.4.patch;patch=1" -include gcc3-build.inc +require gcc3-build.inc diff --git a/packages/gcc/gcc_3.4.4.bb b/packages/gcc/gcc_3.4.4.bb index 579678066f..144852f15a 100644 --- a/packages/gcc/gcc_3.4.4.bb +++ b/packages/gcc/gcc_3.4.4.bb @@ -7,7 +7,7 @@ MAINTAINER = "Gerald Britton " inherit autotools gettext -include gcc-package.inc +require gcc-package.inc SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \ file://gcc34-reverse-compare.patch;patch=1 \ @@ -29,4 +29,4 @@ SRC_URI += "file://gcc34-configure.in.patch;patch=1" SRC_URI += "file://gcc34-thumb-support.patch;patch=1" SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 " -include gcc3-build.inc +require gcc3-build.inc diff --git a/packages/gcc/gcc_4.0.0.bb b/packages/gcc/gcc_4.0.0.bb index af54c17fb8..0c708984c0 100644 --- a/packages/gcc/gcc_4.0.0.bb +++ b/packages/gcc/gcc_4.0.0.bb @@ -7,10 +7,10 @@ MAINTAINER = "Gerald Britton " inherit autotools gettext -include gcc-package.inc +require gcc-package.inc SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \ file://ldflags.patch;patch=1" SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 " -include gcc4-build.inc +require gcc4-build.inc diff --git a/packages/gcc/gcc_4.0.2.bb b/packages/gcc/gcc_4.0.2.bb index a83a030c8b..b5b85a983f 100644 --- a/packages/gcc/gcc_4.0.2.bb +++ b/packages/gcc/gcc_4.0.2.bb @@ -8,7 +8,7 @@ PR = "r3" inherit autotools gettext -include gcc-package.inc +require gcc-package.inc SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \ file://arm-nolibfloat.patch;patch=1 \ @@ -28,7 +28,7 @@ SRC_URI_append = " file://100-uclibc-conf.patch;patch=1 \ SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 " -include gcc4-build.inc +require gcc4-build.inc EXTRA_OECONF += "--disable-libssp" diff --git a/packages/gcc/gcc_4.1-20060217.bb b/packages/gcc/gcc_4.1-20060217.bb index 66880d752b..bcd9e9f235 100644 --- a/packages/gcc/gcc_4.1-20060217.bb +++ b/packages/gcc/gcc_4.1-20060217.bb @@ -7,7 +7,7 @@ DEFAULT_PREFERENCE = "-99999" inherit autotools gettext -include gcc-package.inc +require gcc-package.inc SRC_URI = "http://ftp.nluug.nl/languages/gcc/snapshots/4.1-20060217/gcc-4.1-20060217.tar.bz2 \ file://arm-nolibfloat.patch;patch=1 \ @@ -16,4 +16,4 @@ SRC_URI = "http://ftp.nluug.nl/languages/gcc/snapshots/4.1-20060217/gcc-4.1-2006 SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 " -include gcc4-build.inc +require gcc4-build.inc diff --git a/packages/gcc/gcc_4.1.0.bb b/packages/gcc/gcc_4.1.0.bb index 4d44978dab..80a4b89d7c 100644 --- a/packages/gcc/gcc_4.1.0.bb +++ b/packages/gcc/gcc_4.1.0.bb @@ -7,7 +7,7 @@ DEFAULT_PREFERENCE = "-1" inherit autotools gettext -include gcc-package.inc +require gcc-package.inc SRC_URI = "http://ftp.gnu.org/pub/gnu/gcc/gcc-4.1.0/gcc-4.1.0.tar.bz2 \ file://arm-nolibfloat.patch;patch=1 \ @@ -16,7 +16,7 @@ SRC_URI = "http://ftp.gnu.org/pub/gnu/gcc/gcc-4.1.0/gcc-4.1.0.tar.bz2 \ SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 " -include gcc4-build.inc +require gcc4-build.inc EXTRA_OECONF += "--disable-libssp" FORTRAN = "" diff --git a/packages/gcc/gcc_4.1.1.bb b/packages/gcc/gcc_4.1.1.bb index f9706649db..17367b67d4 100644 --- a/packages/gcc/gcc_4.1.1.bb +++ b/packages/gcc/gcc_4.1.1.bb @@ -6,7 +6,7 @@ LICENSE = "GPL" inherit autotools gettext -include gcc-package.inc +require gcc-package.inc SRC_URI = "http://ftp.gnu.org/pub/gnu/gcc/gcc-4.1.1/gcc-4.1.1.tar.bz2 \ file://100-uclibc-conf.patch;patch=1 \ @@ -39,7 +39,7 @@ HAS_G2C = "no" JAVA_arm = "" LANGUAGES = "c,c++" -include gcc3-build.inc +require gcc3-build.inc EXTRA_OECONF += " --disable-libssp " diff --git a/packages/gcc/gcc_4.2-20060513.bb b/packages/gcc/gcc_4.2-20060513.bb index 68fa6d8d06..5b68fb254b 100644 --- a/packages/gcc/gcc_4.2-20060513.bb +++ b/packages/gcc/gcc_4.2-20060513.bb @@ -7,7 +7,7 @@ DEFAULT_PREFERENCE = "-1" inherit autotools gettext -include gcc-package.inc +require gcc-package.inc SRC_URI = "http://ftp.nluug.nl/languages/gcc/snapshots/${PV}/gcc-${PV}.tar.bz2 \ file://arm-nolibfloat.patch;patch=1 \ @@ -16,7 +16,7 @@ SRC_URI = "http://ftp.nluug.nl/languages/gcc/snapshots/${PV}/gcc-${PV}.tar.bz2 \ SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 " -include gcc4-build.inc +require gcc4-build.inc EXTRA_OECONF += "--disable-libssp" FORTRAN = "" diff --git a/packages/gcc/gcc_csl-arm-2005q3.bb b/packages/gcc/gcc_csl-arm-2005q3.bb index 02e984358f..d1053dad1d 100644 --- a/packages/gcc/gcc_csl-arm-2005q3.bb +++ b/packages/gcc/gcc_csl-arm-2005q3.bb @@ -10,7 +10,7 @@ FILESDIR = "${FILE_DIRNAME}/gcc-csl-arm" inherit autotools gettext -include gcc-package.inc +require gcc-package.inc SRC_URI = "http://www.codesourcery.com/public/gnu_toolchain/arm/2005q3-2/arm-2005q3-2-arm-none-linux-gnueabi.src.tar.bz2 \ file://gcc_optab_arm.patch;pa