summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@rpsys.net>2006-01-04 10:36:03 +0000
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2006-01-04 10:36:03 +0000
commitbcf39886ed42157c9b5ed692c36014f4fe74168c (patch)
tree8e8c14fb2e0ae5792a393a692848919b1397037e
parentf2fcc06af180827ceb2a39ebbf69fb16f182caac (diff)
Revert the changes from revisions 65af73a95a851d2e8c3cf2f523f1acc488be0208, 28f020502e7dcf566733f474864c62156895baec, 7de90a055904c4af8890dd5ae8c192bfd41b3fa1
-rw-r--r--classes/autotools.bbclass6
-rw-r--r--packages/audiofile/audiofile_0.2.6.bb4
-rw-r--r--packages/cairo/cairo_1.0.0.bb4
-rw-r--r--packages/cairo/cairo_1.0.2.bb4
-rw-r--r--packages/cairo/libsvg-cairo_20050601.bb4
-rw-r--r--packages/cairo/libsvg-cairo_cvs.bb5
-rw-r--r--packages/cairo/libsvg_cvs.bb4
-rw-r--r--packages/dbh/dbh_1.0-18.bb4
-rw-r--r--packages/eel/eel_2.12.2.bb5
-rw-r--r--packages/esound/esound-gpe_20020817.bb7
-rw-r--r--packages/expat/expat_1.95.6.bb4
-rw-r--r--packages/file/file_4.13.bb4
-rw-r--r--packages/flac/flac_1.1.0.bb4
-rw-r--r--packages/gdbm/gdbm-native_1.8.3.bb4
-rw-r--r--packages/gdbm/gdbm_1.8.3.bb4
-rw-r--r--packages/geda/libgeda_20050820.bb4
-rw-r--r--packages/gmp/gmp_4.1.4.bb4
-rw-r--r--packages/gnome/gnome-desktop_2.10.2.bb4
-rw-r--r--packages/gnome/gnome-menus_2.10.2.bb4
-rw-r--r--packages/gnome/gnome-menus_2.12.0.bb4
-rw-r--r--packages/gnome/gnome-panel_2.10.1.bb4
-rw-r--r--packages/gnome/libgnome_2.12.0.1.bb4
-rw-r--r--packages/gnome/libgnomeui_2.12.0.bb4
-rw-r--r--packages/gnome/libwnck_2.10.2.bb4
-rw-r--r--packages/gnome/libwnck_2.12.1.bb4
-rw-r--r--packages/gtkhtml/gtkhtml-2.0_2.6.3.bb3
-rw-r--r--packages/ice/ice_6.3.3.bb4
-rw-r--r--packages/ice/ice_cvs.bb4
-rw-r--r--packages/libeina/libeina_0.96.5.bb5
-rw-r--r--packages/libeina/libeina_0.96.7.bb5
-rw-r--r--packages/libexif/libexif_0.6.9.bb4
-rw-r--r--packages/libgpelaunch/libgpelaunch_0.12.bb9
-rw-r--r--packages/libgpeplugin/libgpeplugin_cvs.bb4
-rw-r--r--packages/libgpewidget/libgpewidget_0.105.bb5
-rw-r--r--packages/libgpewidget/libgpewidget_cvs.bb4
-rw-r--r--packages/libgsf/libgsf_1.13.2.bb5
-rw-r--r--packages/libgsf/libgsf_1.13.3.bb5
-rw-r--r--packages/libidl/libidl_0.8.6.bb10
-rw-r--r--packages/libmimedir/libmimedir_0.3.1.bb5
-rw-r--r--packages/libmimedir/libmimedir_cvs.bb4
-rw-r--r--packages/libogg/libogg_1.1.bb4
-rw-r--r--packages/librsvg/librsvg_2.11.1.bb4
-rw-r--r--packages/libsexy/libsexy_0.1.4.bb6
-rw-r--r--packages/libsm/libsm_6.0.3.bb4
-rw-r--r--packages/libsm/libsm_cvs.bb5
-rw-r--r--packages/libxcursor/libxcursor_1.1.2.bb9
-rw-r--r--packages/libxcursor/libxcursor_cvs.bb10
-rw-r--r--packages/libxfixes/libxfixes_2.0.1.bb8
-rw-r--r--packages/libxfixes/libxfixes_cvs.bb8
-rw-r--r--packages/libxft/libxft_2.1.6.bb9
-rw-r--r--packages/libxft/libxft_cvs.bb9
-rw-r--r--packages/libxi/libxi_6.0.1.bb9
-rw-r--r--packages/libxi/libxi_cvs.bb9
-rw-r--r--packages/libxkbfile/libxkbfile_cvs.bb9
-rw-r--r--packages/libxp/libxp_cvs.bb8
-rw-r--r--packages/libxrandr/libxrandr_1.0.2.bb8
-rw-r--r--packages/libxrandr/libxrandr_cvs.bb9
-rw-r--r--packages/libxrender/libxrender_0.8.4.bb8
-rw-r--r--packages/libxrender/libxrender_cvs.bb8
-rw-r--r--packages/libxss/libxss_cvs.bb9
-rw-r--r--packages/libxv/libxv_2.2.2+cvs20040918.bb9
-rw-r--r--packages/libxv/libxv_2.2.2.bb8
-rw-r--r--packages/libxxf86vm/libxxf86vm_cvs.bb8
-rw-r--r--packages/loudmouth/loudmouth_1.0.1.bb4
-rw-r--r--packages/nautilus/nautilus_2.12.2.bb4
-rw-r--r--packages/opensync/libopensync_0.18.bb5
-rw-r--r--packages/pango/pango_1.10.2.bb4
-rw-r--r--packages/pcre/pcre_4.4.bb4
-rw-r--r--packages/poppler/poppler_0.4.3.bb7
-rw-r--r--packages/qof/qof_0.6.0.bb7
-rw-r--r--packages/readline/readline_4.3.bb4
-rw-r--r--packages/setserial/setserial_2.17.bb4
-rw-r--r--packages/startup-notification/startup-notification_0.8.bb4
-rw-r--r--packages/sword/sword_1.5.8.bb4
-rw-r--r--packages/tilibs/libticables_3.9.2.bb4
-rw-r--r--packages/tilibs/libticalcs_4.5.9.bb5
-rw-r--r--packages/tilibs/libtifiles_0.6.5.bb5
-rw-r--r--packages/tslib/tslib_cvs.bb4
-rw-r--r--packages/vte/vte_0.11.15.bb5
-rw-r--r--packages/xau/xau_0.1.1.bb8
-rw-r--r--packages/xau/xau_cvs.bb9
-rw-r--r--packages/xaw/xaw_7.0.2.bb4
-rw-r--r--packages/xaw/xaw_cvs.bb5
-rw-r--r--packages/xcalibrate/xcalibrate_cvs.bb9
-rw-r--r--packages/xcalibrateext/xcalibrateext_cvs.bb9
-rw-r--r--packages/xcomposite/xcomposite_1.0.1.bb8
-rw-r--r--packages/xcomposite/xcomposite_cvs.bb8
-rw-r--r--packages/xdamage/xdamage_1.0.1.bb8
-rw-r--r--packages/xdamage/xdamage_cvs.bb8
-rw-r--r--packages/xdmcp/libxdmcp_0.1.1.bb8
-rw-r--r--packages/xdmcp/libxdmcp_0.1.3.bb8
-rw-r--r--packages/xdmcp/libxdmcp_cvs.bb8
-rw-r--r--packages/xext/xext_cvs.bb9
-rw-r--r--packages/xextensions/xextensions_1.0.1.bb8
-rw-r--r--packages/xextensions/xextensions_20050610.bb8
-rw-r--r--packages/xextensions/xextensions_cvs.bb8
-rw-r--r--packages/xfont/xfont_1.4.2.bb8
-rw-r--r--packages/xfont/xfont_cvs.bb8
-rw-r--r--packages/xinerama/xinerama_1.0.2+cvs20050505.bb9
-rw-r--r--packages/xinerama/xinerama_1.0.2.bb9
-rw-r--r--packages/xinerama/xinerama_cvs.bb10
-rw-r--r--packages/xmu/xmu_cvs.bb5
-rw-r--r--packages/xproto/xproto_6.6.2+cvs20050226.bb9
-rw-r--r--packages/xproto/xproto_6.6.2.bb8
-rw-r--r--packages/xproto/xproto_cvs.bb10
-rw-r--r--packages/xres/xres_1.0.1.bb8
-rw-r--r--packages/xres/xres_cvs.bb8
-rw-r--r--packages/xt/xt_0.1.5.bb4
-rw-r--r--packages/xt/xt_cvs.bb12
-rw-r--r--packages/xtrans/xtrans_0.1.bb7
-rw-r--r--packages/xtrans/xtrans_cvs.bb8
-rw-r--r--packages/xtst/xtst_cvs.bb9
-rw-r--r--packages/xxf86dgaext/xxf86dgaext_cvs.bb9
-rw-r--r--packages/xxf86vmext/xxf86vmext_cvs.bb9
114 files changed, 708 insertions, 10 deletions
diff --git a/classes/autotools.bbclass b/classes/autotools.bbclass
index c0976ce646..927e3432b7 100644
--- a/classes/autotools.bbclass
+++ b/classes/autotools.bbclass
@@ -179,8 +179,4 @@ autotools_stage_all() {
rm -rf ${STAGE_TEMP}
}
-autotools_do_stage() {
- autotools_stage_all
-}
-
-EXPORT_FUNCTIONS do_configure do_install do_stage
+EXPORT_FUNCTIONS do_configure do_install
diff --git a/packages/audiofile/audiofile_0.2.6.bb b/packages/audiofile/audiofile_0.2.6.bb
index b86680bc15..c83b4c2c27 100644
--- a/packages/audiofile/audiofile_0.2.6.bb
+++ b/packages/audiofile/audiofile_0.2.6.bb
@@ -15,3 +15,7 @@ RPROVIDES_${PN} += "audiofile"
SRC_URI = "http://www.68k.org/~michael/audiofile/audiofile-${PV}.tar.gz"
inherit autotools pkgconfig binconfig
+
+do_stage () {
+ autotools_stage_all
+}
diff --git a/packages/cairo/cairo_1.0.0.bb b/packages/cairo/cairo_1.0.0.bb
index e786d01fb7..aa97a9f4de 100644
--- a/packages/cairo/cairo_1.0.0.bb
+++ b/packages/cairo/cairo_1.0.0.bb
@@ -9,3 +9,7 @@ PR = "r1"
SRC_URI = "http://cairographics.org/releases/cairo-${PV}.tar.gz"
inherit autotools pkgconfig
+
+do_stage () {
+ oe_runmake install DESTDIR="" bindir=${STAGING_BINDIR} includedir=${STAGING_INCDIR} libdir=${STAGING_LIBDIR} prefix=${STAGING_DIR}
+}
diff --git a/packages/cairo/cairo_1.0.2.bb b/packages/cairo/cairo_1.0.2.bb
index 9e65e89cab..5db0dd127d 100644
--- a/packages/cairo/cairo_1.0.2.bb
+++ b/packages/cairo/cairo_1.0.2.bb
@@ -8,3 +8,7 @@ PR = "r0"
SRC_URI = "http://cairographics.org/releases/cairo-${PV}.tar.gz"
inherit autotools pkgconfig
+
+do_stage () {
+autotools_stage_all
+}
diff --git a/packages/cairo/libsvg-cairo_20050601.bb b/packages/cairo/libsvg-cairo_20050601.bb
index 10d4d0715c..f04af713f2 100644
--- a/packages/cairo/libsvg-cairo_20050601.bb
+++ b/packages/cairo/libsvg-cairo_20050601.bb
@@ -12,3 +12,7 @@ SRC_URI = "cvs://anoncvs:anoncvs@cvs.cairographics.org/cvs/cairo;module=libsvg-c
S = "${WORKDIR}/libsvg-cairo"
inherit autotools pkgconfig
+
+do_stage () {
+ oe_runmake install DESTDIR="" bindir=${STAGING_BINDIR} includedir=${STAGING_INCDIR} libdir=${STAGING_LIBDIR} prefix=${STAGING_DIR}
+}
diff --git a/packages/cairo/libsvg-cairo_cvs.bb b/packages/cairo/libsvg-cairo_cvs.bb
index a106005284..47c255c07c 100644
--- a/packages/cairo/libsvg-cairo_cvs.bb
+++ b/packages/cairo/libsvg-cairo_cvs.bb
@@ -2,6 +2,7 @@ PV = "0.0cvs${CVSDATE}"
SECTION = "libs"
LICENSE = "LGPL"
PRIORITY = "optional"
+MAINTAINER = "Phil Blundell <pb@debian.org>"
DEPENDS = "libsvg cairo"
DESCRIPTION = "SVG rendering library"
DEFAULT_PREFERENCE = "-1"
@@ -9,3 +10,7 @@ SRC_URI = "cvs://anoncvs:anoncvs@cvs.cairographics.org/cvs/cairo;module=libsvg-c
S = "${WORKDIR}/libsvg-cairo"
inherit autotools pkgconfig
+
+do_stage () {
+ oe_runmake install DESTDIR="" bindir=${STAGING_BINDIR} includedir=${STAGING_INCDIR} libdir=${STAGING_LIBDIR} prefix=${STAGING_DIR}
+}
diff --git a/