diff options
| author | Joshua Lock <josh@linux.intel.com> | 2010-04-26 17:41:05 +0100 |
|---|---|---|
| committer | Joshua Lock <josh@linux.intel.com> | 2010-04-27 17:11:28 +0100 |
| commit | 4d1f39af753ff93e08c91e08bc1b7c0037b89142 (patch) | |
| tree | c77297f1b4f6161a86c11a7f73661c69027bde27 | |
| parent | 95f2dd7dc896c20fbcddd945e55ea3de160ac8ec (diff) | |
| download | openembedded-core-4d1f39af753ff93e08c91e08bc1b7c0037b89142.tar.gz openembedded-core-4d1f39af753ff93e08c91e08bc1b7c0037b89142.tar.bz2 openembedded-core-4d1f39af753ff93e08c91e08bc1b7c0037b89142.zip | |
autotools: deprecate autotools_stage class
Move the functionality into autotools and ensure all our Poky recipes are no
longer using it.
Keep the autools_stage class around for OE compatability but just have it
inherit autools.
Signed-off-by: Joshua Lock <josh@linux.intel.com>
222 files changed, 224 insertions, 224 deletions
diff --git a/meta-extras/packages/eventlog/eventlog_0.2.5.bb b/meta-extras/packages/eventlog/eventlog_0.2.5.bb index da0e2e0034..67e88ead8f 100644 --- a/meta-extras/packages/eventlog/eventlog_0.2.5.bb +++ b/meta-extras/packages/eventlog/eventlog_0.2.5.bb @@ -4,4 +4,4 @@ PR = "r1" SRC_URI = "http://www.balabit.com/downloads/files/eventlog/0.2/${P}.tar.gz" -inherit autotools_stage pkgconfig +inherit autotools pkgconfig diff --git a/meta-extras/packages/libol/libol_0.3.18.bb b/meta-extras/packages/libol/libol_0.3.18.bb index 8c877667a3..ba6d6ce638 100644 --- a/meta-extras/packages/libol/libol_0.3.18.bb +++ b/meta-extras/packages/libol/libol_0.3.18.bb @@ -4,5 +4,5 @@ SRC_URI = "http://www.balabit.com/downloads/files/libol/0.3/${P}.tar.gz" S = "${WORKDIR}/${PN}-${PV}" -inherit autotools_stage binconfig +inherit autotools binconfig diff --git a/meta-extras/packages/libxosd/libxosd_svn.bb b/meta-extras/packages/libxosd/libxosd_svn.bb index da0ba0a418..456b7ac236 100644 --- a/meta-extras/packages/libxosd/libxosd_svn.bb +++ b/meta-extras/packages/libxosd/libxosd_svn.bb @@ -11,7 +11,7 @@ SRC_URI = "svn://libxosd.svn.sourceforge.net/svnroot/libxosd/source;module=curre S = "${WORKDIR}/current" -inherit autotools_stage binconfig +inherit autotools binconfig PACKAGES =+ "${PN}-examples-dbg ${PN}-examples" FILES_${PN}-examples = "${bindir}/osd_cat" diff --git a/meta-extras/packages/redland/redland_1.0.8.bb b/meta-extras/packages/redland/redland_1.0.8.bb index 393df539b5..f1ff8f8e89 100644 --- a/meta-extras/packages/redland/redland_1.0.8.bb +++ b/meta-extras/packages/redland/redland_1.0.8.bb @@ -6,4 +6,4 @@ PR = "r3" EXTRA_OECONF = "--with-bdb-lib=${STAGING_LIBDIR} --with-bdb-include=${STAGING_INCDIR} --with-sqlite=no" -inherit autotools_stage +inherit autotools diff --git a/meta-moblin/packages/anerley/anerley.inc b/meta-moblin/packages/anerley/anerley.inc index 94a5692d87..c18c9b2553 100644 --- a/meta-moblin/packages/anerley/anerley.inc +++ b/meta-moblin/packages/anerley/anerley.inc @@ -3,4 +3,4 @@ SRC_URI = "http://download.moblin.org/sources/anerley/0.1/anerley-${PV}.tar.bz2" LICENSE = "LGPLv2.1" DEPENDS = "telepathy-glib glib-2.0 telepathy-mission-control nbtk eds-dbus" -inherit autotools_stage +inherit autotools diff --git a/meta-moblin/packages/aspell/aspell_0.60.6.bb b/meta-moblin/packages/aspell/aspell_0.60.6.bb index 8fc3fc9385..8d43a707d2 100644 --- a/meta-moblin/packages/aspell/aspell_0.60.6.bb +++ b/meta-moblin/packages/aspell/aspell_0.60.6.bb @@ -12,4 +12,4 @@ FILES_${PN} = "${bindir}/aspell" FILES_libpspell = "${libdir}/libpspell.so.*" FILES_libpspell-dev = "${libdir}/libpspell* ${bindir}/pspell-config ${includedir}/pspell" -inherit autotools_stage gettext +inherit autotools gettext diff --git a/meta-moblin/packages/bickley/bickley.inc b/meta-moblin/packages/bickley/bickley.inc index ada7e8a162..f386b862e3 100644 --- a/meta-moblin/packages/bickley/bickley.inc +++ b/meta-moblin/packages/bickley/bickley.inc @@ -6,4 +6,4 @@ RDEPENDS = "xdg-user-dirs" FILES_${PN} =+ "${datadir}/dbus-1/services/" -inherit autotools_stage +inherit autotools diff --git a/meta-moblin/packages/bisho/bisho.inc b/meta-moblin/packages/bisho/bisho.inc index c2f6617f4d..5ff9b9e35a 100644 --- a/meta-moblin/packages/bisho/bisho.inc +++ b/meta-moblin/packages/bisho/bisho.inc @@ -4,6 +4,6 @@ LICENSE = "GPLv2" DEPENDS = "gtk+ mojito nbtk" -inherit autotools_stage +inherit autotools FILES_${PN} += "${datadir}/icons/" diff --git a/meta-moblin/packages/bognor-regis/bognor-regis.inc b/meta-moblin/packages/bognor-regis/bognor-regis.inc index 3ca3a99468..34563548f2 100644 --- a/meta-moblin/packages/bognor-regis/bognor-regis.inc +++ b/meta-moblin/packages/bognor-regis/bognor-regis.inc @@ -6,4 +6,4 @@ DEPENDS = "glib-2.0 dbus-glib gtk+ libnotify gupnp gupnp-av bickley" FILES_${PN} += "${datadir}/dbus-1/services" -inherit autotools_stage +inherit autotools diff --git a/meta-moblin/packages/carrick/carrick.inc b/meta-moblin/packages/carrick/carrick.inc index f40aa26c41..1924e9cbfe 100644 --- a/meta-moblin/packages/carrick/carrick.inc +++ b/meta-moblin/packages/carrick/carrick.inc @@ -7,7 +7,7 @@ RDEPENDS = "connman" FILES_${PN} += "${datadir}/icons/hicolor" -inherit autotools_stage +inherit autotools do_configure_prepend () { mkdir -p ${S}/build/autotools diff --git a/meta-moblin/packages/check/check_0.9.5.bb b/meta-moblin/packages/check/check_0.9.5.bb index 05c454aaeb..0a4d47755c 100644 --- a/meta-moblin/packages/check/check_0.9.5.bb +++ b/meta-moblin/packages/check/check_0.9.5.bb @@ -8,6 +8,6 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/check/check-${PV}.tar.gz \ file://configure_fix.patch;patch=1" S = "${WORKDIR}/check-${PV}" -inherit autotools_stage pkgconfig +inherit autotools pkgconfig EXTRA_OECONF += "--enable-plain-docdir" diff --git a/meta-moblin/packages/clutter-imcontext/clutter-imcontext_git.bb b/meta-moblin/packages/clutter-imcontext/clutter-imcontext_git.bb index 43521e6d82..ead537d664 100644 --- a/meta-moblin/packages/clutter-imcontext/clutter-imcontext_git.bb +++ b/meta-moblin/packages/clutter-imcontext/clutter-imcontext_git.bb @@ -5,7 +5,7 @@ PR = "r7" DEPENDS = "clutter-1.0 glib-2.0" S = "${WORKDIR}/git" -inherit autotools_stage +inherit autotools do_configure_prepend () { echo "EXTRA_DIST=" > ${S}/gtk-doc.make diff --git a/meta-moblin/packages/dalston/dalston.inc b/meta-moblin/packages/dalston/dalston.inc index bd137d7731..204bccd697 100644 --- a/meta-moblin/packages/dalston/dalston.inc +++ b/meta-moblin/packages/dalston/dalston.inc @@ -4,4 +4,4 @@ LICENSE = "LGPLv2.1" DEPENDS = "glib-2.0 gtk+ pulseaudio libcanberra libnotify nbtk mutter-moblin" -inherit autotools_stage +inherit autotools diff --git a/meta-moblin/packages/enchant/enchant_1.3.0.bb b/meta-moblin/packages/enchant/enchant_1.3.0.bb index e9e8a898cd..ff113dba69 100644 --- a/meta-moblin/packages/enchant/enchant_1.3.0.bb +++ b/meta-moblin/packages/enchant/enchant_1.3.0.bb @@ -4,7 +4,7 @@ LICENSE = "LGPL" DEPENDS = "aspell" RDEPENDS = "aspell" -inherit autotools_stage pkgconfig +inherit autotools pkgconfig PR = "r1" diff --git a/meta-moblin/packages/gamin/gamin_0.1.10.bb b/meta-moblin/packages/gamin/gamin_0.1.10.bb index 144bf7a7d6..48fc73e6d1 100644 --- a/meta-moblin/packages/gamin/gamin_0.1.10.bb +++ b/meta-moblin/packages/gamin/gamin_0.1.10.bb @@ -6,4 +6,4 @@ SRC_URI = "http://www.gnome.org/~veillard/gamin/sources/gamin-${PV}.tar.gz \ EXTRA_OECONF = " --without-python " -inherit autotools_stage pkgconfig +inherit autotools pkgconfig diff --git a/meta-moblin/packages/gmime/gmime_2.4.10.bb b/meta-moblin/packages/gmime/gmime_2.4.10.bb index dcec37e20e..3b9327a931 100644 --- a/meta-moblin/packages/gmime/gmime_2.4.10.bb +++ b/meta-moblin/packages/gmime/gmime_2.4.10.bb @@ -4,7 +4,7 @@ SECTION = "libs" PRIORITY = "optional" DEPENDS = "glib-2.0 zlib" -inherit gnome autotools_stage lib_package binconfig +inherit gnome autotools lib_package binconfig SRC_URI += "file://iconv-detect.h \ file://nodolt.patch;patch=1" diff --git a/meta-moblin/packages/gnet/gnet_svn.bb b/meta-moblin/packages/gnet/gnet_svn.bb index ea2c92ff1a..fde58f0f32 100644 --- a/meta-moblin/packages/gnet/gnet_svn.bb +++ b/meta-moblin/packages/gnet/gnet_svn.bb @@ -17,4 +17,4 @@ EXTRA_OECONF = "--disable-pthreads" FILES_${PN}-dev += "${libdir}/gnet-2.0" -inherit autotools_stage pkgconfig +inherit autotools pkgconfig diff --git a/meta-moblin/packages/hornsey/hornsey.inc b/meta-moblin/packages/hornsey/hornsey.inc index 2e2f661c52..c9d9631a78 100644 --- a/meta-moblin/packages/hornsey/hornsey.inc +++ b/meta-moblin/packages/hornsey/hornsey.inc @@ -10,4 +10,4 @@ EXTRA_OECONF = "--disable-shave" FILES_${PN} += "${datadir}/icons" -inherit autotools_stage +inherit autotools diff --git a/meta-moblin/packages/json-glib/json-glib_0.6.2.bb b/meta-moblin/packages/json-glib/json-glib_0.6.2.bb index 822ddad7e5..d96f8b3e19 100644 --- a/meta-moblin/packages/json-glib/json-glib_0.6.2.bb +++ b/meta-moblin/packages/json-glib/json-glib_0.6.2.bb @@ -4,4 +4,4 @@ PR = "r0" DEPENDS = "glib-2.0" -inherit autotools_stage +inherit autotools diff --git a/meta-moblin/packages/json-glib/json-glib_git.bb b/meta-moblin/packages/json-glib/json-glib_git.bb index 7b2e882e15..0b32e3ae34 100644 --- a/meta-moblin/packages/json-glib/json-glib_git.bb +++ b/meta-moblin/packages/json-glib/json-glib_git.bb @@ -7,7 +7,7 @@ S = "${WORKDIR}/git" DEPENDS = "glib-2.0" -inherit autotools_stage +inherit autotools EXTRA_OECONF = "--disable-introspection" diff --git a/meta-moblin/packages/libccss/libccss_git.bb b/meta-moblin/packages/libccss/libccss_git.bb index 020b590716..8bd93c940f 100644 --- a/meta-moblin/packages/libccss/libccss_git.bb +++ b/meta-moblin/packages/libccss/libccss_git.bb @@ -4,7 +4,7 @@ PR = "r2" DEPENDS = "glib-2.0 cairo librsvg libsoup-2.4" S = "${WORKDIR}/git" -inherit autotools_stage +inherit autotools do_configure_prepend () { echo "EXTRA_DIST=" > ${S}/gtk-doc.make diff --git a/meta-moblin/packages/libjana/libjana_git.bb b/meta-moblin/packages/libjana/libjana_git.bb index 976e9adab3..7797580ca5 100644 --- a/meta-moblin/packages/libjana/libjana_git.bb +++ b/meta-moblin/packages/libjana/libjana_git.bb @@ -3,7 +3,7 @@ DEPENDS = "gtk+ eds-dbus gconf" PV = "0.4.4+git${SRCPV}" PR = "r0" -inherit autotools_stage pkgconfig lib_package +inherit autotools pkgconfig lib_package SRC_URI = "git://git.gnome.org/jana;protocol=git" S = "${WORKDIR}/git/" diff --git a/meta-moblin/packages/librest/librest_git.bb b/meta-moblin/packages/librest/librest_git.bb index 3944e1cb48..33e714d6cf 100644 --- a/meta-moblin/packages/librest/librest_git.bb +++ b/meta-moblin/packages/librest/librest_git.bb @@ -7,7 +7,7 @@ DEPENDS = "libsoup-2.4" S = "${WORKDIR}/git" -inherit autotools_stage +inherit autotools do_configure_prepend () { echo "EXTRA_DIST=" > ${S}/gtk-doc.make diff --git a/meta-moblin/packages/libsamplerate/libsamplerate0_0.1.2.bb b/meta-moblin/packages/libsamplerate/libsamplerate0_0.1.2.bb index b04f069cdd..10923404d0 100644 --- a/meta-moblin/packages/libsamplerate/libsamplerate0_0.1.2.bb +++ b/meta-moblin/packages/libsamplerate/libsamplerate0_0.1.2.bb @@ -7,4 +7,4 @@ PR = "r3" SRC_URI = "http://www.mega-nerd.com/SRC/libsamplerate-${PV}.tar.gz" S = "${WORKDIR}/libsamplerate-${PV}" -inherit autotools_stage pkgconfig +inherit autotools pkgconfig diff --git a/meta-moblin/packages/libsexy/libsexy.inc b/meta-moblin/packages/libsexy/libsexy.inc index 473faf5e6e..ff68c6d5e6 100644 --- a/meta-moblin/packages/libsexy/libsexy.inc +++ b/meta-moblin/packages/libsexy/libsexy.inc @@ -8,6 +8,6 @@ DEPENDS = "gtk+ enchant libxml2" SRC_URI = "http://releases.chipx86.com/libsexy/${PN}/${PN}-${PV}.tar.gz \ file://libsexy-pkgconfig-fixes.patch;patch=1" -inherit autotools_stage pkgconfig +inherit autotools pkgconfig diff --git a/meta-moblin/packages/libsndfile/libsndfile1_1.0.17.bb b/meta-moblin/packages/libsndfile/libsndfile1_1.0.17.bb index b49d7a45e7..e46e3e15c0 100644 --- a/meta-moblin/packages/libsndfile/libsndfile1_1.0.17.bb +++ b/meta-moblin/packages/libsndfile/libsndfile1_1.0.17.bb @@ -12,7 +12,7 @@ SRC_URI = "http://www.mega-nerd.com/libsndfile/libsndfile-${PV}.tar.gz \ S = "${WORKDIR}/libsndfile-${PV}" -inherit autotools_stage lib_package pkgconfig +inherit autotools lib_package pkgconfig do_configure_prepend_arm() { export ac_cv_sys_largefile_source=1 diff --git a/meta-moblin/packages/libsocialweb/libsocialweb.inc b/meta-moblin/packages/libsocialweb/libsocialweb.inc index ff72debcad..9238125a74 100644 --- a/meta-moblin/packages/libsocialweb/libsocialweb.inc +++ b/meta-moblin/packages/libsocialweb/libsocialweb.inc @@ -3,7 +3,7 @@ SRC_URI = "http://download.moblin.org/sources/${PN}/0.0/${PN}-0.0.tar.bz2" DEPENDS = "libsoup-2.4 gconf-dbus librest glib-2.0 twitter-glib gnome-keyring" RDEPENDS_${PN} = "connman" -inherit autotools_stage +inherit autotools FILES_${PN} += "${datadir}/dbus-1/services" FILES_${PN}-dbg += "${libdir}/libsocialweb/sources/.debug/* ${libdir}/libsocialweb/services/.debug/" diff --git a/meta-moblin/packages/libsynthesis/libsynthesis_git.bb b/meta-moblin/packages/libsynthesis/libsynthesis_git.bb index a7ea88f5e9..dfe3bdaa6b 100644 --- a/meta-moblin/packages/libsynthesis/libsynthesis_git.bb +++ b/meta-moblin/packages/libsynthesis/libsynthesis_git.bb @@ -8,7 +8,7 @@ DEPENDS = "libpcre sqlite3 zlib" S = "${WORKDIR}/git" -inherit autotools_stage +inherit autotools do_configure_prepend () { cd ${S}/src diff --git a/meta-moblin/packages/libunique/libunique_1.0.6.bb b/meta-moblin/packages/libunique/libunique_1.0.6.bb index bd796fb468..55c3417f72 100644 --- a/meta-moblin/packages/libunique/libunique_1.0.6.bb +++ b/meta-moblin/packages/libunique/libunique_1.0.6.bb @@ -5,4 +5,4 @@ DEPENDS = "glib-2.0 gtk+ dbus" S = "${WORKDIR}/unique-${PV}" -inherit autotools_stage +inherit autotools diff --git a/meta-moblin/packages/moblin-app-installer/moblin-app-installer_git.bb b/meta-moblin/packages/moblin-app-installer/moblin-app-installer_git.bb index 47073879f4..1f388a3b44 100644 --- a/meta-moblin/packages/moblin-app-installer/moblin-app-installer_git.bb +++ b/meta-moblin/packages/moblin-app-installer/moblin-app-installer_git.bb @@ -9,4 +9,4 @@ PR = "r0" S = "${WORKDIR}/git" DEPENDS = "clutter-1.0 glib-2.0 nbtk libxml2 gtk+ gnome-packagekit opkg" -inherit autotools_stage +inherit autotools diff --git a/meta-moblin/packages/moblin-gtk-engine/moblin-gtk-engine_git.bb b/meta-moblin/packages/moblin-gtk-engine/moblin-gtk-engine_git.bb index 3d1a3de29b..e68a8541a7 100644 --- a/meta-moblin/packages/moblin-gtk-engine/moblin-gtk-engine_git.bb +++ b/meta-moblin/packages/moblin-gtk-engine/moblin-gtk-engine_git.bb @@ -8,7 +8,7 @@ DEPENDS = "gtk+" S = "${WORKDIR}/git" -inherit autotools_stage +inherit autotools FILES_${PN} = "${libdir}/gtk-2.0/*/engines/*.so ${datadir}/icons ${datadir}/themes" FILES_${PN}-dev = "${libdir}/gtk-2.0/*/engines/*" diff --git a/meta-moblin/packages/moblin-icon-theme/moblin-icon-theme_0.7.bb b/meta-moblin/packages/moblin-icon-theme/moblin-icon-theme_0.7.bb index 7bc12e5b28..4544603e75 100644 --- a/meta-moblin/packages/moblin-icon-theme/moblin-icon-theme_0.7.bb +++ b/meta-moblin/packages/moblin-icon-theme/moblin-icon-theme_0.7.bb @@ -6,7 +6,7 @@ DEPENDS = "icon-naming-utils-native" FILES_${PN} += "${datadir}/icons/" -inherit autotools_stage +inherit autotools do_install_append () { ln -s ../apps/gnome-aisleriot.png ${D}${datadir}/icons/moblin/48x48/categories/applications-games.png diff --git a/meta-moblin/packages/moblin-icon-theme/moblin-icon-theme_git.bb b/meta-moblin/packages/moblin-icon-theme/moblin-icon-theme_git.bb index a778ae16f4..b73e8d32d8 100644 --- a/meta-moblin/packages/moblin-icon-theme/moblin-icon-theme_git.bb +++ b/meta-moblin/packages/moblin-icon-theme/moblin-icon-theme_git.bb @@ -9,4 +9,4 @@ BROKEN = "1" S = "${WORKDIR}/git" -inherit autotools_stage +inherit autotools diff --git a/meta-moblin/packages/moblin-menus/moblin-menus_git.bb b/meta-moblin/packages/moblin-menus/moblin-menus_git.bb index e6d7fde1c0..2d6cb27d04 100644 --- a/meta-moblin/packages/moblin-menus/moblin-menus_git.bb +++ b/meta-moblin/packages/moblin-menus/moblin-menus_git.bb @@ -10,4 +10,4 @@ S = "${WORKDIR}/git" FILES_${PN} += "${datadir}/desktop-directories/*" -inherit autotools_stage +inherit autotools diff --git a/meta-moblin/packages/moblin-sound-theme/moblin-sound-theme_0.1.bb b/meta-moblin/packages/moblin-sound-theme/moblin-sound-theme_0.1.bb index ef1e10839a..7d122dd4c1 100644 --- a/meta-moblin/packages/moblin-sound-theme/moblin-sound-theme_0.1.bb +++ b/meta-moblin/packages/moblin-sound-theme/moblin-sound-theme_0.1.bb @@ -2,6 +2,6 @@ SRC_URI = "file://${PN}-${PV}.tar.bz2" PR = "r0" -inherit autotools_stage +inherit autotools #FILES_${PN} =+ "${datadir}/icons/moblin" diff --git a/meta-moblin/packages/moblin-web-browser/moblin-web-browser_git.bb b/meta-moblin/packages/moblin-web-browser/moblin-web-browser_git.bb index befc28a2a0..53c8a3531b 100644 --- a/meta-moblin/packages/moblin-web-browser/moblin-web-browser_git.bb +++ b/meta-moblin/packages/moblin-web-browser/moblin-web-browser_git.bb @@ -21,4 +21,4 @@ FILES_${PN}-dbg += "${datadir}/moblin-web-browser/components/.debug/* ${libdir}/ -inherit autotools_stage +inherit autotools diff --git a/meta-moblin/packages/mojito/mojito.inc b/meta-moblin/packages/mojito/mojito.inc index 7eee2edfb2..f823e7437d 100644 --- a/meta-moblin/packages/mojito/mojito.inc +++ b/meta-moblin/packages/mojito/mojito.inc @@ -3,7 +3,7 @@ SRC_URI = "http://download.moblin.org/sources/mojito/0.21/mojito-0.21.7.tar.bz2" DEPENDS = "libsoup-2.4 gconf-dbus librest glib-2.0 twitter-glib gnome-keyring" RDEPENDS_${PN} = "connman" -inherit autotools_stage +inherit autotools FILES_${PN} += "${datadir}/dbus-1/services" FILES_${PN}-dbg += "${libdir}/mojito/sources/.debug/* ${libdir}/mojito/services/.debug/" diff --git a/meta-moblin/packages/mutter-moblin/moblin-panel-applications.inc b/meta-moblin/packages/mutter-moblin/moblin-panel-applications.inc index c5bff816bd..3bf7108555 100644 --- a/meta-moblin/packages/mutter-moblin/moblin-panel-applications.inc +++ b/meta-moblin/packages/mutter-moblin/moblin-panel-applications.inc @@ -7,5 +7,5 @@ SRC_URI = "http://download.moblin.org/sources/moblin-panel-applications/0.1/mobl FILES_${PN} += "${datadir}/dbus-1/services" -inherit autotools_stage +inherit autotools diff --git a/meta-moblin/packages/mutter-moblin/moblin-panel-media.inc b/meta-moblin/packages/mutter-moblin/moblin-panel-media.inc index 13b2854a2a..4170197fe5 100644 --- a/meta-moblin/packages/mutter-moblin/moblin-panel-media.inc +++ b/meta-moblin/packages/mutter-moblin/moblin-panel-media.inc @@ -6,5 +6,5 @@ SRC_URI = "http://download.moblin.org/sources/moblin-panel-media/0.0/moblin-pane FILES_${PN} += "${datadir}/dbus-1/services" -inherit autotools_stage +inherit autotools diff --git a/meta-moblin/packages/mutter-moblin/moblin-panel-myzone.inc b/meta-moblin/packages/mutter-moblin/moblin-panel-myzone.inc index 09f28ee7ae..e8ca32f726 100644 --- a/meta-moblin/packages/mutter-moblin/moblin-panel-myzone.inc +++ b/meta-moblin/packages/mutter-moblin/moblin-panel-myzone.inc @@ -6,5 +6,5 @@ SRC_URI = "http://download.moblin.org/sources/moblin-panel-myzone/0.0/moblin-pan FILES_${PN} += "${datadir}/dbus-1/services" -inherit autotools_stage +inherit autotools diff --git a/meta-moblin/packages/mutter-moblin/moblin-panel-pasteboard.inc b/meta-moblin/packages/mutter-moblin/moblin-panel-pasteboard.inc index 4eb8d99e6a..df01edc09c 100644 --- a/meta-moblin/packages/mutter-moblin/moblin-panel-pasteboard.inc +++ b/meta-moblin/packages/mutter-moblin/moblin-panel-pasteboard.inc @@ -6,5 +6,5 @@ SRC_URI = "http://download.moblin.org/sources/moblin-panel-pasteboard/0.0/moblin FILES_${PN} += "${datadir}/dbus-1/services" -inherit autotools_stage +inherit autotools diff --git a/meta-moblin/packages/mutter-moblin/moblin-panel-people.inc b/meta-moblin/packages/mutter-moblin/moblin-panel-people.inc index 2deb94ea54..ca6880dfaf 100644 --- a/meta-moblin/packages/mutter-moblin/moblin-panel-people.inc +++ b/meta-moblin/packages/mutter-moblin/moblin-panel-people.inc @@ -7,5 +7,5 @@ SRC_URI = "http://download.moblin.org/sources/moblin-panel-people/0.0/moblin-pan FILES_${PN} += "${datadir}/dbus-1/services" -inherit autotools_stage +inherit autotools diff --git a/meta-moblin/packages/mutter-moblin/moblin-panel-status.inc b/meta-moblin/packages/mutter-moblin/moblin-panel-status.inc index 619fe4fc1c..c5f45a730c 100644 --- a/meta-moblin/packages/mutter-moblin/moblin-panel-status.inc +++ b/meta-moblin/packages/mutter-moblin/moblin-panel-status.inc @@ -7,5 +7,5 @@ SRC_URI = "http://download.moblin.org/sources/moblin-panel-status/0.0/moblin-pan FILES_${PN} += "${datadir}/dbus-1/services" -inherit autotools_stage +inherit autotools diff --git a/meta-moblin/packages/mutter-moblin/mutter-moblin.inc b/meta-moblin/packages/mutter-moblin/mutter-moblin.inc index a956e4bfc7..31a3d96733 100644 --- a/meta-moblin/packages/mutter-moblin/mutter-moblin.inc +++ b/meta-moblin/packages/mutter-moblin/mutter-moblin.inc @@ -23,7 +23,7 @@ ASNEEDED = "" EXTRA_OECONF = "--enable-ahoghill --enable-netpanel --enable-people" -inherit autotools_stage +inherit autotools do_configure_prepend () { rm -f ${S}/build/autotools/gtk-doc.m4 diff --git a/meta-moblin/packages/mx/mx_git.bb b/meta-moblin/packages/mx/mx_git.bb index 83953a86b4..884b22313a 100644 --- a/meta-moblin/packages/mx/mx_git.bb +++ b/meta-moblin/packages/mx/mx_git.bb @@ -6,7 +6,7 @@ PR = "r1" DEPENDS = "clutter-1.0 clutter-imcontext" S = "${WORKDIR}/git" -inherit autotools_stage +inherit autotools EXTRA_OECONF = "--disable-introspection --without-clutter-gesture" diff --git a/meta-moblin/packages/nbtk/nbtk.inc b/meta-moblin/packages/nbtk/nbtk.inc index 76bfa68e94..0ad2dff6c0 100644 --- a/meta-moblin/packages/nbtk/nbtk.inc +++ b/meta-moblin/packages/nbtk/nbtk.inc @@ -7,7 +7,7 @@ DEPENDS = "clutter-1.0 libccss clutter-imcontext" EXTRA_OECONF = "--disable-introspection" -inherit autotools_stage +inherit autotools do_configure_prepend () { echo "EXTRA_DIST=" > ${S}/gtk-doc.make diff --git a/meta-moblin/packages/packagekit/packagekit_0.5.6.bb b/meta-moblin/packages/packagekit/packagekit_0.5.6.bb index 6cd1101122..57f05650c1 100644 --- a/meta-moblin/packages/packagekit/packagekit_0.5.6.bb +++ b/meta-moblin/packages/packagekit/packagekit_0.5.6.bb @@ -5,7 +5,7 @@ LICENSE = "GPL" DEPENDS = "gtk+ python polkit dbus (>= 1.1.1) dbus-glib glib-2.0 sqlite3 opkg intltool intltool-native (>= 0.37.1) connman" RDEPENDS_${PN} = "opkg" -inherit gnome autotools_stage +inherit gnome autotools SRC_URI = "http://www.packagekit.org/releases/PackageKit-${PV}.tar.gz \ file://configurefix.patch;patch=1 \ diff --git a/meta-moblin/packages/procps/procps.inc b/meta-moblin/packages/procps/procps.inc index cfe9971a08..2de32d2c83 100644 --- a/meta-moblin/packages/procps/procps.inc +++ b/meta-moblin/packages/procps/procps.inc @@ -13,4 +13,4 @@ FILES_${PN} += "${base_libdir}/libproc-*.so" SRC_URI = "http://procps.sourceforge.net/procps-${PV}.tar.gz \ file://install.patch;patch=1" -inherit autotools_stage +inherit autotools diff --git a/meta-moblin/packages/pulseaudio/libatomics-ops_1.2.bb b/meta-moblin/packages/pulseaudio/libatomics-ops_1.2.bb index c2058fb715..207f1b1ec6 100644 --- a/meta-moblin/packages/pulseaudio/libatomics-ops_1.2.bb +++ b/meta-moblin/packages/pulseaudio/libatomics-ops_1.2.bb @@ -11,4 +11,4 @@ S = "${WORKDIR}/libatomic_ops-${PV}" ALLOW_EMPTY_${PN} = "1" -inherit autotools_stage pkgconfig +inherit autotools pkgconfig diff --git a/meta-moblin/packages/syncevolution/syncevolution_git.bb b/meta-moblin/packages/syncevolution/syncevolution_git.bb index 435683c13e..9d767ca949 100644 --- a/meta-moblin/packages/syncevolution/syncevolution_git.bb +++ b/meta-moblin/packages/syncevolution/syncevolution_git.bb @@ -10,7 +10,7 @@ EXTRA_OECONF = "--enable-gui=moblin" S = "${WORKDIR}/git" -inherit autotools_stage +inherit autotools do_configure_prepend () { ${S}/gen-autotools.sh diff --git a/meta-moblin/packages/taglib/taglib_1.6.1.bb b/meta-moblin/packages/taglib/taglib_1.6.1.bb index e6d634ce3a..f1a87368a7 100644 --- a/meta-moblin/packages/taglib/taglib_1.6.1.bb +++ b/meta-moblin/packages/taglib/taglib_1.6.1.bb @@ -10,7 +10,7 @@ SRC_URI = "http://developer.kde.org/~wheeler/files/src/taglib-${PV}.tar.gz \ S = "${WORKDIR}/taglib-${PV}" -inherit autotools_stage pkgconfig binconfig +inherit autotools pkgconfig binconfig PACKAGES =+ "${PN}-c" FILES_${PN}-dbg += "${bindir}/taglib-config" diff --git a/meta-moblin/packages/tracker/tracker_0.7.18.bb b/meta-moblin/packages/tracker/tracker_0.7.18.bb index db2d41117f..2b908641e4 100644 --- a/meta-moblin/packages/tracker/tracker_0.7.18.bb +++ b/meta-moblin/packages/tracker/tracker_0.7.18.bb @@ -3,7 +3,7 @@ LICENSE = "GPLv2" DEPENDS = "file gtk+ gstreamer gamin dbus poppler libexif libgsf libgnomecanvas" HOMEPAGE = "http://www.tracker-project.org/" -inherit autotools_stage pkgconfig gnome gettext +inherit autotools pkgconfig gnome gettext SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/tracker/0.7/tracker-${PV}.tar.bz2 \ file://munge-configure.ac-cross-compile.patch;patch=1 \ diff --git a/meta-moblin/packages/twitter-glib/twitter-glib_git.bb b/meta-moblin/packages/twitter-glib/twitter-glib_git.bb index 8a18517d79..7d4d990fec 100644 --- a/meta-moblin/packages/twitter-glib/twitter-glib_git.bb +++ b/meta-moblin/packages/twitter-glib/twitter-glib_git.bb @@ -10,7 +10,7 @@ S = "${WORKDIR}/git" EXTRA_OECONF = "--disable-shave --disable-introspection --disable-maintainer-flags" -inherit autotools_stage +inherit autotools do_configure_prepend () { echo "EXTRA_DIST=" > ${S}/gtk-doc.make diff --git a/meta-moblin/packages/xdg-user-dirs/xdg-user-dirs_0.10.bb b/meta-moblin/packages/xdg-user-dirs/xdg-user-dirs_0.10.bb index a0fa9c666f..579672cf51 100644 --- a/meta-moblin/packages/xdg-user-dirs/xdg-user-dirs_0.10.bb +++ b/meta-moblin/packages/xdg-user-dirs/xdg-user-dirs_0.10.bb @@ -4,7 +4,7 @@ SRC_URI = "http://user-dirs.freedesktop.org/releases/xdg-user-dirs-0.10.tar.gz \ DEPENDS = "gettext" PR = "r1" -inherit autotools_stage +inherit autotools do_install_append () { install -d ${D}${sysconfdir}/skel/.config/ diff --git a/meta-moblin/packages/xorg-app/xorg-app-common.inc b/meta-moblin/packages/xorg-app/xorg-app-common.inc index 2dc659a0fa..11f7fe3e00 100644 --- a/meta-moblin/packages/xorg-app/xorg-app-common.inc +++ b/meta-moblin/packages/xorg-app/xorg-app-common.inc @@ -10,6 +10,6 @@ SRC_URI = "${XORG_MIRROR}/individual/app/${XORG_PN}-${PV}.tar.bz2" S = "${WORKDIR}/${XORG_PN}-${PV}" -inherit autotools_stage pkgconfig +inherit autotools pkgconfig FILES_${PN} += " /usr/lib/X11/${XORG_PN}" diff --git a/meta-moblin/packages/xorg-data/xorg-data-common.inc b/meta-moblin/packages/xorg-data/xorg-data-common.inc index 3e652c3e1d..e128763398 100644 --- a/meta-moblin/packages/xorg-data/xorg-data-common.inc +++ b/meta-moblin/packages/xorg-data/xorg-data-common.inc @@ -7,4 +7,4 @@ XORG_PN = "${PN}" SRC_URI = "${XORG_MIRROR}/individual/data/${XORG_PN}-${PV}.tar.bz2" S = "${WORKDIR}/${XORG_PN}-${PV}" -inherit autotools_stage pkgconfig +inherit autotools pkgconfig diff --git a/meta-moblin/packages/xorg-driver/xf86-driver-common.inc b/meta-moblin/packages/xorg-driver/xf86-driver-common.inc index 3cb8cd021e..af68335f6c 100644 --- a/meta-moblin/packages/xorg-driver/xf86-driver-common.inc +++ b/meta-moblin/packages/xorg-driver/xf86-driver-common.inc @@ -16,7 +16,7 @@ S = "${WORKDIR}/${XORG_PN}-${PV}" FILES_${PN} += " ${libdir}/xorg/modules/drivers/*.so" FILES_${PN}-dbg += " ${libdir}/xorg/modules/drivers/.debug" -inherit autotools_stage pkgconfig +inherit autotools pkgconfig # AC_CHECK_FILE doesn't work when cross compiling, so we create a replacement # macro that simply assumes the test succeeds. diff --git a/meta-openmoko/packages/dfu-util/dfu-util_svn.bb b/meta-openmoko/packages/dfu-util/dfu-util_svn.bb index 2ab131b16a..4224fd1576 100644 --- a/meta-openmoko/packages/dfu-util/dfu-util_svn.bb +++ b/meta-openmoko/packages/dfu-util/dfu-util_svn.bb @@ -10,4 +10,4 @@ DEPENDS = "libusb usbpath" SRC_URI = "svn://svn.openmoko.org/trunk/src/host/;module=dfu-util;proto=http" S = "${WORKDIR}/dfu-util" -inherit autotools_stage +inherit autotools diff --git a/meta/classes/autotools.bbclass b/meta/classes/autotools.bbclass index afb1d672ea..20dc72a1df 100644 --- a/meta/classes/autotools.bbclass +++ b/meta/classes/autotools.bbclass @@ -204,5 +204,8 @@ autotools_stage_all() { rm -rf ${STAGE_TEMP} } -EXPORT_FUNCTIONS do_configure do_install +do_stage () { + autotools_stage_all +} +EXPORT_FUNCTIONS do_configure do_install diff --git a/meta/classes/autotools_stage.bbclass b/meta/classes/autotools_stage.bbclass index ff0f4cd880..b3c41e4b4d 100644 --- a/meta/classes/autotools_stage.bbclass +++ b/meta/classes/autotools_stage.bbclass @@ -1,5 +1,2 @@ inherit autotools -do_stage () { - autotools_stage_all -} diff --git a/meta/packages/alsa/alsa-lib_1.0.20.bb b/meta/packages/alsa/alsa-lib_1.0.20.bb index fe910ec59d..7668b786e0 100644 --- a/meta/packages/alsa/alsa-lib_1.0.20.bb +++ b/meta/packages/alsa/alsa-lib_1.0.20.bb @@ -13,7 +13,7 @@ ARM_INSTRUCTION_SET = "arm" SRC_URI = "ftp://ftp.alsa-project.org/pub/lib/alsa-lib-${PV}.tar.bz2 \ file://fix-tstamp-declaration.patch;patch=1" -inherit autotools_stage pkgconfig +inherit autotools pkgconfig require alsa-fpu.inc EXTRA_OECONF += "${@get_alsa_fpu_setting(bb, d)} " diff --git a/meta/packages/alsa/alsa-oss_1.0.17.bb b/meta/packages/alsa/alsa-oss_1.0.17.bb index 4ae04dd97d..00e00dc62b 100644 --- a/meta/packages/alsa/alsa-oss_1.0.17.bb +++ b/meta/packages/alsa/alsa-oss_1.0.17.bb @@ -5,7 +5,7 @@ DEPENDS = "alsa-lib" SRC_URI = "ftp://ftp.alsa-project.org/pub/oss-lib/alsa-oss-${PV}.tar.bz2" -inherit autotools_stage +inherit autotools do_configure_prepend () { touch NEWS README AUTHORS ChangeLog diff --git a/meta/packages/apr/apr-util_1.3.4.bb b/meta/packages/apr/apr-util_1.3.4.bb index 12b444976c..2e608e8a5c 100644 --- a/meta/packages/apr/apr-util_1.3.4.bb +++ b/meta/packages/apr/apr-util_1.3.4.bb @@ -17,7 +17,7 @@ EXTRA_OECONF = "--with-apr=${STAGING_BINDIR_CROSS}/apr-1-config \ --with-expat=${STAGING_DIR_HOST}${prefix}" -inherit autotools_stage lib_package binconfig +inherit autotools lib_package binconfig OE_BINCONFIG_EXTRA_MANGLE = " -e 's:location=source:location=installed:'" diff --git a/meta/packages/atk/atk.inc b/meta/packages/atk/atk.inc index 9256dfbac8..1e3d1592ca 100644 --- a/meta/packages/atk/atk.inc +++ b/meta/packages/atk/atk.inc @@ -5,6 +5,6 @@ LICENSE = "LGPL" DEPENDS = "glib-2.0 gtk-doc-native" -inherit autotools_stage pkgconfig +inherit autotools pkgconfig EXTRA_OECONF = "--disable-glibtest" diff --git a/meta/packages/avahi/avahi.inc b/meta/packages/avahi/avahi.inc index 33b9a99056..fdc234dc8b 100644 --- a/meta/packages/avahi/avahi.inc +++ b/meta/packages/avahi/avahi.inc @@ -13,7 +13,7 @@ SRC_URI = "http://avahi.org/download/avahi-${PV}.tar.gz \ file://99avahi-autoipd \ file://initscript.patch;patch=1" -inherit autotools_stage pkgconfig update-rc.d gettext +inherit autotools pkgconfig update-rc.d gettext EXTRA_OECONF = "--with-distro=debian \ --with-avahi-priv-access-group=adm \ diff --git a/meta/packages/beecrypt/beecrypt_3.1.0.bb b/meta/packages/beecrypt/beecrypt_3.1.0.bb index b7777f8860..2b2b46138a 100644 --- a/meta/packages/beecrypt/beecrypt_3.1.0.bb +++ b/meta/packages/beecrypt/beecrypt_3.1.0.bb @@ -9,7 +9,7 @@ SRC_URI="${SOURCEFORGE_MIRROR}/beecrypt/beecrypt-${PV}.tar.gz \ PR = "r1" -inherit autotools_stage +inherit autotools acpaths="" EXTRA_OECONF="--with-arch=${TARGET_ARCH} --enable-shared --enable-static" diff --git a/meta/packages/bluez/bluez4_4.56.bb b/meta/packages/bluez/bluez4_4.56.bb index 507b3b8446..656c1e82ab 100644 --- a/meta/packages/bluez/bluez4_4.56.bb +++ b/meta/packages/bluez/bluez4_4.56.bb @@ -18,7 +18,7 @@ SRC_URI = "\ " S = "${WORKDIR}/bluez-${PV}" -inherit autotools_stage +inherit autotools AUTOTOOLS_STAGE_PKGCONFIG = "1" EXTRA_OECONF = "\ diff --git a/meta/packages/cairo/cairo.inc b/meta/packages/cairo/cairo.inc index bc160de516..1847519c67 100644 --- a/meta/packages/cairo/cairo.inc +++ b/meta/packages/cairo/cairo.inc @@ -8,4 +8,4 @@ LICENSE = "MPL LGPL" require cairo-fpu.inc EXTRA_OECONF += "${@get_cairo_fpu_setting(bb, d)}" -inherit autotools_stage pkgconfig +inherit autotools pkgconfig diff --git a/meta/packages/clutter/aaina.inc b/meta/packages/clutter/aaina.inc index 29a0e0c0d6..afbc022cdb 100644 --- a/meta/packages/clutter/aaina.inc +++ b/meta/packages/clutter/aaina.inc @@ -4,4 +4,4 @@ LICENSE = "GPL" DEPENDS = "clutter-0.6 libxml2 gtk+ neon" -inherit autotools_stage pkgconfig +inherit autotools pkgconfig diff --git a/meta/packages/clutter/clutter-box2d.inc b/meta/packages/clutter/clutter-box2d.inc index 7e279a2a04..1a107c3993 100644 --- a/meta/packages/clutter/clutter-box2d.inc +++ b/meta/packages/clutter/clutter-box2d.inc @@ -7,7 +7,7 @@ DEPENDS = "clutter-0.8" # The main clutter lib is machine specific so we need to be too PACKAGE_ARCH = "${MACHINE_ARCH}" -inherit autotools_stage pkgconfig gtk-doc +inherit autotools pkgconfig gtk-doc do_install_append () { install -d ${D}${bindir} diff --git a/meta/packages/clutter/clutter-cairo.inc b/meta/packages/clutter/clutter-cairo.inc index 2e6e3e5ee0..ff889899e7 100644 --- a/meta/packages/clutter/clutter-cairo.inc +++ b/meta/packages/clutter/clutter-cairo.inc @@ -9,5 +9,5 @@ FILESPATH = "${FILE_DIRNAME}/clutter-cairo" PACKAGES =+ "${PN}-examples" FILES_${PN}-examples = "${bindir}/flowers ${bindir}/clock" -inherit autotools_stage pkgconfig +inherit autotools pkgconfig diff --git a/meta/packages/clutter/clutter-gst.inc b/meta/packages/clutter/clutter-gst.inc index d596b95065..0a2f261531 100644 --- a/meta/packages/clutter/clutter-gst.inc +++ b/meta/packages/clutter/clutter-gst.inc @@ -9,5 +9,5 @@ FILESPATH = "${FILE_DIRNAME}/clutter-gst" PACKAGES =+ "${PN}-examples" FILES_${PN}-examples = "${bindir}/video-player ${bindir}/video-sink ${bindir}/audio" -inherit autotools_stage pkgconfig gtk-doc +inherit autotools pkgconfig gtk-doc diff --git a/meta/packages/clutter/clutter-gtk.inc b/meta/packages/clutter/clutter-gtk.inc index bbecee548c..89ae3e53ca 100644 --- a/meta/packages/clutter/clutter-gtk.inc +++ b/meta/packages/clutter/clutter-gtk.inc @@ -9,5 +9,5 @@ FILESPATH = "${FILE_DIRNAME}/clutter-gtk" PACKAGES =+ "${PN}-examples" FILES_${PN}-examples = "${bindir}/gtk-clutter-test ${bindir}/gtk-clutter-events ${bindir}/gtk-clutter-multistage" -inherit autotools_stage pkgconfig gtk-doc +inherit autotools pkgconfig gtk-doc diff --git a/meta/packages/clutter/clutter-helix.inc b/meta/packages/clutter/clutter-helix.inc index 29b7391e21..6bbbb244d7 100644 --- a/meta/packages/clutter/clutter-helix.inc +++ b/meta/packages/clutter/clutter-helix.inc @@ -11,5 +11,5 @@ COMPATIBLE_HOST = '(x86_64|i.86.*)-linux' PACKAGES =+ "${PN}-examples" FILES_${PN}-examples = "${bindir}/video-player ${bindir}/audio-player" -inherit autotools_stage pkgconfig gtk-doc +inherit autotools pkgconfig gtk-doc diff --git a/meta/packages/clutter/clutter-mozembed.inc b/meta/packages/clutter/clutter-mozembed.inc index b242d0925f..72c9412d04 100644 --- a/meta/packages/clutter/clutter-mozembed.inc +++ b/meta/packages/clutter/clutter-mozembed.inc @@ -10,5 +10,5 @@ FILES_${PN} =+ "${datadir}/cluttermozembed/chrome/" EXTRA_OECONF = "--enable-plugins" -inherit autotools_stage pkgconfig gtk-doc +inherit autotools pkgconfig gtk-doc diff --git a/meta/packages/clutter/clutter.inc b/meta/packages/clutter/clutter.inc index 82f8e71d83..c099309bbb 100644 --- a/meta/packages/clutter/clutter.inc +++ b/meta/packages/clutter/clutter.inc @@ -45,7 +45,7 @@ PACKAGE_ARCH_menlow = "${MACHINE_ARCH}" FILESPATH = "${FILE_DIRNAME}/clutter" -inherit autotools_stage pkgconfig gtk-doc +inherit autotools pkgconfig gtk-doc #check for TARGET_FPU=soft and inform configure of the result so it can disable some floating points require clutter-fpu.inc diff --git a/meta/packages/clutter/table.inc b/meta/packages/clutter/table.inc index 6a5b32ccda..dc949172b5 100644 --- a/meta/packages/clutter/table.inc +++ b/meta/packages/clutter/table.inc @@ -4,7 +4,7 @@ LICENSE = "LGPL" DEPENDS = "clutter-gst-0.6 gnome-vfs" -inherit autotools_stage pkgconfig +inherit autotools pkgconfig do_install() { install -d ${D}${bindir} diff --git a/meta/packages/clutter/tidy.inc b/meta/packages/clutter/tidy.inc index 14ec4ca9a8..3fa387c049 100644 --- a/meta/packages/clutter/tidy.inc +++ b/meta/packages/clutter/tidy.inc @@ -8,7 +8,7 @@ BASE_CONF = "--disable-gtk-doc" DEPENDS = "${STDDEPENDS}" EXTRA_OECONF = "${BASE_CONF}" -inherit autotools_stage pkgconfig +inherit autotools pkgconfig PACKAGES =+ "tidy-examples" FILES_tidy-examples = "${bindir}/test-*" diff --git a/meta/packages/connman/connman-gnome_git.bb b/meta/packages/connman/connman-gnome_git.bb index bfb6c90d33..440ba285cc 100644 --- a/meta/packages/connman/connman-gnome_git.bb +++ b/meta/packages/connman/connman-gnome_git.bb @@ -6,4 +6,4 @@ PR = "r0" S = "${WORKDIR}/git" -inherit autotools_stage +inherit autotools diff --git a/meta/packages/connman/connman.inc b/meta/packages/connman/connman.inc index e7fde858b8..9a623d7f4e 100644 --- a/meta/packages/connman/connman.inc +++ b/meta/packages/connman/connman.inc @@ -16,7 +16,7 @@ EXTRA_OECONF += " \ INITSCRIPT_NAME = "connman" INITSCRIPT_PARAMS = "start 05 5 2 . stop 22 0 1 6 ." -inherit autotools_stage pkgconfig update-rc.d +inherit autotools pkgconfig update-rc.d do_install_append() { install -d ${D}${sysconfdir}/init.d/ diff --git a/meta/packages/curl/curl_7.20.0.bb b/meta/packages/curl/curl_7.20.0.bb index 19b46faf26..bff5a003d6 100644 --- a/meta/packages/curl/curl_7.20.0.bb +++ b/meta/packages/curl/curl_7.20.0.bb @@ -9,7 +9,7 @@ PR = "r1" SRC_URI = "http://curl.haxx.se/download/curl-${PV}.tar.bz2 \ file://pkgconfig_fix.patch;patch=1" -inherit autotools_stage pkgconfig binconfig +inherit autotools pkgconfig binconfig EXTRA_OECONF = "--with-zlib=${STAGING_LIBDIR}/../ \ --with-gnutls=${STAGING_BINDIR_CROSS}/ \ diff --git a/meta/packages/dbus/dbus-glib.inc b/meta/packages/dbus/dbus-glib.inc index 7d811f9129..d62aa07b5a 100644 --- a/meta/packages/dbus/dbus-glib.inc +++ b/meta/packages/dbus/dbus-glib.inc @@ -8,7 +8,7 @@ SRC_URI = "http://dbus.freedesktop.org/releases/dbus-glib/dbus-glib-${PV}.tar.gz file://fix_asneeded.patch;patch=1 \ file://no-examples.patch;patch=1" -inherit autotools_stage pkgconfig gettext +inherit autotools pkgconfig gettext EXTRA_OECONF = "--with-introspect-xml=${STAGING_DATADIR_NATIVE}/dbus/dbus-bus-introspect.xml" diff --git a/meta/packages/devicekit/devicekit-power_014.bb b/meta/packages/devicekit/devicekit-power_014.bb index 621d80e2fc..f69a060ef2 100644 --- a/meta/packages/devicekit/devicekit-power_014.bb +++ b/meta/packages/devicekit/devicekit-power_014.bb @@ -5,7 +5,7 @@ DEPENDS = "devicekit glib-2.0 dbus-glib polkit" SRC_URI = "http://hal.freedesktop.org/releases/DeviceKit-power-${PV}.tar.gz" S = "${WORKDIR}/DeviceKit-power-${PV}" -inherit autotools_stage pkgconfig +inherit autotools pkgconfig do_configure_prepend() { sed -i -e s:-nonet:\:g ${S}/doc/man/Makefile.am diff --git a/meta/packages/devicekit/devicekit_003.bb b/meta/packages/devicekit/devicekit_003.bb index cc79f0db5a..af812935cd 100644 --- a/meta/packages/devicekit/devicekit_003.bb +++ b/meta/packages/devicekit/devicekit_003.bb @@ -11,6 +11,6 @@ do_configure_prepend() { sed -i -e s:-nonet:\:g ${S}/doc/man/Makefile.am } -inherit autotools_stage +inherit autotools FILES_${PN} += "${datadir}/dbus-1/" diff --git a/meta/packages/drm/libdrm.inc b/meta/packages/drm/libdrm.inc index 11d89a5d2c..b86af2faf0 100644 --- a/meta/packages/drm/libdrm.inc +++ b/meta/packages/drm/libdrm.inc @@ -9,4 +9,4 @@ FILES_libdrm-tests = "${bindir}/dr* ${bindir}/mode*" LEAD_SONAME = "libdrm.so" -inherit autotools_stage pkgconfig +inherit autotools pkgconfig diff --git a/meta/packages/eds/eds-dbus_2.20.0.bb b/meta/packages/eds/eds-dbus_2.20.0.bb index 274086470c..7f6a52e43b 100644 --- a/meta/packages/eds/eds-dbus_2.20.0.bb +++ b/meta/packages/eds/eds-dbus_2.20.0.bb @@ -11,7 +11,7 @@ SRC_URI = "http://ftp.gnome.org/pub/GNOME/mobile/2.23/2.23.92/sources/evolution- S = "${WORKDIR}/evolution-data-server-dbus-${PV}" -inherit autotools_stage pkgconfig +inherit autotools pkgconfig # -ldb needs this on some platforms LDFLAGS += "-lpthread" diff --git a/meta/packages/eds/eds-dbus_git.bb b/meta/packages/eds/eds-dbus_git.bb index ac6af7c1fc..257e7124dd 100644 --- a/meta/packages/eds/eds-dbus_git.bb +++ b/meta/packages/eds/eds-dbus_git.bb @@ -13,7 +13,7 @@ SRC_URI = "git://git.gnome.org/evolution-data-server;protocol=git \ S = "${WORKDIR}/git" -inherit autotools_stage pkgconfig +inherit autotools pkgconfig # -ldb needs this on some platforms LDFLAGS += "-lpthread" diff --git a/meta/packages/elfutils/elfutils_0.108.bb b/meta/packages/elfutils/elfutils_0.108.bb index 37e5fbd14f..67f34a0acd 100644 --- a/meta/packages/elfutils/elfutils_0.108.bb +++ b/meta/packages/elfutils/elfutils_0.108.bb @@ -7,7 +7,7 @@ PR = "r2" SRC_URI = "http://distro.ibiblio.org/pub/linux/distributions/gentoo/distfiles/elfutils-${PV}.tar.gz \ file://warnings.patch;patch=1" -inherit autotools_stage +inherit autotools # Package binaries that overlap with binutils separately PACKAGES =+ "${PN}-binutils" diff --git a/meta/packages/elfutils/elfutils_0.131.bb b/meta/packages/elfutils/elfutils_0.131.bb index 8bb3c8925f..4169b31d27 100644 --- a/meta/packages/elfutils/elfutils_0.131.bb +++ b/meta/packages/elfutils/elfutils_0.131.bb @@ -8,7 +8,7 @@ SRC_URI = "http://distro.ibiblio.org/pub/linux/distributions/gentoo/distfiles/el file://gcc-4.3_support.diff;patch=1 \ file://gnu_inline.diff;patch=1" -inherit autotools_stage +inherit autotools # Package binaries that overlap with binutils separately PACKAGES =+ "${PN}-binutils" diff --git a/meta/packages/elfutils/elfutils_0.89.bb b/meta/packages/elfutils/elfutils_0.89.bb index b59c33e8c9..24cb37ad1f 100644 --- a/meta/packages/elfutils/elfutils_0.89.bb +++ b/meta/packages/elfutils/elfutils_0.89.bb @@ -6,5 +6,5 @@ DEPENDS = "libtool" SRC_URI = "http://distro.ibiblio.org/pub/linux/distributions/gentoo/distfiles/elfutils-${PV}.tar.gz \ file://warnings.patch;patch=1" -inherit autotools_stage +inherit autotools diff --git a/meta/packages/expat/expat.inc b/meta/packages/expat/expat.inc index 87fe60614e..62ef253f77 100644 --- a/meta/packages/expat/expat.inc +++ b/meta/packages/expat/expat.inc @@ -7,5 +7,5 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/expat/expat-${PV}.tar.gz \ " export LTCC = "${CC}" -inherit autotools_stage +inherit autotools diff --git a/meta/packages/fakeroot/fakeroot_1.9.4.bb b/meta/packages/fakeroot/fakeroot_1.9.4.bb index d7545ddb26..34e0b97573 100644 --- a/meta/packages/fakeroot/fakeroot_1.9.4.bb +++ b/meta/packages/fakeroot/fakeroot_1.9.4.bb @@ -11,7 +11,7 @@ SRC_URI = "${DEBIAN_MIRROR}/main/f/fakeroot/fakeroot_${PV}.tar.gz \ file://configure-libtool.patch;patch=1 \ file://absolutepaths.patch;patch=1 " -inherit autotools_stage +inherit autotools do_install_append() { install -d ${D}${STAGING_INCDIR}/fakeroot/ diff --git a/meta/packages/farsight/farsight2_0.0.9.bb b/meta/packages/farsight/farsight2_0.0.9.bb index 628b155c91..06c85f1cf0 100644 --- a/meta/packages/farsight/farsight2_0.0.9.bb +++ b/meta/packages/farsight/farsight2_0.0.9.bb @@ -4,7 +4,7 @@ SRC_URI = "http://farsight.freedesktop.org/releases/farsight2/${P}.tar.gz" DEPENDS = "libnice glib-2.0 libxml2 zlib dbus gstreamer gst-plugins-base" -inherit autotools_stage +inherit autotools AUTOTOOLS_STAGE_PKGCONFIG = "1" PR = "r1" diff --git a/meta/packages/farsight/libnice_0.0.6.bb b/meta/packages/farsight/libnice_0.0.6.bb index fa478dc0e3..809b691af7 100644 --- a/meta/packages/farsight/libnice_0.0.6.bb +++ b/meta/packages/farsight/libnice_0.0.6.bb @@ -5,7 +5,7 @@ SRC_URI = "http://nice.freedesktop.org/releases/libnice-${PV}.tar.gz" LICENSE = "LGPL/MPL" DEPENDS = "glib-2.0 gstreamer" -inherit autotools_stage +inherit autotools AUTOTOOLS_STAGE_PKGCONFIG = "1" FILES_${PN} += "${libdir}/gstreamer-0.10/*.so" diff --git a/meta/packages/file/file_4.18.bb b/meta/packages/file/file_4.18.bb index f5ed6e1300..1ff8425447 100644 --- a/meta/packages/file/file_4.18.bb +++ b/meta/packages/file/file_4.18.bb @@ -8,7 +8,7 @@ SRC_URI = "ftp://ftp.astron.com/pub/file/file-${PV}.tar.gz \ file://dump \ file://filesystems" -inherit autotools_stage +inherit autotools do_configure_prepend() { sed -i -e 's,$(top_builddir)/src/file,file,' ${S}/magic/Makefile.am diff --git a/meta/packages/flac/flac_1.1.2.bb b/meta/packages/flac/flac_1.1.2.bb index 3d0211f750..78f29fbca3 100644 --- a/meta/packages/flac/flac_1.1.2.bb +++ b/meta/packages/flac/flac_1.1.2.bb @@ -10,7 +10,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/flac/flac-${PV}.tar.gz \ S = "${WORKDIR}/flac-${PV}" -inherit autotools_stage +inherit autotools EXTRA_OECONF = "--disable-oggtest --disable-id3libtest \ --with-ogg-libraries=${STAGING_LIBDIR} \ diff --git a/meta/packages/flex/flex.inc b/meta/packages/flex/flex.inc index bb40db19b6..91c3aac4b9 100644 --- a/meta/packages/flex/flex.inc +++ b/meta/packages/flex/flex.inc @@ -7,5 +7,5 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/flex/flex-2.5.31.tar.bz2 \ file://flex-lvalue.diff;patch=1 \ file://fix-gen.patch;patch=1" -inherit autotools_stage +inherit autotools diff --git a/meta/packages/fontconfig/fontconfig_2.6.0.bb b/meta/packages/fontconfig/fontconfig_2.6.0.bb index d9697432ed..4c6df307f4 100644 --- a/meta/packages/fontconfig/fontconfig_2.6.0.bb +++ b/meta/packages/fontconfig/fontconfig_2.6.0.bb @@ -21,7 +21,7 @@ DEBIAN_NOAUTONAME_fontconfig-utils = "1" PARALLEL_MAKE = "" -inherit autotools_stage pkgconfig +inherit autotools pkgconfig export HASDOCBOOK="no" diff --git a/meta/packages/galago/libgalago_0.5.2.bb b/meta/packages/galago/libgalago_0.5.2.bb index ee485905db..fe82a618e6 100644 --- a/meta/packages/galago/libgalago_0.5.2.bb +++ b/meta/packages/galago/libgalago_0.5.2.bb @@ -8,6 +8,6 @@ SRC_URI = "http://www.galago-project.org/files/releases/source/${PN}/${P}.tar.gz file://pkgconfig.patch;patch=1 " PR = "r2" -inherit autotools_stage pkgconfig +inherit autotools pkgconfig EXTRA_OECONF = "--disable-tests --disable-check" diff --git a/meta/packages/gettext/gettext_0.17.bb b/meta/packages/gettext/gettext_0.17.bb index fe4d167ad9..c945891e26 100644 --- a/meta/packages/gettext/gettext_0.17.bb +++ b/meta/packages/gettext/gettext_0.17.bb @@ -20,7 +20,7 @@ SRC_URI_append_linux-uclibcgnueabi = " file://gettext-error_print_progname.patch PARALLEL_MAKE = "" -inherit autotools_stage +inherit autotools EXTRA_OECONF += "--without-lispdir \ --disable-csharp \ diff --git a/meta/packages/glib-2.0/glib.inc b/meta/packages/glib-2.0/glib.inc index 8107eb9104..f4167e8bf8 100644 --- a/meta/packages/glib-2.0/glib.inc +++ b/meta/packages/glib-2.0/glib.inc @@ -17,7 +17,7 @@ EXTRA_OECONF = "--enable-included-printf=no" S = "${WORKDIR}/glib-${PV}" -inherit autotools_stage pkgconfig gettext +inherit autotools pkgconfig gettext require glib-2.0.inc diff --git a/meta/packages/gmp/gmp.inc b/meta/packages/gmp/gmp.inc index 2f99c2f1fd..6023910308 100644 --- a/meta/packages/gmp/gmp.inc +++ b/meta/packages/gmp/gmp.inc @@ -7,7 +7,7 @@ SRC_URI = "ftp://ftp.gnu.org/gnu/gmp/gmp-${PV}.tar.bz2 \ file://configure.patch;patch=1 \ file://amd64.patch;patch=1" -inherit autotools_stage +inherit autotools ARM_INSTRUCTION_SET = "arm" diff --git a/meta/packages/gnome/gconf-dbus_svn.bb b/meta/packages/gnome/gconf-dbus_svn.bb index 61d46793b8..1910188278 100644 --- a/meta/packages/gnome/gconf-dbus_svn.bb +++ b/meta/packages/gnome/gconf-dbus_svn.bb @@ -10,7 +10,7 @@ PV = "2.16.0+svnr${SRCREV}" SRC_URI = "svn://developer.imendio.com/svn/gconf-dbus;module=trunk;proto=http" -inherit pkgconfig autotools_stage +inherit pkgconfig autotools S = "${WORKDIR}/trunk" PARALLEL_MAKE = "" diff --git a/meta/packages/gnome/gnome-keyring_2.26.1.bb b/meta/packages/gnome/gnome-keyring_2.26.1.bb index 54d8a2a707..cc111c9498 100644 --- a/meta/packages/gnome/gnome-keyring_2.26.1.bb +++ b/meta/packages/gnome/gnome-keyring_2.26.1.bb @@ -3,7 +3,7 @@ SECTION = "x11/gnome" PR = "r1" -inherit autotools_stage gnome pkgconfig +inherit autotools gnome pkgconfig DEPENDS = "gtk+ libgcrypt libtasn1 libtasn1-native" diff --git a/meta/packages/gnome/gnome-mime-data_2.18.0.bb b/meta/packages/gnome/gnome-mime-data_2.18.0.bb index 9c91ca3f1b..429004ad67 100644 --- a/meta/packages/gnome/gnome-mime-data_2.18.0.bb +++ b/meta/packages/gnome/gnome-mime-data_2.18.0.bb @@ -1,6 +1,6 @@ LICENSE = "GPL" inherit gnome -inherit autotools_stage +inherit autotools PR = "r2" SRC_URI += "file://pkgconfig.patch;patch=1" diff --git a/meta/packages/gnome/gobject-introspection_git.bb b/meta/packages/gnome/gobject-introspection_git.bb index 9c3201cbd5..fe6eea2855 100644 --- a/meta/packages/gnome/gobject-introspection_git.bb +++ b/meta/packages/gnome/gobject-introspection_git.bb @@ -13,7 +13,7 @@ S = "${WORKDIR}/git" DEPENDS = "libffi python-native gobject-introspection-native" DEPENDS_virtclass-native = "libffi-native python-native" -inherit autotools_stage +inherit autotools TARGET_CFLAGS += "-I${STAGING_INCDIR_NATIVE}/python2.5" diff --git a/meta/packages/gnome/libart-lgpl_2.3.19.bb b/meta/packages/gnome/libart-lgpl_2.3.19.bb index a1258c8d79..fa565f3d1c 100644 --- a/meta/packages/gnome/libart-lgpl_2.3.19.bb +++ b/meta/packages/gnome/libart-lgpl_2.3.19.bb @@ -10,7 +10,7 @@ SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/libart_lgpl/2.3/libart_lgpl-${ file://${ART_CONFIG} \ file://Makefile.am.patch;patch=1" -inherit autotools_stage pkgconfig +inherit autotools pkgconfig DEPENDS = "" diff --git a/meta/packages/gnutls/gnutls.inc b/meta/packages/gnutls/gnutls.inc index 5e9184ba32..474812598a 100644 --- a/meta/packages/gnutls/gnutls.inc +++ b/meta/packages/gnutls/gnutls.inc @@ -6,7 +6,7 @@ LICENSE = "LGPL" SRC_URI = "ftp://ftp.gnutls.org/pub/gnutls/gnutls-${PV}.tar.bz2" -inherit autotools_stage binconfig pkgconfig pkgconfig +inherit autotools binconfig pkgconfig pkgconfig EXTRA_OECONF="--with-included-opencdk --with-included-libtasn1 --with-included-libcfg --with-libz-prefix=${STAGING_DIR_HOST}${prefix} --with-lzo --disable-guile" diff --git a/meta/packages/gnutls/libtasn1_1.7.bb b/meta/packages/gnutls/libtasn1_1.7.bb index f8530f811a..90be5ade7b 100644 --- a/meta/packages/gnutls/libtasn1_1.7.bb +++ b/meta/packages/gnutls/libtasn1_1.7.bb @@ -5,7 +5,7 @@ PR = "r1" SRC_URI = "ftp://ftp.gnutls.org/pub/gnutls/libtasn1/libtasn1-${PV}.tar.gz" -inherit autotools_stage binconfig +inherit autotools binconfig AUTOTOOLS_STAGE_PKGCONFIG = "1" diff --git a/meta/packages/gperf/gperf_3.0.3.bb b/meta/packages/gperf/gperf_3.0.3.bb index ac8e46fece..f6ab39e32e 100644 --- a/meta/packages/gperf/gperf_3.0.3.bb +++ b/meta/packages/gperf/gperf_3.0.3.bb @@ -5,7 +5,7 @@ SUMMARY = "Generate a perfect hash function from a set of keywords" SRC_URI = "${GNU_MIRROR}/gperf/gperf-${PV}.tar.gz \ file://autoreconf.patch;patch=1" -inherit autotools_stage +inherit autotools PR = "r1" diff --git a/meta/packages/gpgme/gpgme_1.1.4.bb b/meta/packages/gpgme/gpgme_1.1.4.bb index 225662263c..3ea165e150 100644 --- a/meta/packages/gpgme/gpgme_1.1.4.bb +++ b/meta/packages/gpgme/gpgme_1.1.4.bb @@ -7,7 +7,7 @@ PR = "r4" EXTRA_OECONF = "--with-pth=${STAGING_DIR_HOST} --without-pth-test \ --with-gpg=${bindir}/gpg --without-gpgsm" -inherit autotools_stage binconfig +inherit autotools binconfig PACKAGES =+ "${PN}-pth ${PN}-pthread" FILES_${PN}-pth = "${libdir}/libgpgme-pth.so.*" diff --git a/meta/packages/gsm/gsmd.inc b/meta/packages/gsm/gsmd.inc index 6039d6133d..a69fdd90f1 100644 --- a/meta/packages/gsm/gsmd.inc +++ b/meta/packages/gsm/gsmd.inc @@ -13,7 +13,7 @@ SRC_URI = "svn://svn.openmoko.org/trunk/src/target;module=gsm;proto=http \ file://default" S = "${WORKDIR}/gsm" -inherit autotools_stage pkgconfig update-rc.d +inherit autotools pkgconfig update-rc.d # handle update-rc.d RDEPENDS manually, we don't need it on # anything but gsmd RDEPENDS_append = "" diff --git a/meta/packages/gstreamer/gst-plugins.inc b/meta/packages/gstreamer/gst-plugins.inc index 94cb9310d7..d5bd349e57 100644 --- a/meta/packages/gstreamer/gst-plugins.inc +++ b/meta/packages/gstreamer/gst-plugins.inc @@ -3,7 +3,7 @@ SECTION = "multimedia" PRIORITY = "optional" DEPENDS = "gstreamer" -inherit autotools_stage pkgconfig +inherit autotools pkgconfig SRC_URI = "http://gstreamer.freedesktop.org/src/${PN}/${PN}-${PV}.tar.bz2" diff --git a/meta/packages/gstreamer/gstreamer_0.10.22.bb b/meta/packages/gstreamer/gstreamer_0.10.22.bb index 6ac9aa59cb..9c05f2ea8e 100644 --- a/meta/packages/gstreamer/gstreamer_0.10.22.bb +++ b/meta/packages/gstreamer/gstreamer_0.10.22.bb @@ -7,7 +7,7 @@ HOMEPAGE = "http://www.gstreamer.net/" DEPENDS = "glib-2.0 gettext libxml2 bison-native flex-native" PR = "r1" -inherit autotools_stage pkgconfig +inherit autotools pkgconfig SRC_URI = "http://gstreamer.freedesktop.org/src/gstreamer/gstreamer-${PV}.tar.bz2 \ file://check_fix.patch;patch=1 \ diff --git a/meta/packages/gtkhtml2/gtkhtml2_svn.bb b/meta/packages/gtkhtml2/gtkhtml2_svn.bb index 235042b7c7..43e4d07b87 100644 --- a/meta/packages/gtkhtml2/gtkhtml2_svn.bb +++ b/meta/packages/gtkhtml2/gtkhtml2_svn.bb @@ -15,6 +15,6 @@ SRC_URI = "svn://anonymous@svn.gnome.org/svn/gtkhtml2/;module=trunk \ S = "${WORKDIR}/trunk" -inherit pkgconfig autotools_stage +inherit pkgconfig autotools EXTRA_OECONF = " --disable-accessibility" diff --git a/meta/packages/gupnp/gssdp_0.7.1.bb b/meta/packages/gupnp/gssdp_0.7.1.bb index 09e12e2c63..5b4c903c62 100644 --- a/meta/packages/gupnp/gssdp_0.7.1.bb +++ b/meta/packages/gupnp/gssdp_0.7.1.bb @@ -3,7 +3,7 @@ DEPENDS = "glib-2.0 libsoup-2.4 libglade" SRC_URI = "http://gupnp.org/sources/${PN}/${PN}-${PV}.tar.gz" -inherit autotools_stage pkgconfig +inherit autotools pkgconfig PACKAGES =+ "gssdp-tools" diff --git a/meta/packages/gupnp/gupnp-av_0.4.bb b/meta/packages/gupnp/gupnp-av_0.4.bb index 5f52525b42..57fad7b842 100644 --- a/meta/packages/gupnp/gupnp-av_0.4.bb +++ b/meta/packages/gupnp/gupnp-av_0.4.bb @@ -3,4 +3,4 @@ DEPENDS = "gupnp" SRC_URI = "http://gupnp.org/sources/${PN}/${PN}-${PV}.tar.gz" -inherit autotools_stage pkgconfig +inherit autotools pkgconfig diff --git a/meta/packages/gupnp/gupnp-av_0.5.2.bb b/meta/packages/gupnp/gupnp-av_0.5.2.bb index 5f52525b42..57fad7b842 100644 --- a/meta/packages/gupnp/gupnp-av_0.5.2.bb +++ b/meta/packages/gupnp/gupnp-av_0.5.2.bb @@ -3,4 +3,4 @@ DEPENDS = "gupnp" SRC_URI = "http://gupnp.org/sources/${PN}/${PN}-${PV}.tar.gz" -inherit autotools_stage pkgconfig +inherit autotools pkgconfig diff --git a/meta/packages/gupnp/gupnp_0.13.2.bb b/meta/packages/gupnp/gupnp_0.13.2.bb index a30b2ad639..2a12e5ce24 100644 --- a/meta/packages/gupnp/gupnp_0.13.2.bb +++ b/meta/packages/gupnp/gupnp_0.13.2.bb @@ -4,7 +4,7 @@ DEPENDS = "e2fsprogs gssdp libsoup-2.4 libxml2" SRC_URI = "http://gupnp.org/sources/${PN}/${PN}-${PV}.tar.gz" PR = "r1" -inherit autotools_stage pkgconfig +inherit autotools pkgconfig FILES_${PN} = "${libdir}/*.so.*" FILES_${PN}-dev += "${bindir}/gupnp-binding-tool" diff --git a/meta/packages/gypsy/gypsy.inc b/meta/packages/gypsy/gypsy.inc index 7947247d02..f0d90b290e 100644 --- a/meta/packages/gypsy/gypsy.inc +++ b/meta/packages/gypsy/gypsy.inc @@ -3,7 +3,7 @@ LICENSE = "GPL" SECTION = "x11" DEPENDS = "glib-2.0 dbus bluez4 dbus-glib" -inherit autotools_stage pkgconfig +inherit autotools pkgconfig EXTRA_OECONF += "--with-distro=debian" diff --git a/meta/packages/gypsy/gypsy_0.6.bb b/meta/packages/gypsy/gypsy_0.6.bb index 77f4a53c53..bd2fdaa0dd 100644 --- a/meta/packages/gypsy/gypsy_0.6.bb +++ b/meta/packages/gypsy/gypsy_0.6.bb @@ -5,6 +5,6 @@ DEPENDS = "glib-2.0 dbus bluez4 dbus-glib libxslt" SRC_URI = "http://gypsy.freedesktop.org/gypsy-releases/gypsy-${PV}.tar.gz" -inherit autotools_stage pkgconfig +inherit autotools pkgconfig FILES_${PN} += "/usr/share/dbus-1/services/" diff --git a/meta/packages/hal/hal.inc b/meta/packages/hal/hal.inc index 8c5389fe8f..4d72e94fa7 100644 --- a/meta/packages/hal/hal.inc +++ b/meta/packages/hal/hal.inc @@ -7,7 +7,7 @@ SRC_URI = "http://hal.freedesktop.org/releases/hal-${PV}.tar.gz" S = "${WORKDIR}/hal-${PV}" -inherit autotools_stage pkgconfig +inherit autotools pkgconfig DEPENDS = "virtual/kernel dbus-glib udev intltool intltool-native expat libusb gperf-native" RDEPENDS += "udev hal-info" diff --git a/meta/packages/hal/hal_git.bb b/meta/packages/hal/hal_git.bb index 60c545063e..21fde21fe9 100644 --- a/meta/packages/hal/hal_git.bb +++ b/meta/packages/hal/hal_git.bb @@ -16,7 +16,7 @@ PR = "r4" S = "${WORKDIR}/git" -inherit autotools_stage pkgconfig +inherit autotools pkgconfig EXTRA_OECONF = "--with-hwdata=${datadir}/hwdata \ --with-expat=${STAGING_DIR_HOST}${prefix} \ diff --git a/meta/packages/icu/icu-3.6.inc b/meta/packages/icu/icu-3.6.inc index df80c255c7..3a186150de 100644 --- a/meta/packages/icu/icu-3.6.inc +++ b/meta/packages/icu/icu-3.6.inc @@ -11,7 +11,7 @@ S = "${WORKDIR}/icu/source" PARALLEL_MAKE = "" FULL_OPTIMIZATION_arm = "-Os" -inherit autotools_stage pkgconfig binconfig +inherit autotools pkgconfig binconfig do_configure() { libtoolize --force diff --git a/meta/packages/intltool/intltool.inc b/meta/packages/intltool/intltool.inc index 1ca285d9a9..132c264b34 100644 --- a/meta/packages/intltool/intltool.inc +++ b/meta/packages/intltool/intltool.inc @@ -13,7 +13,7 @@ DEPENDS = "libxml-parser-perl-native" #RDEPENDS = "libxml-parser-perl" RRECOMMENDS = "perl-modules" -inherit autotools_stage pkgconfig +inherit autotools pkgconfig export PERL_virtclass-native = "/usr/bin/env perl" BBCLASSEXTEND = "native" diff --git a/meta/packages/iso-codes/iso-codes_3.3.bb b/meta/packages/iso-codes/iso-codes_3.3.bb index 50ea791926..23d025f4d2 100644 --- a/meta/packages/iso-codes/iso-codes_3.3.bb +++ b/meta/packages/iso-codes/iso-codes_3.3.bb @@ -7,7 +7,7 @@ PACKAGE_ARCH = "all" SRC_URI = "ftp://pkg-isocodes.alioth.debian.org/pub/pkg-isocodes/iso-codes-${PV}.tar.gz" -inherit autotools_stage +inherit autotools FILES_${PN}-dev="${datadir}/pkgconfig/iso-codes.pc" FILES_${PN}="${datadir}/xml/iso-codes/ \ diff --git a/meta/packages/lame/lame_3.96.1.bb b/meta/packages/lame/lame_3.96.1.bb index d610b5105e..ce691bc1bb 100644 --- a/meta/packages/lame/lame_3.96.1.bb +++ b/meta/packages/lame/lame_3.96.1.bb @@ -7,7 +7,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/lame/lame-${PV}.tar.gz \ file://no-gtk1.patch;patch=1 \ file://Makefile-lm.patch;patch=1" -inherit autotools_stage +inherit autotools PACKAGES += "libmp3lame libmp3lame-dev" FILES_${PN} = "${bindir}/lame" diff --git a/meta/packages/libassuan/libassuan_0.6.9.bb b/meta/packages/libassuan/libassuan_0.6.9.bb index 331339e0eb..37ab1564ca 100644 --- a/meta/packages/libassuan/libassuan_0.6.9.bb +++ b/meta/packages/libassuan/libassuan_0.6.9.bb @@ -2,4 +2,4 @@ LICENSE = "GPL" SRC_URI = "ftp://ftp.gnupg.org/gcrypt/alpha/libassuan/libassuan-${PV}.tar.gz" -inherit autotools_stage binconfig +inherit autotools binconfig diff --git a/meta/packages/libcroco/libcroco_0.6.1.bb b/meta/packages/libcroco/libcroco_0.6.1.bb index 6534fdab3e..b763e26b29 100644 --- a/meta/packages/libcroco/libcroco_0.6.1.bb +++ b/meta/packages/libcroco/libcroco_0.6.1.bb @@ -4,6 +4,6 @@ DEPENDS = "glib-2.0 libxml2 zlib" LICENSE = "LGPL" PR = "r3" -inherit autotools_stage pkgconfig gnome +inherit autotools pkgconfig gnome SRC_URI_append = " file://croco.patch;patch=1 " diff --git a/meta/packages/libdaemon/libdaemon_0.12.bb b/meta/packages/libdaemon/libdaemon_0.12.bb index aba011828b..76862a4dc5 100644 --- a/meta/packages/libdaemon/libdaemon_0.12.bb +++ b/meta/packages/libdaemon/libdaemon_0.12.bb @@ -7,6 +7,6 @@ PR = "r1" SRC_URI = "http://0pointer.de/lennart/projects/libdaemon/libdaemon-${PV}.tar.gz" -inherit autotools_stage pkgconfig +inherit autotools pkgconfig EXTRA_OECONF = "--disable-lynx --disable-doxygen" diff --git a/meta/packages/libetpan/libetpan_0.54.bb b/meta/packages/libetpan/libetpan_0.54.bb index 6a20560c07..5666ea0ded 100644 --- a/meta/packages/libetpan/libetpan_0.54.bb +++ b/meta/packages/libetpan/libetpan_0.54.bb @@ -9,7 +9,7 @@ PR = "r1" SRC_URI = "${SOURCEFORGE_MIRROR}/libetpan/libetpan-${PV}.tar.gz \ file://cxx-is-here.patch;patch=1" -inherit autotools_stage pkgconfig gettext binconfig +inherit autotools pkgconfig gettext binconfig EXTRA_OECONF = "--without-openssl --with-gnutls --disable-db" diff --git a/meta/packages/libexif/libexif_0.6.16.bb b/meta/packages/libexif/libexif_0.6.16.bb index f599271a2d..e3b5c331a8 100644 --- a/meta/packages/libexif/libexif_0.6.16.bb +++ b/meta/packages/libexif/libexif_0.6.16.bb @@ -6,7 +6,7 @@ DEPENDS = "gettext" SRC_URI = "${SOURCEFORGE_MIRROR}/libexif/libexif-${PV}.tar.bz2" -inherit autotools_stage +inherit autotools do_configure_append() { sed -i s:doc\ binary:binary:g Makefile diff --git a/meta/packages/libfakekey/libfakekey_svn.bb b/meta/packages/libfakekey/libfakekey_svn.bb index 5181cd70f4..479ef2cd37 100644 --- a/meta/packages/libfakekey/libfakekey_svn.bb +++ b/meta/packages/libfakekey/libfakekey_svn.bb @@ -9,4 +9,4 @@ SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=${PN};proto=http" S = "${WORKDIR}/${PN}" -inherit autotools_stage pkgconfig gettext +inherit autotools pkgconfig gettext diff --git a/meta/packages/libffi/libffi_3.0.8.bb b/meta/packages/libffi/libffi_3.0.8.bb index 64233f4815..06106279b0 100644 --- a/meta/packages/libffi/libffi_3.0.8.bb +++ b/meta/packages/libffi/libffi_3.0.8.bb @@ -1,5 +1,5 @@ SRC_URI = "ftp://sourceware.org/pub/libffi/libffi-3.0.8.tar.gz" -inherit autotools_stage +inherit autotools BBCLASSEXTEND = "native"
\ No newline at end of file diff --git a/meta/packages/libgcrypt/libgcrypt.inc b/meta/packages/libgcrypt/libgcrypt.inc index 52785a64d5..b950318b56 100644 --- a/meta/packages/libgcrypt/libgcrypt.inc +++ b/meta/packages/libgcrypt/libgcrypt.inc @@ -7,7 +7,7 @@ DEPENDS = "libgpg-error" SRC_URI = "ftp://ftp.gnupg.org/gcrypt/libgcrypt/libgcrypt-${PV}.tar.gz \ file://add-pkgconfig-support.patch;patch=1" -inherit autotools_stage binconfig pkgconfig pkgconfig_stage +inherit autotools binconfig pkgconfig pkgconfig_stage EXTRA_OECONF = "--without-pth --disable-asm --with-capabilities" diff --git a/meta/packages/libgdbus/libgdbus_git.bb b/meta/packages/libgdbus/libgdbus_git.bb index bba28dd327..f0101f9925 100644 --- a/meta/packages/libgdbus/libgdbus_git.bb +++ b/meta/packages/libgdbus/libgdbus_git.bb @@ -7,4 +7,4 @@ S = "${WORKDIR}/git" SRC_URI = "git://git.kernel.org/pub/scm/bluetooth/libgdbus.git;protocol=git" -inherit autotools_stage pkgconfig +inherit autotools pkgconfig diff --git a/meta/packages/libglade/libglade_2.6.2.bb b/meta/packages/libglade/libglade_2.6.2.bb index 2279b3b706..abb8e11504 100644 --- a/meta/packages/libglade/libglade_2.6.2.bb +++ b/meta/packages/libglade/libglade_2.6.2.bb @@ -4,7 +4,7 @@ SECTION = "libs" PRIORITY = "optional" DEPENDS = "gtk+ gtk-doc-native" -inherit autotools_stage pkgconfig gnome +inherit autotools pkgconfig gnome SRC_URI += "file://glade-cruft.patch;patch=1 file://no-xml2.patch;patch=1" diff --git a/meta/packages/libgpg-error/libgpg-error_1.6.bb b/meta/packages/libgpg-error/libgpg-error_1.6.bb index 9770dcd913..c34100e25d 100644 --- a/meta/packages/libgpg-error/libgpg-error_1.6.bb +++ b/meta/packages/libgpg-error/libgpg-error_1.6.bb @@ -11,4 +11,4 @@ SRC_URI = "ftp://ftp.gnupg.org/gcrypt/libgpg-error/libgpg-error-${PV}.tar.bz2 \ FILES_${PN} = "${libdir}/lib*.so.*" FILES_${PN}-dev += "${bindir}/*" -inherit autotools_stage binconfig pkgconfig +inherit autotools binconfig pkgconfig diff --git a/meta/packages/libgsf/libgsf_1.14.5.bb b/meta/packages/libgsf/libgsf_1.14.5.bb index ebb13bd9fd..10b6390722 100644 --- a/meta/packages/libgsf/libgsf_1.14.5.bb +++ b/meta/packages/libgsf/libgsf_1.14.5.bb @@ -11,7 +11,7 @@ PACKAGES =+ "${PN}-gnome ${PN}-gnome-dev " FILES_${PN}-gnome = "${libdir}/libgsf-gnome-1.so.*" FILES_${PN}-gnome-dev = "${libdir}/libgsf-gnome-1.* ${includedir}/libgsf-1/gsf-gnome" -inherit autotools_stage pkgconfig gnome gconf +inherit autotools pkgconfig gnome gconf EXTRA_OECONF = "\ --without-python \ diff --git a/meta/packages/libical/libical_0.44.bb b/meta/packages/libical/libical_0.44.bb index 7988ed713d..62e8e3f5b7 100644 --- a/meta/packages/libical/libical_0.44.bb +++ b/meta/packages/libical/libical_0.44.bb @@ -5,4 +5,4 @@ LICENSE = "LGPL / MPL" SRC_URI = "${SOURCEFORGE_MIRROR}/freeassociation/${P}.tar.gz" -inherit autotools_stage +inherit autotools diff --git a/meta/packages/libiconv/libiconv_1.9.2.bb b/meta/packages/libiconv/libiconv_1.9.2.bb index 6daaabac7a..d427dcef83 100644 --- a/meta/packages/libiconv/libiconv_1.9.2.bb +++ b/meta/packages/libiconv/libiconv_1.9.2.bb @@ -11,7 +11,7 @@ SRC_URI = "ftp://ftp.gnu.org/pub/gnu/libiconv/libiconv-${PV}.tar.gz" S = "${WORKDIR}/libiconv-${PV}" -inherit autotools_stage pkgconfig +inherit autotools pkgconfig EXTRA_OECONF += "--enable-shared --enable-static" diff --git a/meta/packages/libid3tag/libid3tag_0.15.1b.bb b/meta/packages/libid3tag/libid3tag_0.15.1b.bb index 3b5a87e03f..63258128d8 100644 --- a/meta/packages/libid3tag/libid3tag_0.15.1b.bb +++ b/meta/packages/libid3tag/libid3tag_0.15.1b.bb @@ -10,6 +10,6 @@ SRC_URI = "ftp://ftp.mars.org/pub/mpeg/libid3tag-${PV}.tar.gz \ S = "${WORKDIR}/libid3tag-${PV}" -inherit autotools_stage pkgconfig +inherit autotools pkgconfig EXTRA_OECONF = "-enable-speed" diff --git a/meta/packages/libidl/libidl_0.8.12.bb b/meta/packages/libidl/libidl_0.8.12.bb index bb0011d6bc..9cc9ea2ed8 100644 --- a/meta/packages/libidl/libidl_0.8.12.bb +++ b/meta/packages/libidl/libidl_0.8.12.bb @@ -8,7 +8,7 @@ SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/libIDL/0.8/libIDL-${PV}.tar.bz S = "${WORKDIR}/libIDL-${PV}" BINCONFIG_GLOB = "*-config-2" -inherit autotools_stage pkgconfig binconfig +inherit autotools pkgconfig binconfig FILES_${PN} = "${libdir}/*.so.*" FILES_${PN}-dev += " ${bindir}" diff --git a/meta/packages/libmad/libmad_0.15.1b.bb b/meta/packages/libmad/libmad_0.15.1b.bb index 6a582e6dfe..2a5d69d1d1 100644 --- a/meta/packages/libmad/libmad_0.15.1b.bb +++ b/meta/packages/libmad/libmad_0.15.1b.bb @@ -11,7 +11,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/mad/libmad-${PV}.tar.gz \ S = "${WORKDIR}/libmad-${PV}" -inherit autotools_stage pkgconfig +inherit autotools pkgconfig EXTRA_OECONF = "-enable-speed --enable-shared" # The ASO's don't take any account of thumb... diff --git a/meta/packages/libmatchbox/libmatchbox.inc b/meta/packages/libmatchbox/libmatchbox.inc index da86970ca6..357f5edd14 100644 --- a/meta/packages/libmatchbox/libmatchbox.inc +++ b/meta/packages/libmatchbox/libmatchbox.inc @@ -3,7 +3,7 @@ DESCRIPTION = "Matchbox window manager core library" LICENSE = "GPL" DEPENDS = "virtual/libx11 libxext expat libxft jpeg libpng zlib libxsettings-client startup-notification" -inherit autotools_stage pkgconfig +inherit autotools pkgconfig EXTRA_OECONF = "--enable-jpeg --enable-expat --enable-xsettings --enable-startup-notification" diff --git a/meta/packages/libnl/libnl_1.1.bb b/meta/packages/libnl/libnl_1.1.bb index 05c0e32bb2..51b12c6ab4 100644 --- a/meta/packages/libnl/libnl_1.1.bb +++ b/meta/packages/libnl/libnl_1.1.bb @@ -4,7 +4,7 @@ LICENSE = "LGPL" HOMEPAGE = "http://people.suug.ch/~tgr/libnl/" PRIORITY = "optional" -inherit autotools_stage pkgconfig +inherit autotools pkgconfig PR = "r1" diff --git a/meta/packages/libogg/libogg_1.1.bb b/meta/packages/libogg/libogg_1.1.bb index 78927726d0..7108876e9f 100644 --- a/meta/packages/libogg/libogg_1.1.bb +++ b/meta/packages/libogg/libogg_1.1.bb @@ -8,4 +8,4 @@ PR = "r4" SRC_URI = "http://www.vorbis.com/files/1.0.1/unix/libogg-${PV}.tar.gz \ file://m4.patch;patch=1" -inherit autotools_stage pkgconfig +inherit autotools pkgconfig diff --git a/meta/packages/liboil/liboil_0.3.17.bb b/meta/packages/liboil/liboil_0.3.17.bb index b1c33a08c6..84f0f41677 100644 --- a/meta/packages/liboil/liboil_0.3.17.bb +++ b/meta/packages/liboil/liboil_0.3.17.bb @@ -7,6 +7,6 @@ PR = "r2" SRC_URI = "http://liboil.freedesktop.org/download/${P}.tar.gz \ file://no-tests.patch;patch=1" -inherit autotools_stage pkgconfig +inherit autotools pkgconfig ARM_INSTRUCTION_SET = "arm" diff --git a/meta/packages/libowl/libowl_svn.bb b/meta/packages/libowl/libowl_svn.bb index f3e8f836a4..38d15a8df1 100644 --- a/meta/packages/libowl/libowl_svn.bb +++ b/meta/packages/libowl/libowl_svn.bb @@ -10,4 +10,4 @@ SRC_URI = "svn://svn.o-hand.com/repos/misc/trunk;module=${PN};proto=http" S = "${WORKDIR}/${PN}" -inherit autotools_stage pkgconfig +inherit autotools pkgconfig diff --git a/meta/packages/libproxy/libproxy_0.2.3.bb b/meta/packages/libproxy/libproxy_0.2.3.bb index 34172f263d..f6a6198a90 100644 --- a/meta/packages/libproxy/libproxy_0.2.3.bb +++ b/meta/packages/libproxy/libproxy_0.2.3.bb @@ -9,7 +9,7 @@ SRC_URI = "http://libproxy.googlecode.com/files/libproxy-${PV}.tar.gz \ file://asneededfix.patch;patch=1" S = "${WORKDIR}/libproxy-${PV}" -inherit autotools_stage pkgconfig +inherit autotools pkgconfig EXTRA_OECONF = "--without-kde --with-gnome --without-webkit --without-python --without-mozjs --without-networkmanager" diff --git a/meta/packages/librds/librds_0.0.1.bb b/meta/packages/librds/librds_0.0.1.bb index b5e2c60d20..3c99ec1ba0 100644 --- a/meta/packages/librds/librds_0.0.1.bb +++ b/meta/packages/librds/librds_0.0.1.bb @@ -8,4 +8,4 @@ PR = "r1" SRC_URI = "http://download.berlios.de/rdsd/librds-${PV}.tar.gz" -inherit autotools_stage pkgconfig +inherit autotools pkgconfig diff --git a/meta/packages/librsvg/librsvg_2.18.2.bb b/meta/packages/librsvg/librsvg_2.18.2.bb index 5e68648c12..fb68c8ba70 100644 --- a/meta/packages/librsvg/librsvg_2.18.2.bb +++ b/meta/packages/librsvg/librsvg_2.18.2.bb @@ -6,7 +6,7 @@ PR = "r3" EXTRA_OECONF = "--disable-mozilla-plugin --without-svgz --without-croco --disable-gnome-vfs" -inherit autotools_stage pkgconfig gnome +inherit autotools pkgconfig gnome PACKAGES =+ "librsvg-gtk librsvg-gtk-dbg librsvg-gtk-dev rsvg" FILES_${PN} = "${libdir}/*.so.*" diff --git a/meta/packages/librsvg/librsvg_2.22.3.bb b/meta/packages/librsvg/librsvg_2.22.3.bb index 5e68648c12..fb68c8ba70 100644 --- a/meta/packages/librsvg/librsvg_2.22.3.bb +++ b/meta/packages/librsvg/librsvg_2.22.3.bb @@ -6,7 +6,7 @@ PR = "r3" EXTRA_OECONF = "--disable-mozilla-plugin --without-svgz --without-croco --disable-gnome-vfs" -inherit autotools_stage pkgconfig gnome +inherit autotools pkgconfig gnome PACKAGES =+ "librsvg-gtk librsvg-gtk-dbg librsvg-gtk-dev rsvg" FILES_${PN} = "${libdir}/*.so.*" diff --git a/meta/packages/librsvg/librsvg_svn.bb b/meta/packages/librsvg/librsvg_svn.bb index 580196c2a7..a49e7faa26 100644 --- a/meta/packages/librsvg/librsvg_svn.bb +++ b/meta/packages/librsvg/librsvg_svn.bb @@ -6,7 +6,7 @@ PR = "r3" EXTRA_OECONF = "--disable-mozilla-plugin --without-svgz --without-croco --disable-gnome-vfs" -inherit autotools_stage pkgconfig gnome +inherit autotools pkgconfig gnome SRC_URI = "svn://svn.gnome.org/svn/${PN};module=trunk" PV = "2.22.3+svnr${SRCREV}" diff --git a/meta/packages/libsdl/libsdl-nativesdk_1.2.11.bb b/meta/packages/libsdl/libsdl-nativesdk_1.2.11.bb index 1bc5f64f0f..633a4c284b 100644 --- a/meta/packages/libsdl/libsdl-nativesdk_1.2.11.bb +++ b/meta/packages/libsdl/libsdl-nativesdk_1.2.11.bb @@ -12,7 +12,7 @@ SRC_URI = "http://www.libsdl.org/release/SDL-${PV}.tar.gz \ file://kernel-asm-page.patch;patch=1 " S = "${WORKDIR}/SDL-${PV}" -inherit autotools_stage binconfig pkgconfig nativesdk +inherit autotools binconfig pkgconfig nativesdk EXTRA_OECONF = "--disable-static --disable-debug --disable-cdrom --enable-threads --enable-timers --enable-endian \ --enable-file --disable-oss --disable-alsa --disable-esd --disable-arts \ diff --git a/meta/packages/libsoup/libsoup-2.4_2.25.91.bb b/meta/packages/libsoup/libsoup-2.4_2.25.91.bb index e4494cf458..5229e28f26 100644 --- a/meta/packages/libsoup/libsoup-2.4_2.25.91.bb +++ b/meta/packages/libsoup/libsoup-2.4_2.25.91.bb @@ -7,7 +7,7 @@ DEPENDS = "glib-2.0 gnutls libxml2 libproxy sqlite3" SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/libsoup/2.25/libsoup-${PV}.tar.bz2" S = "${WORKDIR}/libsoup-${PV}" -inherit autotools_stage pkgconfig +inherit autotools pkgconfig do_stage() { autotools_stage_all diff --git a/meta/packages/libsoup/libsoup-2.4_2.4.1.bb b/meta/packages/libsoup/libsoup-2.4_2.4.1.bb index 36c5250c40..303f667dcf 100644 --- a/meta/packages/libsoup/libsoup-2.4_2.4.1.bb +++ b/meta/packages/libsoup/libsoup-2.4_2.4.1.bb @@ -7,7 +7,7 @@ DEPENDS = "glib-2.0 gnutls libxml2" SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/libsoup/2.4/libsoup-${PV}.tar.bz2" S = "${WORKDIR}/libsoup-${PV}" -inherit autotools_stage pkgconfig +inherit autotools pkgconfig do_stage() { autotools_stage_all diff --git a/meta/packages/libsoup/libsoup_2.2.100.bb b/meta/packages/libsoup/libsoup_2.2.100.bb index 7ea15ec9b5..94efb7f676 100644 --- a/meta/packages/libsoup/libsoup_2.2.100.bb +++ b/meta/packages/libsoup/libsoup_2.2.100.bb @@ -7,7 +7,7 @@ DEPENDS = "glib-2.0 gnutls libxml2" SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/${PN}/2.2/${PN}-${PV}.tar.bz2" -inherit autotools_stage pkgconfig +inherit autotools pkgconfig FILES_${PN} = "${libdir}/lib*.so.*" FILES_${PN}-dev = "${includedir}/ ${libdir}/" diff --git a/meta/packages/libtiff/tiff_3.8.2.bb b/meta/packages/libtiff/tiff_3.8.2.bb index 589a59df95..4e3c82baa9 100644 --- a/meta/packages/libtiff/tiff_3.8.2.bb +++ b/meta/packages/libtiff/tiff_3.8.2.bb @@ -7,7 +7,7 @@ PR = "r2" SRC_URI = "ftp://ftp.remotesensing.org/pub/libtiff/tiff-${PV}.tar.gz \ file://libtool2.patch;patch=1" -inherit autotools_stage +inherit autotools PACKAGES =+ "tiffxx tiffxx-dbg tiffxx-dev tiff-utils tiff-utils-dbg" FILES_tiffxx = "${libdir}/libtiffxx.so.*" diff --git a/meta/packages/libtool/libtool_2.2.6.bb b/meta/packages/libtool/libtool_2.2.6.bb index fe2dcb4f0e..00e5cf8e29 100644 --- a/meta/packages/libtool/libtool_2.2.6.bb +++ b/meta/packages/libtool/libtool_2.2.6.bb @@ -12,7 +12,7 @@ FILES_libltdl = "${libdir}/libltdl.so.*" FILES_libltdl-dev = "${libdir}/libltdl.* ${includedir}/ltdl.h" FILES_libltdl-dbg = "${libdir}/.debug/" -inherit autotools_stage +inherit autotools EXTRA_AUTORECONF = "--exclude=libtoolize" diff --git a/meta/packages/libusb/libusb-compat_0.0.9+0.1.0-beta2.bb b/meta/packages/libusb/libusb-compat_0.0.9+0.1.0-beta2.bb index cf6d01279b..6564d6c6ad 100644 --- a/meta/packages/libusb/libusb-compat_0.0.9+0.1.0-beta2.bb +++ b/meta/packages/libusb/libusb-compat_0.0.9+0.1.0-beta2.bb @@ -15,7 +15,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/libusb/libusb-compat-0.1.0-beta2.tar.bz2 \ S = "${WORKDIR}/libusb-compat-0.1.0-beta2" -inherit autotools_stage pkgconfig binconfig lib_package +inherit autotools pkgconfig binconfig lib_package PARALLEL_MAKE = "" EXTRA_OECONF = "--disable-build-docs" diff --git a/meta/packages/libusb/libusb1_0.9.2.bb b/meta/packages/libusb/libusb1_0.9.2.bb index 96daedf24f..5f51de6e67 100644 --- a/meta/packages/libusb/libusb1_0.9.2.bb +++ b/meta/packages/libusb/libusb1_0.9.2.bb @@ -12,7 +12,7 @@ SRC_URI = "\ " S = "${WORKDIR}/libusb-${PV}" -inherit autotools_stage pkgconfig binconfig lib_package +inherit autotools pkgconfig binconfig lib_package PARALLEL_MAKE = "" EXTRA_OECONF = "--disable-build-docs" diff --git a/meta/packages/libusb/libusb_0.1.12.bb b/meta/packages/libusb/libusb_0.1.12.bb index 8d34a625b8..a1ee238025 100644 --- a/meta/packages/libusb/libusb_0.1.12.bb +++ b/meta/packages/libusb/libusb_0.1.12.bb @@ -8,7 +8,7 @@ PR = "r5" SRC_URI = "${SOURCEFORGE_MIRROR}/libusb/libusb-${PV}.tar.gz \ file://configure_fix.patch;patch=1" -inherit autotools_stage pkgconfig binconfig lib_package +inherit autotools pkgconfig binconfig lib_package PARALLEL_MAKE = "" EXTRA_OECONF = "--disable-build-docs" diff --git a/meta/packages/libvorbis/libvorbis_1.0.1.bb b/meta/packages/libvorbis/libvorbis_1.0.1.bb index 4dfd389831..8221712695 100644 --- a/meta/packages/libvorbis/libvorbis_1.0.1.bb +++ b/meta/packages/libvorbis/libvorbis_1.0.1.bb @@ -9,7 +9,7 @@ PR = "r5" SRC_URI = "http://www.vorbis.com/files/${PV}/unix/libvorbis-${PV}.tar.gz \ file://m4.patch;patch=1" -inherit autotools_stage pkgconfig +inherit autotools pkgconfig # vorbisfile.c reveals a problem in the gcc register spilling for the # thumb instruction set... diff --git a/meta/packages/libxklavier/libxklavier_3.9.bb b/meta/packages/libxklavier/libxklavier_3.9.bb index 54d10d6e8d..1d9b6f21a4 100644 --- a/meta/packages/libxklavier/libxklavier_3.9.bb +++ b/meta/packages/libxklavier/libxklavier_3.9.bb @@ -8,5 +8,5 @@ PR = "r2" SRC_URI = "${SOURCEFORGE_MIRROR}/gswitchit/libxklavier-${PV}.tar.bz2 \ file://pkgconfigfix.patch;patch=1" -inherit autotools_stage +inherit autotools diff --git a/meta/packages/libxsettings-client/libxsettings-client_0.10.bb b/meta/packages/libxsettings-client/libxsettings-client_0.10.bb index 89376f3b1a..eba2df18ba 100644 --- a/meta/packages/libxsettings-client/libxsettings-client_0.10.bb +++ b/meta/packages/libxsettings-client/libxsettings-client_0.10.bb @@ -13,4 +13,4 @@ SRC_URI = "http://projects.o-hand.com/matchbox/sources/optional-dependencies/Xse S = "${WORKDIR}/Xsettings-client-0.10" -inherit autotools_stage gettext +inherit autotools gettext diff --git a/meta/packages/libxslt/libxslt_1.1.22.bb b/meta/packages/libxslt/libxslt_1.1.22.bb index 49a1b6b018..6f368a51c1 100644 --- a/meta/packages/libxslt/libxslt_1.1.22.bb +++ b/meta/packages/libxslt/libxslt_1.1.22.bb @@ -10,7 +10,7 @@ SRC_URI = "ftp://xmlsoft.org/libxml2/libxslt-${PV}.tar.gz \ file://doublefix.patch;patch=1" S = "${WORKDIR}/libxslt-${PV}" -inherit autotools_stage pkgconfig +inherit autotools pkgconfig EXTRA_OECONF = "--without-python --without-debug --without-mem-debug --without-crypto" diff --git a/meta/packages/loudmouth/loudmouth_1.4.0.bb b/meta/packages/loudmouth/loudmouth_1.4.0.bb index dd209333ba..f9d84f9105 100644 --- a/meta/packages/loudmouth/loudmouth_1.4.0.bb +++ b/meta/packages/loudmouth/loudmouth_1.4.0.bb @@ -6,4 +6,4 @@ PR = "r2" SRC_URI = "http://ftp.imendio.com/pub/imendio/${PN}/src/${PN}-${PV}.tar.bz2" -inherit autotools_stage pkgconfig +inherit autotools pkgconfig diff --git a/meta/packages/lzo/lzo_2.02.bb b/meta/packages/lzo/lzo_2.02.bb index ac9e030d29..554ce6346e 100644 --- a/meta/packages/lzo/lzo_2.02.bb +++ b/meta/packages/lzo/lzo_2.02.bb @@ -9,7 +9,7 @@ SRC_URI = "http://www.oberhumer.com/opensource/lzo/download/lzo-${PV}.tar.gz \ file://autofoo.patch;patch=1 \ file://acinclude.m4" -inherit autotools_stage +inherit autotools EXTRA_OECONF = "--enable-shared" diff --git a/meta/packages/m4/m4_1.4.13.bb b/meta/packages/m4/m4_1.4.13.bb index 8bf64cf7d4..c22735e6f3 100644 --- a/meta/packages/m4/m4_1.4.13.bb +++ b/meta/packages/m4/m4_1.4.13.bb @@ -6,7 +6,7 @@ PR = "r2" PR = "r1" -inherit autotools_stage +inherit autotools EXTRA_OEMAKE += "'infodir=${infodir}'" diff --git a/meta/packages/maemo/xpext_1.0-5.bb b/meta/packages/maemo/xpext_1.0-5.bb index dff9a57670..5be3d1c041 100644 --- a/meta/packages/maemo/xpext_1.0-5.bb +++ b/meta/packages/maemo/xpext_1.0-5.bb @@ -13,7 +13,7 @@ S = "${WORKDIR}/xpext-1.0" RDEPENDS_${PN}-dev = "" RRECOMMENDS_${PN}-dbg = "${PN}-dev (= ${EXTENDPV})" -inherit autotools_stage pkgconfig +inherit autotools pkgconfig do_configure_prepend () { cd ${S} diff --git a/meta/packages/maemo/xsp_1.0.0-8.bb b/meta/packages/maemo/xsp_1.0.0-8.bb index 1e10edda14..c722213c86 100644 --- a/meta/packages/maemo/xsp_1.0.0-8.bb +++ b/meta/packages/maemo/xsp_1.0.0-8.bb @@ -9,4 +9,4 @@ PR = "r1" SRC_URI = "http://repository.maemo.org/pool/maemo/ossw/source/x/xsp/${PN}_${PV}.tar.gz" S = "${WORKDIR}/Xsp" -inherit autotools_stage pkgconfig +inherit autotools pkgconfig diff --git a/meta/packages/matchbox-panel-2/matchbox-panel-2_svn.bb b/meta/packages/matchbox-panel-2/matchbox-panel-2_svn.bb index 0d3b749e1d..b35f79875e 100644 --- a/meta/packages/matchbox-panel-2/matchbox-panel-2_svn.bb +++ b/meta/packages/matchbox-panel-2/matchbox-panel-2_svn.bb @@ -24,4 +24,4 @@ FILES_${PN} += "${libdir}/matchbox-panel/*.so \ ${datadir}/matchbox-panel/startup/*.png " FILES_${PN}-dbg += "${libdir}/matchbox-panel/.debug" -inherit autotools_stage pkgconfig +inherit autotools pkgconfig diff --git a/meta/packages/matchbox-wm-2/matchbox-wm-2_svn.bb b/meta/packages/matchbox-wm-2/matchbox-wm-2_svn.bb index 4491c937cf..f67e06083e 100644 --- a/meta/packages/matchbox-wm-2/matchbox-wm-2_svn.bb +++ b/meta/packages/matchbox-wm-2/matchbox-wm-2_svn.bb @@ -11,7 +11,7 @@ SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=matchbox-window-mana S = "${WORKDIR}/matchbox-window-manager-2" -inherit autotools_stage pkgconfig update-alternatives +inherit autotools pkgconfig update-alternatives # Change this to x-session-manager->matchbox-session and put in # matchbox-session, then change this to x-window-manager to diff --git a/meta/packages/mesa/mesa-common.inc b/meta/packages/mesa/mesa-common.inc index 28fde0d1ee..26ea671ed5 100644 --- a/meta/packages/mesa/mesa-common.inc +++ b/meta/packages/mesa/mesa-common.inc @@ -10,7 +10,7 @@ S = "${WORKDIR}/Mesa-${PV}" PROVIDES = "virtual/libgl" -inherit autotools_stage pkgconfig +inherit autotools pkgconfig EXTRA_OECONF = "--disable-glu \ --disable-glw \ diff --git a/meta/packages/mozilla-headless/mozilla-headless-services_git.bb b/meta/packages/mozilla-headless/mozilla-headless-services_git.bb index 1ba0167edc..14d64fa8c3 100644 --- a/meta/packages/mozilla-headless/mozilla-headless-services_git.bb +++ b/meta/packages/mozilla-headless/mozilla-headless-services_git.bb @@ -11,4 +11,4 @@ S = "${WORKDIR}/git" FILES_${PN} += "${datadir}/dbus-1/services" -inherit autotools_stage +inherit autotools diff --git a/meta/packages/mozilla-headless/mozilla-headless_hg.bb b/meta/packages/mozilla-headless/mozilla-headless_hg.bb index e3280e63ba..669c526163 100644 --- a/meta/packages/mozilla-headless/mozilla-headless_hg.bb +++ b/meta/packages/mozilla-headless/mozilla-headless_hg.bb @@ -37,7 +37,7 @@ TARGET_LDFLAGS = "-Wl,-rpath,${libdir}/xulrunner-${XULVERSION}" export target_alias=${TARGET_PREFIX} -inherit autotools_stage mozilla +inherit autotools mozilla acpaths = "-I ${S}/build/autoconf " diff --git a/meta/packages/mpeg2dec/mpeg2dec_0.4.0b.bb b/meta/packages/mpeg2dec/mpeg2dec_0.4.0b.bb index 3bda0ac45f..a97b92926e 100644 --- a/meta/packages/mpeg2dec/mpeg2dec_0.4.0b.bb +++ b/meta/packages/mpeg2dec/mpeg2dec_0.4.0b.bb @@ -10,7 +10,7 @@ DEPENDS = "virtual/libx11" SRC_URI = "http://libmpeg2.sourceforge.net/files/mpeg2dec-${PV}.tar.gz" S = "${WORKDIR}/mpeg2dec-0.4.0" -inherit autotools_stage pkgconfig +inherit autotools pkgconfig EXTRA_OECONF = "--enable-shared --disable-sdl --with-x" diff --git a/meta/packages/mpfr/mpfr.inc b/meta/packages/mpfr/mpfr.inc index 938fd1c730..cf898b62b6 100644 --- a/meta/packages/mpfr/mpfr.inc +++ b/meta/packages/mpfr/mpfr.inc @@ -3,4 +3,4 @@ HOMEPAGE = "http://www.mpfr.org/" LICENSE = "LGPL" SECTION = "libs" -inherit autotools_stage +inherit autotools diff --git a/meta/packages/musicbrainz/libmusicbrainz_2.1.3.bb b/meta/packages/musicbrainz/libmusicbrainz_2.1.3.bb index 66f85f7b38..372dfe4ac7 100644 --- a/meta/packages/musicbrainz/libmusicbrainz_2.1.3.bb +++ b/meta/packages/musicbrainz/libmusicbrainz_2.1.3.bb @@ -8,7 +8,7 @@ SRC_URI = "http://ftp.musicbrainz.org/pub/musicbrainz/libmusicbrainz-2.1.3.tar.g file://gcc43_fix.patch;patch=1 \ file://autofoo.patch;patch=1" -inherit autotools_stage pkgconfig +inherit autotools pkgconfig diff --git a/meta/packages/neon/neon_0.28.1.bb b/meta/packages/neon/neon_0.28.1.bb index 997c73b46a..3b2472a786 100644 --- a/meta/packages/neon/neon_0.28.1.bb +++ b/meta/packages/neon/neon_0.28.1.bb @@ -6,6 +6,6 @@ DEPENDS = "zlib libxml2 expat time gnutls" SRC_URI = "http://www.webdav.org/${PN}/${P}.tar.gz \ file://pkgconfig.patch;patch=1" -inherit autotools_stage binconfig lib_package pkgconfig +inherit autotools binconfig lib_package pkgconfig EXTRA_OECONF = "--with-ssl=gnutls --with-libxml2 --with-expat --enable-shared" diff --git a/meta/packages/networkmanager/networkmanager_svn.bb b/meta/packages/networkmanager/networkmanager_svn.bb index efa0bef556..7a41676613 100644 --- a/meta/packages/networkmanager/networkmanager_svn.bb +++ b/meta/packages/networkmanager/networkmanager_svn.bb @@ -24,7 +24,7 @@ EXTRA_OECONF = " \ S = "${WORKDIR}/trunk" -inherit autotools_stage pkgconfig update-rc.d +inherit autotools pkgconfig update-rc.d INITSCRIPT_NAME = "NetworkManager" INITSCRIPT_PARAMS = "defaults 22" diff --git a/meta/packages/ofono/ofono.inc b/meta/packages/ofono/ofono.inc index d1c2628a1e..8948e57ae7 100644 --- a/meta/packages/ofono/ofono.inc +++ b/meta/packages/ofono/ofono.inc @@ -2,7 +2,7 @@ HOMEPAGE = "http://www.ofono.org" SUMMARY = "open source telephony" LICENSE = "GPL" -inherit autotools_stage pkgconfig update-rc.d +inherit autotools pkgconfig update-rc.d DEPENDS = "dbus glib-2.0" diff --git a/meta/packages/openobex/openobex_1.5.bb b/meta/packages/openobex/openobex_1.5.bb index 8fc7e6dc7d..dc07ae1353 100644 --- a/meta/packages/openobex/openobex_1.5.bb +++ b/meta/packages/openobex/openobex_1.5.bb @@ -11,7 +11,7 @@ SRC_URI = "${KERNELORG_MIRROR}/pub/linux/bluetooth/openobex-${PV}.tar.gz \ file://disable-cable-test.patch;patch=1 \ file://libusb_crosscompile_check.patch;patch=1" -inherit autotools_stage binconfig pkgconfig +inherit autotools binconfig pkgconfig EXTRA_OECONF = "--enable-apps --enable-syslog --enable-dump \ --with-usb=${STAGING_LIBDIR}/.. --with-bluez=${STAGING_LIBDIR}/.." diff --git a/meta/packages/opkg-utils/opkg-utils_svn.bb b/meta/packages/opkg-utils/opkg-utils_svn.bb index b06ea6a68e..59f911bc7d 100644 --- a/meta/packages/opkg-utils/opkg-utils_svn.bb +++ b/meta/packages/opkg-utils/opkg-utils_svn.bb @@ -9,7 +9,7 @@ PR = "r6" SRC_URI = "svn://svn.openmoko.org/trunk/src/host/;module=opkg-utils;proto=http \ file://index-ignore-filenotfound.patch;patch=1" -inherit autotools_stage +inherit autotools S = "${WORKDIR}/opkg-utils" diff --git a/meta/packages/opkg/opkg.inc b/meta/packages/opkg/opkg.inc index a1def9a5ab..84ce74c936 100644 --- a/meta/packages/opkg/opkg.inc +++ b/meta/packages/opkg/opkg.inc @@ -24,7 +24,7 @@ do_configure_prepend() { sed -i -e s:-Werror::g ${S}/libopkg/Makefile.am } -inherit autotools_stage pkgconfig +inherit autotools pkgconfig target_libdir := "${libdir}" EXTRA_OECONF_virtclass-native = "--with-opkglibdir=${target_libdir} --disable-gpg --disable-curl --disable-openssl" diff --git a/meta/packages/owl-video-widget/libowl-av_svn.bb b/meta/packages/owl-video-widget/libowl-av_svn.bb index fe3cb68e7b..f0d2f1fa99 100644 --- a/meta/packages/owl-video-widget/libowl-av_svn.bb +++ b/meta/packages/owl-video-widget/libowl-av_svn.bb @@ -12,4 +12,4 @@ S = "${WORKDIR}/${PN}" SRC_URI = "svn://svn.o-hand.com/repos/misc/trunk;module=${PN};proto=http" -inherit autotools_stage pkgconfig +inherit autotools pkgconfig diff --git a/meta/packages/parted/parted_1.9.0.bb b/meta/packages/parted/parted_1.9.0.bb index cd9c09f593..f2a265187f 100644 --- a/meta/packages/parted/parted_1.9.0.bb +++ b/meta/packages/parted/parted_1.9.0.bb @@ -11,6 +11,6 @@ SRC_URI = "${GNU_MIRROR}/parted/parted-${PV}.tar.gz \ EXTRA_OECONF = "--disable-Werror --disable-device-mapper" -inherit autotools_stage pkgconfig gettext +inherit autotools pkgconfig gettext BBCLASSEXTEND = "native" diff --git a/meta/packages/pimlico/contacts.inc b/meta/packages/pimlico/contacts.inc index 679e70a8fd..1e960f241a 100644 --- a/meta/packages/pimlico/contacts.inc +++ b/meta/packages/pimlico/contacts.inc @@ -5,7 +5,7 @@ DEPENDS = "glib-2.0 gtk+ eds-dbus" DEPENDS_append_poky = " libowl" RDEPENDS = "libedata-book" -inherit autotools_stage pkgconfig +inherit autotools pkgconfig OWL = "--disable-owl" OWL_poky = "--enable-owl" diff --git a/meta/packages/pimlico/dates.inc b/meta/packages/pimlico/dates.inc index a6590da679..b2ab0efb5c 100644 --- a/meta/packages/pimlico/dates.inc +++ b/meta/packages/pimlico/dates.inc @@ -4,7 +4,7 @@ SECTION = "x11" DEPENDS = "glib-2.0 gtk+ libglade eds-dbus" RDEPENDS = "libedata-cal" -inherit autotools_stage pkgconfig gtk-icon-cache +inherit autotools pkgconfig gtk-icon-cache # Poky/Sato specific enhancements OWL = "--disable-owl" diff --git a/meta/packages/pimlico/tasks.inc b/meta/packages/pimlico/tasks.inc index 0ff45240aa..c6e4a25f52 100644 --- a/meta/packages/pimlico/tasks.inc +++ b/meta/packages/pimlico/tasks.inc @@ -4,7 +4,7 @@ SECTION = "x11" DEPENDS = "glib-2.0 gtk+ eds-dbus" DEPENDS_append_poky = " libowl" -inherit autotools_stage pkgconfig gtk-icon-cache +inherit autotools pkgconfig gtk-icon-cache OWL ?= "--disable-owl" OWL_poky ?= "--enable-owl" diff --git a/meta/packages/polkit/polkit-gnome_0.96.bb b/meta/packages/polkit/polkit-gnome_0.96.bb index b10847aa51..e103e631c8 100644 --- a/meta/packages/polkit/polkit-gnome_0.96.bb +++ b/meta/packages/polkit/polkit-gnome_0.96.bb @@ -10,7 +10,7 @@ EXTRA_OECONF = " --disable-scrollkeeper \ --disable-gtk-doc \ --disable-introspection " -inherit autotools_stage pkgconfig +inherit autotools pkgconfig FILES_${PN} += " ${datadir}/dbus-1 \ ${datadir}/PolicyKit \ diff --git a/meta/packages/poppler/poppler.inc b/meta/packages/poppler/poppler.inc index a3bce0c32e..645e734e8b 100644 --- a/meta/packages/poppler/poppler.inc +++ b/meta/packages/poppler/poppler.inc @@ -5,7 +5,7 @@ PR = "r1" SRC_URI = "http://poppler.freedesktop.org/${PN}-${PV}.tar.gz" -inherit autotools_stage pkgconfig +inherit autotools pkgconfig EXTRA_OECONF = " --enable-xpdf-headers \ --disable-gtk-test \ diff --git a/meta/packages/popt/popt_1.14.bb b/meta/packages/popt/popt_1.14.bb index ba863b58ff..e7e7062d59 100644 --- a/meta/packages/popt/popt_1.14.bb +++ b/meta/packages/popt/popt_1.14.bb @@ -5,6 +5,6 @@ DEPENDS = "gettext" SRC_URI = "http://rpm5.org/files/popt/popt-${PV}.tar.gz" -inherit autotools_stage +inherit autotools BBCLASSEXTEND = "native"
\ No newline at end of file diff --git a/meta/packages/pth/pth_2.0.7.bb b/meta/packages/pth/pth_2.0.7.bb index 1871b2bb38..e3bffa7ff0 100644 --- a/meta/packages/pth/pth_2.0.7.bb +++ b/meta/packages/pth/pth_2.0.7.bb @@ -8,7 +8,7 @@ SRC_URI = "${GNU_MIRROR}/pth/pth-${PV}.tar.gz" PARALLEL_MAKE="" -inherit autotools_stage binconfig +inherit autotools binconfig do_configure() { gnu-configize diff --git a/meta/packages/python/python-gst_0.10.8.bb b/meta/packages/python/python-gst_0.10.8.bb index 31d3bc94e4..59fae113d3 100644 --- a/meta/packages/python/python-gst_0.10.8.bb +++ b/meta/packages/python/python-gst_0.10.8.bb @@ -8,7 +8,7 @@ SRC_URI = "http://gstreamer.freedesktop.org/src/gst-python/gst-python-${PV}.tar. file://python-path.patch;patch=1" S = "${WORKDIR}/gst-python-${PV}" -inherit autotools_stage distutils-base pkgconfig +inherit autotools distutils-base pkgconfig EXTRA_OECONF += "--with-python-includes=${STAGING_INCDIR}/../" diff --git a/meta/packages/readline/readline_5.2.bb b/meta/packages/readline/readline_5.2.bb index 55ffb79fe6..10ce18fe9a 100644 --- a/meta/packages/readline/readline_5.2.bb +++ b/meta/packages/readline/readline_5.2.bb @@ -16,7 +16,7 @@ SRC_URI = "ftp://ftp.gnu.org/gnu/readline/readline-${PV}.tar.gz \ S = "${WORKDIR}/readline-${PV}" -inherit autotools_stage +inherit autotools do_configure () { install -m 0644 ${WORKDIR}/acinclude.m4 ${S}/ diff --git a/meta/packages/speex/speex_1.1.12+1.2beta3.bb b/meta/packages/speex/speex_1.1.12+1.2beta3.bb index f5e83f5bc8..d3681a939a 100644 --- a/meta/packages/speex/speex_1.1.12+1.2beta3.bb +++ b/meta/packages/speex/speex_1.1.12+1.2beta3.bb @@ -11,7 +11,7 @@ S = "${WORKDIR}/${PN}-1.2beta3" PARALLEL_MAKE = "" -inherit autotools_stage pkgconfig +inherit autotools pkgconfig EXTRA_OECONF = " --enable-fixed-point --with-ogg-libraries=${STAGING_LIBDIR} \ --disable-float-api --disable-vbr \ diff --git a/meta/packages/sqlite/sqlite3.inc b/meta/packages/sqlite/sqlite3.inc index cad3bd9fc0..fc102c4b69 100644 --- a/meta/packages/sqlite/sqlite3.inc +++ b/meta/packages/sqlite/sqlite3.inc @@ -9,7 +9,7 @@ SRC_URI = "http://www.sqlite.org/sqlite-${PV}.tar.gz \ S = "${WORKDIR}/sqlite-${PV}" -inherit autotools_stage pkgconfig pkgconfig_stage +inherit autotools pkgconfig pkgconfig_stage EXTRA_OECONF = "--disable-tcl --enable-shared \ --enable-threadsafe" diff --git a/meta/packages/startup-notification/startup-notification_0.9.bb b/meta/packages/startup-notification/startup-notification_0.9.bb index 4dedd10e44..42710c417f 100644 --- a/meta/packages/startup-notification/startup-notification_0.9.bb +++ b/meta/packages/startup-notification/startup-notification_0.9.bb @@ -4,7 +4,7 @@ SECTION = "libs" PRIORITY = "optional" DEPENDS = "virtual/libx11 libsm" -inherit autotools_stage pkgconfig +inherit autotools pkgconfig SRC_URI = "http://www.freedesktop.org/software/startup-notification/releases/${PN}-${PV}.tar.gz" diff --git a/meta/packages/subversion/subversion_1.5.5.bb b/meta/packages/subversion/subversion_1.5.5.bb index df1ec50fad..8adac8a6fa 100644 --- a/meta/packages/subversion/subversion_1.5.5.bb +++ b/meta/packages/subversion/subversion_1.5.5.bb @@ -17,7 +17,7 @@ EXTRA_OECONF = "--with-neon=${STAGING_EXECPREFIXDIR} \ --without-swig --with-apr=${STAGING_BINDIR_CROSS} \ --with-apr-util=${STAGING_BINDIR_CROSS}" -inherit autotools_stage +inherit autotools export LDFLAGS += " -L${STAGING_LIBDIR} " diff --git a/meta/packages/sysfsutils/sysfsutils_2.0.0.bb b/meta/packages/sysfsutils/sysfsutils_2.0.0.bb index 04bb337629..f1f6fe561c 100644 --- a/meta/packages/sysfsutils/sysfsutils_2.0.0.bb +++ b/meta/packages/sysfsutils/sysfsutils_2.0.0.bb @@ -6,7 +6,7 @@ PR = "r3" SRC_URI = "${SOURCEFORGE_MIRROR}/linux-diag/sysfsutils-${PV}.tar.gz" S = "${WORKDIR}/sysfsutils-${PV}" -inherit autotools_stage +inherit autotools PACKAGES_prepend = "libsysfs libsysfs-dbg libsysfs-dev " FILES_libsysfs = "${libdir}/*.so.*" diff --git a/meta/packages/telepathy/libtelepathy_0.3.3.bb b/meta/packages/telepathy/libtelepathy_0.3.3.bb index 69e34a9f42..c1e0c76bdf 100644 --- a/meta/packages/telepathy/libtelepathy_0.3.3.bb +++ b/meta/packages/telepathy/libtelepathy_0.3.3.bb @@ -8,7 +8,7 @@ SRC_URI = "http://telepathy.freedesktop.org/releases/libtelepathy/libtelepathy-$ file://prefer_python_2.5.patch;patch=1 \ file://doublefix.patch;patch=1" -inherit autotools_stage pkgconfig +inherit autotools pkgconfig FILES_${PN} += "${datadir}/telepathy \ ${datadir}/dbus-1" diff --git a/meta/packages/telepathy/telepathy-farsight_0.0.7.bb b/meta/packages/telepathy/telepathy-farsight_0.0.7.bb index ee1966b9d3..dfb7e39b0a 100644 --- a/meta/packages/telepathy/telepathy-farsight_0.0.7.bb +++ b/meta/packages/telepathy/telepathy-farsight_0.0.7.bb @@ -6,7 +6,7 @@ LICENSE = "LGPLv2" SRC_URI = "http://telepathy.freedesktop.org/releases/telepathy-farsight/${P}.tar.gz \ " -inherit autotools_stage +inherit autotools EXTRA_OECONF = "--disable-python" diff --git a/meta/packages/telepathy/telepathy-glib_0.9.2.bb b/meta/packages/telepathy/telepathy-glib_0.9.2.bb index 333efd426f..5c773bdb2d 100644 --- a/meta/packages/telepathy/telepathy-glib_0.9.2.bb +++ b/meta/packages/telepathy/telepathy-glib_0.9.2.bb @@ -6,7 +6,7 @@ PR = "r1" SRC_URI = "http://telepathy.freedesktop.org/releases/telepathy-glib/${P}.tar.gz" -inherit autotools_stage pkgconfig +inherit autotools pkgconfig FILES_${PN} += "${datadir}/telepathy \ ${datadir}/dbus-1" diff --git a/meta/packages/telepathy/telepathy-mission-control_4.67.bb b/meta/packages/telepathy/telepathy-mission-control_4.67.bb index 0350fdfb7f..3af177970e 100644 --- a/meta/packages/telepathy/telepathy-mission-control_4.67.bb +++ b/meta/packages/telepathy/telepathy-mission-control_4.67.bb @@ -9,7 +9,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/mission-control/telepathy-mission-control-${PV} PR = "r1" -inherit autotools_stage pkgconfig +inherit autotools pkgconfig PACKAGES =+ " \ libmissioncontrol \ diff --git a/meta/packages/tremor/tremor_20041119.bb b/meta/packages/tremor/tremor_20041119.bb index fd5ab7c58c..36b9c81bd3 100644 --- a/meta/packages/tremor/tremor_20041119.bb +++ b/meta/packages/tremor/tremor_20041119.bb @@ -10,7 +10,7 @@ SRC_URI = "svn://svn.xiph.org/trunk;module=Tremor;rev=4573;proto=http" S = "${WORKDIR}/Tremor" -inherit autotools_stage +inherit autotools EXTRA_OECONF=" --enable-shared --disable-rpath " diff --git a/meta/packages/tslib/tslib_1.0.bb b/meta/packages/tslib/tslib_1.0.bb index c2e732996a..881978df9c 100644 --- a/meta/packages/tslib/tslib_1.0.bb +++ b/meta/packages/tslib/tslib_1.0.bb @@ -15,7 +15,7 @@ SRC_URI = "http://download.berlios.de/tslib/tslib-1.0.tar.bz2 \ SRC_URI_append_mnci += " file://devfs.patch;patch=1" SRC_URI_append_mnci += " file://event1.patch;patch=1" -inherit autotools_stage pkgconfig +inherit autotools pkgconfig EXTRA_OECONF = "--enable-shared --disable-h3600 --enable-input --disable-corgi --disable-collie --disable-mk712 --disable-arctic2 --disable-ucb1x00" diff --git a/meta/packages/util-linux/util-linux.inc b/meta/packages/util-linux/util-linux.inc index 037635d8eb..4e61a8cc27 100644 --- a/meta/packages/util-linux/util-linux.inc +++ b/meta/packages/util-linux/util-linux.inc @@ -3,7 +3,7 @@ SECTION = "base" LICENSE = "GPL" DEPENDS = "udev zlib ncurses virtual/libintl gettext" -inherit autotools_stage +inherit autotools SRC_URI = "${KERNELORG_MIRROR}/pub/linux/utils/util-linux-ng/v2.15/util-linux-ng-${PV}.tar.bz2 \ file://MCONFIG \ diff --git a/meta/packages/valgrind/valgrind_3.5.0.bb b/meta/packages/valgrind/valgrind_3.5.0.bb index fece8ea0e8..0a9bef8b06 100644 --- a/meta/packages/valgrind/valgrind_3.5.0.bb +++ b/meta/packages/valgrind/valgrind_3.5.0.bb @@ -11,7 +11,7 @@ S = "${WORKDIR}/valgrind-${PV}" COMPATIBLE_HOST = 'i.86.*-linux' -inherit autotools_stage +inherit autotools EXTRA_OECONF = "--enable-tls" diff --git a/meta/packages/wbxml/wbxml2_0.9.2.bb b/meta/packages/wbxml/wbxml2_0.9.2.bb index 14c3f6acc3..b8ba8c747f 100644 --- a/meta/packages/wbxml/wbxml2_0.9.2.bb +++ b/meta/packages/wbxml/wbxml2_0.9.2.bb @@ -6,7 +6,7 @@ DEPENDS = "libxml2 sed-native expat" SRC_URI = "${SOURCEFORGE_MIRROR}/wbxmllib/${P}.tar.gz \ file://no-doc-install.patch;patch=1" -inherit autotools_stage pkgconfig +inherit autotools pkgconfig do_configure_append() { sed -i s:-I/usr/include::g Makefile diff --git a/meta/packages/webkit/webkit-gtk_svn.bb b/meta/packages/webkit/webkit-gtk_svn.bb index a5765e84b1..f999280128 100644 --- a/meta/packages/webkit/webkit-gtk_svn.bb +++ b/meta/packages/webkit/webkit-gtk_svn.bb @@ -23,7 +23,7 @@ SRC_URI = "\ S = "${WORKDIR}/" -inherit autotools_stage pkgconfig +inherit autotools pkgconfig EXTRA_OECONF = "\ --enable-debug=no \ diff --git a/meta/packages/wv/wv_1.2.0.bb b/meta/packages/wv/wv_1.2.0.bb index 6fdb0fe8c6..c4c115b90e 100644 --- a/meta/packages/wv/wv_1.2.0.bb +++ b/meta/packages/wv/wv_1.2.0.bb @@ -7,7 +7,7 @@ PR = "r3" SRC_URI = "${SOURCEFORGE_MIRROR}/wvware/wv-${PV}.tar.gz \ file://pkgconfig.patch;patch=1" -inherit autotools_stage pkgconfig +inherit autotools pkgconfig S = "${WORKDIR}/${PN}-${PV}" diff --git a/meta/packages/xcb/libpthread-stubs_0.1.bb b/meta/packages/xcb/libpthread-stubs_0.1.bb index d2a4690937..9dd0aaff43 100644 --- a/meta/packages/xcb/libpthread-stubs_0.1.bb +++ b/meta/packages/xcb/libpthread-stubs_0.1.bb @@ -11,7 +11,7 @@ PARALLEL_MAKE = "" SRC_URI = "http://xcb.freedesktop.org/dist/libpthread-stubs-${PV}.tar.bz2" -inherit autotools_stage pkgconfig +inherit autotools pkgconfig RDEPENDS_${PN}-dev = "" RRECOMMENDS_${PN}-dbg = "${PN}-dev (= ${EXTENDPV})" diff --git a/meta/packages/xorg-app/xorg-app-common.inc b/meta/packages/xorg-app/xorg-app-common.inc index 68653654e7..5c84596dbf 100644 --- a/meta/packages/xorg-app/xorg-app-common.inc +++ b/meta/packages/xorg-app/xorg-app-common.inc @@ -10,6 +10,6 @@ SRC_URI = "${XORG_MIRROR}/individual/app/${XORG_PN}-${PV}.tar.bz2" S = "${WORKDIR}/${XORG_PN}-${PV}" -inherit autotools_stage pkgconfig +inherit autotools pkgconfig FILES_${PN} += " /usr/lib/X11/${XORG_PN}" diff --git a/meta/packages/xorg-driver/xf86-driver-common.inc b/meta/packages/xorg-driver/xf86-driver-common.inc index ce7bd06811..9d83ce9ae3 100644 --- a/meta/packages/xorg-driver/xf86-driver-common.inc +++ b/meta/packages/xorg-driver/xf86-driver-common.inc @@ -16,7 +16,7 @@ S = "${WORKDIR}/${XORG_PN}-${PV}" FILES_${PN} += " ${libdir}/xorg/modules/drivers/*.so" FILES_${PN}-dbg += " ${libdir}/xorg/modules/drivers/.debug" -inherit autotools_stage pkgconfig +inherit autotools pkgconfig # AC_CHECK_FILE doesn't work when cross compiling, so we create a replacement # macro that simply assumes the test succeeds. diff --git a/meta/packages/xorg-lib/xkeyboard-config_1.6.bb b/meta/packages/xorg-lib/xkeyboard-config_1.6.bb index a2f58be9ea..9a7494d48a 100644 --- a/meta/packages/xorg-lib/xkeyboard-config_1.6.bb +++ b/meta/packages/xorg-lib/xkeyboard-config_1.6.bb @@ -11,7 +11,7 @@ EXTRA_OECONF = "--with-xkb-rules-symlink=xorg" RDEPENDS_${PN} += "xkbcomp" FILES_${PN} += "${datadir}/X11/xkb" -inherit autotools_stage pkgconfig +inherit autotools pkgconfig do_install_append () { install -d ${D}/usr/share/X11/xkb/compiled diff --git a/meta/packages/xorg-lib/xorg-lib-common.inc b/meta/packages/xorg-lib/xorg-lib-common.inc index a68fd1a2b7..c61d9efb4c 100644 --- a/meta/packages/xorg-lib/xorg-lib-common.inc +++ b/meta/packages/xorg-lib/xorg-lib-common.inc @@ -9,6 +9,6 @@ SRC_URI = "${XORG_MIRROR}/individual/lib/${XORG_PN}-${PV}.tar.bz2" S = "${WORKDIR}/${XORG_PN}-${PV}" -inherit autotools_stage pkgconfig +inherit autotools pkgconfig EXTRA_OECONF = "--enable-malloc0returnsnull" diff --git a/meta/packages/xorg-proto/xorg-proto-common.inc b/meta/packages/xorg-proto/xorg-proto-common.inc index d3c2536831..dd41e6e6f4 100644 --- a/meta/packages/xorg-proto/xorg-proto-common.inc +++ b/meta/packages/xorg-proto/xorg-proto-common.inc @@ -11,7 +11,7 @@ S = "${WORKDIR}/${XORG_PN}-${PV}" DEPENDS = "util-macros" -inherit autotools_stage pkgconfig +inherit autotools pkgconfig # ${PN} is empty so we need to tweak -dev and -dbg package dependencies RDEPENDS_${PN}-dev = "" diff --git a/meta/packages/xorg-util/xorg-util-common.inc b/meta/packages/xorg-util/xorg-util-common.inc index 9b5e653700..86603e40b1 100644 --- a/meta/packages/xorg-util/xorg-util-common.inc +++ b/meta/packages/xorg-util/xorg-util-common.inc @@ -8,4 +8,4 @@ SRC_URI = "${XORG_MIRROR}/individual/util/${XORG_PN}-${PV}.tar.gz" S = "${WORKDIR}/${XORG_PN}-${PV}" -inherit autotools_stage pkgconfig +inherit autotools pkgconfig diff --git a/meta/packages/xorg-xserver/xserver-xf86-common.inc b/meta/packages/xorg-xserver/xserver-xf86-common.inc index 8064316da0..9fc5bdc4cb 100644 --- a/meta/packages/xorg-xserver/xserver-xf86-common.inc +++ b/meta/packages/xorg-xserver/xserver-xf86-common.inc @@ -15,7 +15,7 @@ SRC_URI = "${XORG_MIRROR}/individual/xserver/${XORG_PN}-${PV}.tar.bz2" S = "${WORKDIR}/${XORG_PN}-${PV}" -inherit autotools_stage pkgconfig +inherit autotools pkgconfig PACKAGES =+ "${PN}-utils" diff --git a/meta/packages/zlib/zlib_1.2.3.bb b/meta/packages/zlib/zlib_1.2.3.bb index c1d6ce6ea5..97d0be5d5e 100644 --- a/meta/packages/zlib/zlib_1.2.3.bb +++ b/meta/packages/zlib/zlib_1.2.3.bb @@ -12,6 +12,6 @@ SRC_URI = "http://www.zlib.net/zlib-1.2.3.tar.bz2 \ DEPENDS = "libtool-cross" -inherit autotools_stage +inherit autotools BBCLASSEXTEND = "native nativesdk" |