diff options
| author | Koen Kooi <koen@openembedded.org> | 2010-04-15 14:12:16 +0200 |
|---|---|---|
| committer | Koen Kooi <koen@openembedded.org> | 2010-04-15 14:12:16 +0200 |
| commit | 7e7f9fc9580d5014a7a5d59ab2e45ddecc136616 (patch) | |
| tree | b4dd971526339e7fb70d61818c0740154e02931c | |
| parent | b9a6bb07f575fede20f4093267dc7d5a77703b84 (diff) | |
xorg-lib: switch to new style staging
| -rw-r--r-- | recipes/xorg-lib/libx11_git.bb | 5 | ||||
| -rw-r--r-- | recipes/xorg-lib/libxaw_1.0.3.bb | 8 | ||||
| -rw-r--r-- | recipes/xorg-lib/libxaw_1.0.4.bb | 8 | ||||
| -rw-r--r-- | recipes/xorg-lib/pixman.inc | 5 | ||||
| -rw-r--r-- | recipes/xorg-lib/xorg-headers-native.bb | 6 | ||||
| -rw-r--r-- | recipes/xorg-lib/xorg-lib-common.inc | 3 |
6 files changed, 14 insertions, 21 deletions
diff --git a/recipes/xorg-lib/libx11_git.bb b/recipes/xorg-lib/libx11_git.bb index 47cc9536e2..05fc3e7795 100644 --- a/recipes/xorg-lib/libx11_git.bb +++ b/recipes/xorg-lib/libx11_git.bb @@ -8,7 +8,7 @@ PROVIDES = "virtual/libx11" RPROVIDES = "virtual-libx11" SRCREV = "c3f3e4a9e531d010312c97e753d6e543e607094d" PV = "1.3.3+git" -PR = "r2" +PR = "r3" FILES_${PN} += "${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB" FILES_${PN}-locale += "${datadir}/X11/locale" @@ -28,6 +28,3 @@ do_compile() { oe_runmake } -do_stage() { - autotools_stage_all -} diff --git a/recipes/xorg-lib/libxaw_1.0.3.bb b/recipes/xorg-lib/libxaw_1.0.3.bb index 81a2e9f1b6..1618ae340e 100644 --- a/recipes/xorg-lib/libxaw_1.0.3.bb +++ b/recipes/xorg-lib/libxaw_1.0.3.bb @@ -8,10 +8,10 @@ PE = "1" XORG_PN = "libXaw" -do_stage_append () { - ln -sf libXaw6.so.6 ${STAGING_LIBDIR}/libXaw.so.6 - ln -sf libXaw7.so.7 ${STAGING_LIBDIR}/libXaw.so.7 - ln -sf libXaw7.so.7 ${STAGING_LIBDIR}/libXaw.so +do_install_append () { + ln -sf libXaw6.so.6 ${D}${libdir}/libXaw.so.6 + ln -sf libXaw7.so.7 ${D}${libdir}/libXaw.so.7 + ln -sf libXaw7.so.7 ${D}${libdir}/libXaw.so } PACKAGES =+ "libxaw6 libxaw7 libxaw8" diff --git a/recipes/xorg-lib/libxaw_1.0.4.bb b/recipes/xorg-lib/libxaw_1.0.4.bb index 7f7d459389..4878a0d42f 100644 --- a/recipes/xorg-lib/libxaw_1.0.4.bb +++ b/recipes/xorg-lib/libxaw_1.0.4.bb @@ -8,10 +8,10 @@ PE = "1" XORG_PN = "libXaw" -do_stage_append () { - ln -sf libXaw6.so.6 ${STAGING_LIBDIR}/libXaw.so.6 - ln -sf libXaw7.so.7 ${STAGING_LIBDIR}/libXaw.so.7 - ln -sf libXaw7.so.7 ${STAGING_LIBDIR}/libXaw.so +do_install_append () { + ln -sf libXaw6.so.6 ${D}${libdir}/libXaw.so.6 + ln -sf libXaw7.so.7 ${D}${libdir}/libXaw.so.7 + ln -sf libXaw7.so.7 ${D}${libdir}/libXaw.so } PACKAGES =+ "libxaw6 libxaw7 libxaw8" diff --git a/recipes/xorg-lib/pixman.inc b/recipes/xorg-lib/pixman.inc index 1828eef4ce..a5987bb86f 100644 --- a/recipes/xorg-lib/pixman.inc +++ b/recipes/xorg-lib/pixman.inc @@ -3,11 +3,10 @@ PRIORITY = "optional" DESCRIPTION = "Low-level pixel manipulation library." LICENSE = "X11" -BBCLASSEXTEND="native" +BBCLASSEXTEND = "native" SRC_URI = "http://cairographics.org/releases/${BPN}-${PV}.tar.gz;name=archive " INC_PR = "r5" -inherit autotools_stage pkgconfig -AUTOTOOLS_STAGE_PKGCONFIG = "1" +inherit autotools pkgconfig diff --git a/recipes/xorg-lib/xorg-headers-native.bb b/recipes/xorg-lib/xorg-headers-native.bb index 82d5d79415..b36304a9be 100644 --- a/recipes/xorg-lib/xorg-headers-native.bb +++ b/recipes/xorg-lib/xorg-headers-native.bb @@ -2,7 +2,7 @@ inherit native SRC_URI = "file://X11" -do_stage() { - install -d ${STAGING_INCDIR} - cp -pPfR ${WORKDIR}/X11 ${STAGING_INCDIR} +do_install() { + install -d ${D}${includedir} + cp -pPfR ${WORKDIR}/X11 ${D}${includedir} } diff --git a/recipes/xorg-lib/xorg-lib-common.inc b/recipes/xorg-lib/xorg-lib-common.inc index 942a247b40..d59e3847ea 100644 --- a/recipes/xorg-lib/xorg-lib-common.inc +++ b/recipes/xorg-lib/xorg-lib-common.inc @@ -13,6 +13,3 @@ inherit autotools pkgconfig EXTRA_OECONF = "--enable-malloc0returnsnull" -do_stage() { - autotools_stage_all -} |