[oe-commits] Koen Kooi : xfce-base libs: convert to new style staging
git version control
git at git.openembedded.org
Fri Apr 23 17:02:33 UTC 2010
Module: openembedded.git
Branch: org.openembedded.dev
Commit: 653467ce150b0b53ce510fafa66d1e224c13d82f
URL: http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=653467ce150b0b53ce510fafa66d1e224c13d82f
Author: Koen Kooi <koen at openembedded.org>
Date: Fri Apr 23 13:41:47 2010 +0200
xfce-base libs: convert to new style staging
---
recipes/xfce-base/libxfce4mcs_4.4.2.bb | 10 ----------
recipes/xfce-base/libxfce4menu_4.6.1.bb | 6 +-----
recipes/xfce-base/libxfce4util_4.4.2.bb | 14 ++------------
recipes/xfce-base/libxfce4util_4.6.1.bb | 14 +-------------
recipes/xfce-base/libxfcegui4_4.4.2.bb | 6 ++----
recipes/xfce-base/libxfcegui4_4.6.1.bb | 6 +-----
6 files changed, 7 insertions(+), 49 deletions(-)
diff --git a/recipes/xfce-base/libxfce4mcs_4.4.2.bb b/recipes/xfce-base/libxfce4mcs_4.4.2.bb
index aa25a1f..c0a5886 100644
--- a/recipes/xfce-base/libxfce4mcs_4.4.2.bb
+++ b/recipes/xfce-base/libxfce4mcs_4.4.2.bb
@@ -8,15 +8,5 @@ SECTION = "x11/libs"
inherit xfce pkgconfig
-do_stage() {
- install -d ${STAGING_INCDIR}/xfce4/libxfce4mcs
-
- install -m 644 libxfce4mcs/mcs-common.h ${STAGING_INCDIR}/xfce4/libxfce4mcs
- install -m 644 libxfce4mcs/mcs-client.h ${STAGING_INCDIR}/xfce4/libxfce4mcs
- install -m 644 libxfce4mcs/mcs-manager.h ${STAGING_INCDIR}/xfce4/libxfce4mcs
- oe_libinstall -C libxfce4mcs -so libxfce4mcs-manager ${STAGING_LIBDIR}
- oe_libinstall -C libxfce4mcs -so libxfce4mcs-client ${STAGING_LIBDIR}
-}
-
SRC_URI[md5sum] = "5ffe66a3eeb884839806ce929e5d2776"
SRC_URI[sha256sum] = "192843e8fdd63e10ba431ca12265c654dbce9677ec9d330038eea462ca0e5c8e"
diff --git a/recipes/xfce-base/libxfce4menu_4.6.1.bb b/recipes/xfce-base/libxfce4menu_4.6.1.bb
index f9249d4..f8edcb6 100644
--- a/recipes/xfce-base/libxfce4menu_4.6.1.bb
+++ b/recipes/xfce-base/libxfce4menu_4.6.1.bb
@@ -4,13 +4,9 @@ DEPENDS = "gettext pkgconfig libxfce4util intltool"
RDEPENDS = "gtk+ libxfce4util"
LICENSE="LGPL-2 FDL-1.1"
-PR = "r1"
+PR = "r2"
inherit xfce46
-do_stage() {
- autotools_stage_all
-}
-
SRC_URI[md5sum] = "5dc9343885c2c6f931318b2a1cdcc9db"
SRC_URI[sha256sum] = "5442b458b0e4f6bbbb6ddfbf1a7789dde1d270ab85686a3be77731a4d5ef84da"
diff --git a/recipes/xfce-base/libxfce4util_4.4.2.bb b/recipes/xfce-base/libxfce4util_4.4.2.bb
index 80edcf2..43b4c3f 100644
--- a/recipes/xfce-base/libxfce4util_4.4.2.bb
+++ b/recipes/xfce-base/libxfce4util_4.4.2.bb
@@ -7,22 +7,12 @@ SECTION = "x11/libs"
LICENSE = "GPL"
DEPENDS = "glib-2.0 xfce4-dev-tools"
+PR = "r1"
+
inherit xfce pkgconfig
MACROS="m4/X11.m4 m4/debug.m4 m4/depends.m4 m4/i18n.m4"
-do_stage() {
- install -d ${STAGING_LIBDIR} ${STAGING_INCDIR}/libxfce4util
- # The line below expands to the list of headers that native makefile
- # would install. Complain and/or fix if it's not portable enough
- for file in $(eval $(make -n -C libxfce4util install|grep "^list='[^.]\\+.h"|cut -d\; -f1); echo $list); do
- install -m 644 libxfce4util/$file ${STAGING_INCDIR}/libxfce4util
- done
-
- oe_libinstall -C libxfce4util -so libxfce4util ${STAGING_LIBDIR}
-
-}
-
FILES_${PN}-dev += " ${datadir}/xfce4/m4"
SRC_URI[md5sum] = "261e7a5df039493ad746e0c359211092"
diff --git a/recipes/xfce-base/libxfce4util_4.6.1.bb b/recipes/xfce-base/libxfce4util_4.6.1.bb
index 0e5e12f..de8bf53 100644
--- a/recipes/xfce-base/libxfce4util_4.6.1.bb
+++ b/recipes/xfce-base/libxfce4util_4.6.1.bb
@@ -4,7 +4,7 @@ DESCRIPTION = "Basic utility library for Xfce4"
SECTION = "x11/libs"
LICENSE = "GPL"
DEPENDS = "glib-2.0 xfce4-dev-tools "
-PR = "r1"
+PR = "r2"
inherit xfce46
@@ -12,18 +12,6 @@ EXTRA_OECONF += "--disable-dependency-tracking --disable-static --with-broken-pu
MACROS="m4/X11.m4 m4/debug.m4 m4/depends.m4 m4/i18n.m4"
-do_stage() {
- install -d ${STAGING_LIBDIR} ${STAGING_INCDIR}/libxfce4util
- # The line below expands to the list of headers that native makefile
- # would install. Complain and/or fix if it's not portable enough
- for file in $(eval $(make -n -C libxfce4util install|grep "^list='[^.]\\+.h"|cut -d\; -f1); echo $list); do
- install -m 644 libxfce4util/$file ${STAGING_INCDIR}/libxfce4util
- done
-
- oe_libinstall -C libxfce4util -so libxfce4util ${STAGING_LIBDIR}
-
-}
-
FILES_${PN}-dev += " ${datadir}/xfce4/m4"
SRC_URI[md5sum] = "eac51d58179cbcadc3f802450a8ec9cd"
diff --git a/recipes/xfce-base/libxfcegui4_4.4.2.bb b/recipes/xfce-base/libxfcegui4_4.4.2.bb
index 4213c40..5a75d40 100644
--- a/recipes/xfce-base/libxfcegui4_4.4.2.bb
+++ b/recipes/xfce-base/libxfcegui4_4.4.2.bb
@@ -6,11 +6,9 @@ DESCRIPTION = "XFCE Widget library and X Window System interaction"
DEPENDS = "libxfce4util dbh libxml2 gtk+"
SECTION = "x11/libs"
-inherit xfce
+PR = "r1"
-do_stage() {
-autotools_stage_all
-}
+inherit xfce
FILES_${PN} += "${libdir}/xfce4/modules ${datadir}/xfce4/mime ${datadir}/icons/hicolor"
diff --git a/recipes/xfce-base/libxfcegui4_4.6.1.bb b/recipes/xfce-base/libxfcegui4_4.6.1.bb
index c014637..e858219 100644
--- a/recipes/xfce-base/libxfcegui4_4.6.1.bb
+++ b/recipes/xfce-base/libxfcegui4_4.6.1.bb
@@ -5,14 +5,10 @@ DEPENDS = "gettext pkgconfig intltool virtual/libx11 libxfce4util xfconf dbh lib
RDEPENDS = "xfconf startup-notification "
SECTION = "x11/libs"
-PR = "r4"
+PR = "r5"
inherit xfce46
-do_stage() {
- autotools_stage_all
-}
-
LEAD_SONAME = "libxfcegui4.so.4"
FILES_${PN} += "${libdir}/xfce4/modules ${libdir}/libglade/2.0/*.so ${datadir}/xfce4/mime ${datadir}/icons/hicolor"
More information about the Openembedded-commits
mailing list