diff options
| author |   Chris Larson <clarson@kergoth.com> | 2004-05-22 16:47:36 +0000 |
|---|---|---|
| committer | Chris Larson <clarson@kergoth.com> | 2004-05-22 16:47:36 +0000 |
| commit | 2b8f679ffe5929b5a11eb71e514aa4997c36f13e (patch) | |
| tree | cab0f25aca03f6162bd268a401945fbfbb63bff9 /glib-2.0 | |
| parent | 5df179157f90b18f437c6978efb451f515e3d1c9 (diff) | |
| download | openembedded-2b8f679ffe5929b5a11eb71e514aa4997c36f13e.tar.gz | |
Merges.
2004/05/22 12:46:48-04:00 local!kergoth
Bugfixes per the recent FILESDIR cleanup.
2004/05/22 01:03:38-04:00 local!kergoth
Run a perl script against the repo to kill off direct FILESDIR usage
in favor of relative file:// paths in SRC_URI, and WORKDIR references
in functions.
2004/05/21 23:07:58-04:00 local!kergoth
Switch file:// FILESDIR uris in SRC_URI to the new relative path format.
BKrev: 40af8428aNyDLBX0MRtyso3VCpMv1w
Diffstat (limited to 'glib-2.0')
| -rw-r--r-- | glib-2.0/glib-2.0-native_2.2.3.oe | 5 | ||||
| -rw-r--r-- | glib-2.0/glib-2.0-native_2.4.1.oe | 7 | ||||
| -rw-r--r-- | glib-2.0/glib-2.0_2.2.3.oe | 5 | ||||
| -rw-r--r-- | glib-2.0/glib-2.0_2.4.1.oe | 7 |
4 files changed, 14 insertions, 10 deletions
diff --git a/glib-2.0/glib-2.0-native_2.2.3.oe b/glib-2.0/glib-2.0-native_2.2.3.oe index 0fc642cb37..36a422fcbe 100644 --- a/glib-2.0/glib-2.0-native_2.2.3.oe +++ b/glib-2.0/glib-2.0-native_2.2.3.oe @@ -2,14 +2,15 @@ DEPENDS = "patcher-native" FILESDIR = "${@os.path.dirname(oe.data.getVar('FILE',d,1))}/glib-2.0-${PV}" SRC_URI = "http://ftp.gnome.org/pub/gnome/sources/glib/2.2/glib-${PV}.tar.bz2 \ - file://${FILESDIR}/automake-lossage.patch;patch=1" + file://automake-lossage.patch;patch=1 \ + file://glibconfig-sysdefs.h" S = "${WORKDIR}/glib-${PV}" inherit autotools native acpaths = "" do_configure_prepend () { - install -m 0644 ${FILESDIR}/glibconfig-sysdefs.h . + install -m 0644 ${WORKDIR}/glibconfig-sysdefs.h . } do_stage () { diff --git a/glib-2.0/glib-2.0-native_2.4.1.oe b/glib-2.0/glib-2.0-native_2.4.1.oe index 81fbeda10f..7987a828f9 100644 --- a/glib-2.0/glib-2.0-native_2.4.1.oe +++ b/glib-2.0/glib-2.0-native_2.4.1.oe @@ -12,8 +12,9 @@ EXTRA_OECONF = "--disable-debug" FILESDIR = "${@os.path.dirname(oe.data.getVar('FILE',d,1))}/glib-2.0-${PV}" SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.4/glib-${PV}.tar.bz2 \ - file://${FILESDIR}/glibconfig-sysdefs.h \ - file://${FILESDIR}/gtk-doc.patch;patch=1" + file://glibconfig-sysdefs.h \ + file://gtk-doc.patch;patch=1 \ + file://glibconfig-sysdefs.h" S = "${WORKDIR}/glib-${PV}" @@ -21,7 +22,7 @@ inherit autotools pkgconfig native acpaths = "" do_configure_prepend () { - install -m 0644 ${FILESDIR}/glibconfig-sysdefs.h . + install -m 0644 ${WORKDIR}/glibconfig-sysdefs.h . } do_stage () { diff --git a/glib-2.0/glib-2.0_2.2.3.oe b/glib-2.0/glib-2.0_2.2.3.oe index 5b2af4a571..c707e1ca2a 100644 --- a/glib-2.0/glib-2.0_2.2.3.oe +++ b/glib-2.0/glib-2.0_2.2.3.oe @@ -9,7 +9,8 @@ MAINTAINER = "Philip Blundell <pb@handhelds.org>" DEPENDS = "virtual/libc glib-2.0-native" SRC_URI = "http://ftp.gnome.org/pub/gnome/sources/glib/2.2/glib-${PV}.tar.bz2 \ - file://${FILESDIR}/automake-lossage.patch;patch=1" + file://automake-lossage.patch;patch=1 \ + file://glibconfig-sysdefs.h" S = "${WORKDIR}/glib-${PV}" @@ -17,7 +18,7 @@ inherit autotools pkgconfig acpaths = "" do_configure_prepend () { - install -m 0644 ${FILESDIR}/glibconfig-sysdefs.h . + install -m 0644 ${WORKDIR}/glibconfig-sysdefs.h . } do_stage () { diff --git a/glib-2.0/glib-2.0_2.4.1.oe b/glib-2.0/glib-2.0_2.4.1.oe index c0c984d7db..013b901c17 100644 --- a/glib-2.0/glib-2.0_2.4.1.oe +++ b/glib-2.0/glib-2.0_2.4.1.oe @@ -15,8 +15,9 @@ FILES_glib-2.0-utils = "${bindir}/*" EXTRA_OECONF = "--disable-debug" SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.4/glib-${PV}.tar.bz2 \ - file://${FILESDIR}/glibconfig-sysdefs.h \ - file://${FILESDIR}/gtk-doc.patch;patch=1" + file://glibconfig-sysdefs.h \ + file://gtk-doc.patch;patch=1 \ + file://glibconfig-sysdefs.h" S = "${WORKDIR}/glib-${PV}" @@ -24,7 +25,7 @@ inherit autotools pkgconfig acpaths = "" do_configure_prepend () { - install -m 0644 ${FILESDIR}/glibconfig-sysdefs.h . + install -m 0644 ${WORKDIR}/glibconfig-sysdefs.h . } do_stage () { |