From 55fbdd15644da4375f5dc3eea62b7c1e55339f55 Mon Sep 17 00:00:00 2001 From: Phil Blundell Date: Thu, 25 May 2006 13:36:25 +0200 Subject: [PATCH] various packages: avoid rpath linking. Fixes the major offenders for Bug #1650. Thanks Phil! Signed-off-by: Rene Wagner --- org.handhelds.familiar/packages/cairo/cairo_0.5.2.bb | 4 ++-- org.handhelds.familiar/packages/cairo/cairo_1.0.0.bb | 4 ++-- .../packages/cairo/libsvg-cairo_0.1.6.bb | 3 ++- .../packages/cairo/libsvg-cairo_20050601.bb | 3 ++- org.handhelds.familiar/packages/cairo/libsvg_cvs.bb | 4 ++-- .../packages/esound/esound-gpe_20020817.bb | 7 ++----- org.handhelds.familiar/packages/gtk+/gtk+_2.6.10.bb | 2 +- org.handhelds.familiar/packages/ice/ice_6.3.3.bb | 4 ++-- .../packages/libgpelaunch/libgpelaunch_0.14.bb | 1 + .../packages/libgpewidget/libgpewidget_0.112.bb | 2 +- .../packages/libmatchbox/libmatchbox_1.7.bb | 2 ++ .../packages/libpixman/libpixman_0.1.6.bb | 3 ++- org.handhelds.familiar/packages/libsm/libsm_6.0.3.bb | 4 ++-- .../packages/libxcursor/libxcursor_1.1.2.bb | 9 ++------- .../packages/libxfixes/libxfixes_2.0.1.bb | 8 ++------ org.handhelds.familiar/packages/libxft/libxft_2.1.6.bb | 9 ++------- .../packages/libxrandr/libxrandr_1.0.2.bb | 8 ++------ .../packages/libxrender/libxrender_0.8.4.bb | 8 ++------ org.handhelds.familiar/packages/libxss/libxss_cvs.bb | 9 ++------- .../packages/matchbox-desktop/matchbox-desktop_0.9.1.bb | 2 +- org.handhelds.familiar/packages/pango/pango_1.8.1.bb | 2 +- .../startup-notification/startup-notification_0.8.bb | 4 +++- org.handhelds.familiar/packages/x11/x11_6.2.1.bb | 2 +- org.handhelds.familiar/packages/xau/xau_0.1.1.bb | 8 ++------ .../packages/xcalibrate/xcalibrate_cvs.bb | 7 ++----- .../packages/xcomposite/xcomposite_1.0.1.bb | 8 ++------ org.handhelds.familiar/packages/xdamage/xdamage_1.0.1.bb | 8 ++------ org.handhelds.familiar/packages/xdmcp/libxdmcp_0.1.3.bb | 8 ++------ org.handhelds.familiar/packages/xext/xext_cvs.bb | 9 ++------- org.handhelds.familiar/packages/xfont/xfont_1.4.2.bb | 8 ++------ org.handhelds.familiar/packages/xmu/xmu_cvs.bb | 4 ++-- .../packages/xserver/xserver-kdrive_20050207.bb | 2 +- org.handhelds.familiar/packages/xt/xt_0.1.5.bb | 4 ++-- org.handhelds.familiar/packages/xtst/xtst_cvs.bb | 8 ++------ 34 files changed, 62 insertions(+), 116 deletions(-) diff --git a/org.handhelds.familiar/packages/cairo/cairo_0.5.2.bb b/org.handhelds.familiar/packages/cairo/cairo_0.5.2.bb index 260541c..3881228 100644 --- a/org.handhelds.familiar/packages/cairo/cairo_0.5.2.bb +++ b/org.handhelds.familiar/packages/cairo/cairo_0.5.2.bb @@ -5,12 +5,12 @@ MAINTAINER = "Phil Blundell " DEPENDS = "x11 libpixman libpng fontconfig libxrender" DESCRIPTION = "Cairo graphics library" LICENSE = "MPL LGPL" -PR = "r0" +PR = "r1" SRC_URI = "http://cairographics.org/snapshots/cairo-${PV}.tar.gz" inherit autotools pkgconfig do_stage () { - oe_runmake install DESTDIR="" bindir=${STAGING_BINDIR} includedir=${STAGING_INCDIR} libdir=${STAGING_LIBDIR} prefix=${STAGING_DIR} + autotools_stage_all } diff --git a/org.handhelds.familiar/packages/cairo/cairo_1.0.0.bb b/org.handhelds.familiar/packages/cairo/cairo_1.0.0.bb index aa97a9f..9783a03 100644 --- a/org.handhelds.familiar/packages/cairo/cairo_1.0.0.bb +++ b/org.handhelds.familiar/packages/cairo/cairo_1.0.0.bb @@ -4,12 +4,12 @@ MAINTAINER = "Phil Blundell " DEPENDS = "x11 libpng fontconfig libxrender" DESCRIPTION = "Cairo graphics library" LICENSE = "MPL LGPL" -PR = "r1" +PR = "r2" SRC_URI = "http://cairographics.org/releases/cairo-${PV}.tar.gz" inherit autotools pkgconfig do_stage () { - oe_runmake install DESTDIR="" bindir=${STAGING_BINDIR} includedir=${STAGING_INCDIR} libdir=${STAGING_LIBDIR} prefix=${STAGING_DIR} + autotools_stage_all } diff --git a/org.handhelds.familiar/packages/cairo/libsvg-cairo_0.1.6.bb b/org.handhelds.familiar/packages/cairo/libsvg-cairo_0.1.6.bb index 83c4428..5658294 100644 --- a/org.handhelds.familiar/packages/cairo/libsvg-cairo_0.1.6.bb +++ b/org.handhelds.familiar/packages/cairo/libsvg-cairo_0.1.6.bb @@ -4,11 +4,12 @@ PRIORITY = "optional" MAINTAINER = "Phil Blundell " DEPENDS = "libsvg cairo" DESCRIPTION = "SVG rendering library" +PR = "r1" SRC_URI = "http://cairographics.org/snapshots/libsvg-cairo-${PV}.tar.gz" inherit autotools pkgconfig do_stage () { - oe_runmake install DESTDIR="" bindir=${STAGING_BINDIR} includedir=${STAGING_INCDIR} libdir=${STAGING_LIBDIR} prefix=${STAGING_DIR} + autotools_stage_all } diff --git a/org.handhelds.familiar/packages/cairo/libsvg-cairo_20050601.bb b/org.handhelds.familiar/packages/cairo/libsvg-cairo_20050601.bb index f04af71..2848b54 100644 --- a/org.handhelds.familiar/packages/cairo/libsvg-cairo_20050601.bb +++ b/org.handhelds.familiar/packages/cairo/libsvg-cairo_20050601.bb @@ -10,9 +10,10 @@ DESCRIPTION = "SVG rendering library" DEFAULT_PREFERENCE = "1" SRC_URI = "cvs://anoncvs:anoncvs@cvs.cairographics.org/cvs/cairo;module=libsvg-cairo;date=${FIXEDCVSDATE}" S = "${WORKDIR}/libsvg-cairo" +PR = "r1" inherit autotools pkgconfig do_stage () { - oe_runmake install DESTDIR="" bindir=${STAGING_BINDIR} includedir=${STAGING_INCDIR} libdir=${STAGING_LIBDIR} prefix=${STAGING_DIR} + autotools_stage_all } diff --git a/org.handhelds.familiar/packages/cairo/libsvg_cvs.bb b/org.handhelds.familiar/packages/cairo/libsvg_cvs.bb index 8cdb7a9..49e1b05 100644 --- a/org.handhelds.familiar/packages/cairo/libsvg_cvs.bb +++ b/org.handhelds.familiar/packages/cairo/libsvg_cvs.bb @@ -7,12 +7,12 @@ DESCRIPTION = "SVG parser library" LICENSE = "LGPL" SRC_URI = "cvs://anoncvs:anoncvs@cvs.cairographics.org/cvs/cairo;module=libsvg" S = "${WORKDIR}/libsvg" -PR = "r2" +PR = "r3" EXTRA_OECONF = "--with-expat" inherit autotools pkgconfig do_stage () { - oe_runmake install DESTDIR="" bindir=${STAGING_BINDIR} includedir=${STAGING_INCDIR} libdir=${STAGING_LIBDIR} prefix=${STAGING_DIR} + autotools_stage_all } diff --git a/org.handhelds.familiar/packages/esound/esound-gpe_20020817.bb b/org.handhelds.familiar/packages/esound/esound-gpe_20020817.bb index c3cdb78..6ee4281 100644 --- a/org.handhelds.familiar/packages/esound/esound-gpe_20020817.bb +++ b/org.handhelds.familiar/packages/esound/esound-gpe_20020817.bb @@ -2,7 +2,7 @@ DESCRIPTION = "Enlightened Sound Daemon - GPE version" SECTION = "gpe/base" LICENSE = "GPL" DEPENDS = "audiofile" -PR = "r3" +PR = "r4" CVSDATE = "${PV}" SRC_URI = "${HANDHELDS_CVS};module=gpe/base/esound \ @@ -15,12 +15,9 @@ inherit autotools binconfig pkgconfig EXTRA_OECONF = "--disable-alsa" -SOV = "0.2.28" - do_stage () { install -m 0644 esd.h ${STAGING_INCDIR}/esd.h - oe_soinstall .libs/libesd.so.${SOV} ${STAGING_LIBDIR} - install -m 0644 .libs/libesd.lai ${STAGING_LIBDIR}/libesd.la + oe_libinstall -C .libs -so libesd ${STAGING_LIBDIR} install -m 0644 esd.m4 ${STAGING_DATADIR}/aclocal } diff --git a/org.handhelds.familiar/packages/gtk+/gtk+_2.6.10.bb b/org.handhelds.familiar/packages/gtk+/gtk+_2.6.10.bb index 1d06fdd..f5816e4 100644 --- a/org.handhelds.familiar/packages/gtk+/gtk+_2.6.10.bb +++ b/org.handhelds.familiar/packages/gtk+/gtk+_2.6.10.bb @@ -6,7 +6,7 @@ SECTION = "libs" PRIORITY = "optional" MAINTAINER = "Philip Blundell " DEPENDS = "glib-2.0 pango atk jpeg libpng xext libxcursor gtk-doc libgcrypt" -PR = "r3" +PR = "r4" SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.6/gtk+-${PV}.tar.bz2 \ file://unbreak-gdkproperty-x11-c.patch;patch=1 \ diff --git a/org.handhelds.familiar/packages/ice/ice_6.3.3.bb b/org.handhelds.familiar/packages/ice/ice_6.3.3.bb index 2f0f9a2..d36fbd5 100644 --- a/org.handhelds.familiar/packages/ice/ice_6.3.3.bb +++ b/org.handhelds.familiar/packages/ice/ice_6.3.3.bb @@ -4,7 +4,7 @@ PRIORITY = "optional" MAINTAINER = "Phil Blundell " DEPENDS = "x11" DESCRIPTION = "X11 ICE library" -PR = "r1" +PR = "r2" SRC_URI = "${XLIBS_MIRROR}/libICE-${PV}.tar.bz2 \ file://autofoo.patch;patch=1" @@ -13,5 +13,5 @@ S = "${WORKDIR}/libICE-${PV}" inherit autotools pkgconfig do_stage () { - oe_runmake install DESTDIR="" bindir=${STAGING_BINDIR} includedir=${STAGING_INCDIR} libdir=${STAGING_LIBDIR} prefix=${STAGING_DIR} + autotools_stage_all } diff --git a/org.handhelds.familiar/packages/libgpelaunch/libgpelaunch_0.14.bb b/org.handhelds.familiar/packages/libgpelaunch/libgpelaunch_0.14.bb index 89069c2..ef70057 100644 --- a/org.handhelds.familiar/packages/libgpelaunch/libgpelaunch_0.14.bb +++ b/org.handhelds.familiar/packages/libgpelaunch/libgpelaunch_0.14.bb @@ -2,6 +2,7 @@ LICENSE = "LGPL" DESCRIPTION = "GPE program launcher library" SECTION = "libs" DEPENDS = "gtk+ libgpewidget startup-notification" +PR = "r1" inherit autotools pkgconfig diff --git a/org.handhelds.familiar/packages/libgpewidget/libgpewidget_0.112.bb b/org.handhelds.familiar/packages/libgpewidget/libgpewidget_0.112.bb index cc33e71..793d193 100644 --- a/org.handhelds.familiar/packages/libgpewidget/libgpewidget_0.112.bb +++ b/org.handhelds.familiar/packages/libgpewidget/libgpewidget_0.112.bb @@ -4,7 +4,7 @@ SECTION = "gpe/libs" PRIORITY = "optional" DEPENDS = "gtk+ cairo libxrender gtk-doc intltool-native" MAINTAINER = "Florian Boor " -PR = "r0" +PR = "r1" PACKAGES =+ "libgpewidget-bin" diff --git a/org.handhelds.familiar/packages/libmatchbox/libmatchbox_1.7.bb b/org.handhelds.familiar/packages/libmatchbox/libmatchbox_1.7.bb index afcf058..584c70e 100644 --- a/org.handhelds.familiar/packages/libmatchbox/libmatchbox_1.7.bb +++ b/org.handhelds.familiar/packages/libmatchbox/libmatchbox_1.7.bb @@ -1,5 +1,7 @@ include libmatchbox.inc +PR = "r2" + SRC_URI = "http://projects.o-hand.com/matchbox/sources/${PN}/${PV}/${PN}-${PV}.tar.gz \ file://check.m4" diff --git a/org.handhelds.familiar/packages/libpixman/libpixman_0.1.6.bb b/org.handhelds.familiar/packages/libpixman/libpixman_0.1.6.bb index 2d69d14..fead5f6 100644 --- a/org.handhelds.familiar/packages/libpixman/libpixman_0.1.6.bb +++ b/org.handhelds.familiar/packages/libpixman/libpixman_0.1.6.bb @@ -5,9 +5,10 @@ DEPENDS = "x11" DESCRIPTION = "Cairo support library" LICENSE = "X11" SRC_URI = "http://cairographics.org/snapshots/libpixman-${PV}.tar.gz" +PR = "r1" inherit autotools pkgconfig do_stage () { - oe_runmake install DESTDIR="" bindir=${STAGING_BINDIR} includedir=${STAGING_INCDIR} libdir=${STAGING_LIBDIR} prefix=${STAGING_DIR} + autotools_stage_all } diff --git a/org.handhelds.familiar/packages/libsm/libsm_6.0.3.bb b/org.handhelds.familiar/packages/libsm/libsm_6.0.3.bb index 6a85eaf..8067485 100644 --- a/org.handhelds.familiar/packages/libsm/libsm_6.0.3.bb +++ b/org.handhelds.familiar/packages/libsm/libsm_6.0.3.bb @@ -4,7 +4,7 @@ PRIORITY = "optional" MAINTAINER = "Phil Blundell " DEPENDS = "x11 ice" DESCRIPTION = "Session management library" -PR = "r1" +PR = "r2" SRC_URI = "${XLIBS_MIRROR}/libSM-${PV}.tar.bz2 \ file://autofoo.patch;patch=1" @@ -13,5 +13,5 @@ S = "${WORKDIR}/libSM-${PV}" inherit autotools pkgconfig do_stage () { - oe_runmake install DESTDIR="" bindir=${STAGING_BINDIR} includedir=${STAGING_INCDIR} libdir=${STAGING_LIBDIR} prefix=${STAGING_DIR} + autotools_stage_all } diff --git a/org.handhelds.familiar/packages/libxcursor/libxcursor_1.1.2.bb b/org.handhelds.familiar/packages/libxcursor/libxcursor_1.1.2.bb index d948ff5..4084fe4 100644 --- a/org.handhelds.familiar/packages/libxcursor/libxcursor_1.1.2.bb +++ b/org.handhelds.familiar/packages/libxcursor/libxcursor_1.1.2.bb @@ -4,7 +4,7 @@ PRIORITY = "optional" MAINTAINER = "Phil Blundell " DESCRIPTION = "X Cursor library" DEPENDS = "libxfixes" -PR = "r2" +PR = "r3" SRC_URI = "${XLIBS_MIRROR}/libXcursor-${PV}.tar.bz2 \ file://autofoo.patch;patch=1" @@ -14,10 +14,5 @@ FILES_${PN} += "${libdir}/libXcursor.so" inherit autotools pkgconfig do_stage() { - oe_runmake install prefix=${STAGING_DIR} \ - bindir=${STAGING_BINDIR} \ - includedir=${STAGING_INCDIR} \ - libdir=${STAGING_LIBDIR} \ - datadir=${STAGING_DATADIR} \ - mandir=${STAGING_DIR}/man + autotools_stage_all } diff --git a/org.handhelds.familiar/packages/libxfixes/libxfixes_2.0.1.bb b/org.handhelds.familiar/packages/libxfixes/libxfixes_2.0.1.bb index b6560b8..1905fbe 100644 --- a/org.handhelds.familiar/packages/libxfixes/libxfixes_2.0.1.bb +++ b/org.handhelds.familiar/packages/libxfixes/libxfixes_2.0.1.bb @@ -2,7 +2,7 @@ SECTION = "x11/libs" LICENSE= "BSD-X" DEPENDS = "x11 fixesext" DESCRIPTION = "X Fixes extension library." -PR = "r1" +PR = "r2" SRC_URI = "${XLIBS_MIRROR}/libXfixes-${PV}.tar.bz2 \ file://autofoo.patch;patch=1" @@ -11,9 +11,5 @@ S = "${WORKDIR}/libXfixes-${PV}" inherit autotools pkgconfig do_stage() { - oe_runmake install prefix=${STAGING_DIR} \ - bindir=${STAGING_BINDIR} \ - includedir=${STAGING_INCDIR} \ - libdir=${STAGING_LIBDIR} \ - datadir=${STAGING_DATADIR} + autotools_stage_all } diff --git a/org.handhelds.familiar/packages/libxft/libxft_2.1.6.bb b/org.handhelds.familiar/packages/libxft/libxft_2.1.6.bb index d7cb351..bcf8d29 100644 --- a/org.handhelds.familiar/packages/libxft/libxft_2.1.6.bb +++ b/org.handhelds.familiar/packages/libxft/libxft_2.1.6.bb @@ -3,7 +3,7 @@ LICENSE = "MIT-X" DEPENDS = "x11 xproto libxrender freetype fontconfig" DESCRIPTION = "X FreeType library. Client-side fonts with FreeType." PROVIDES = "xft" -PR = "r1" +PR = "r2" SRC_URI = "${XLIBS_MIRROR}/libXft-${PV}.tar.bz2 \ file://autofoo.patch;patch=1" @@ -17,12 +17,7 @@ FILES_${PN}-dev = ${includedir} ${libdir}/lib*.so ${libdir}/*.la \ inherit autotools pkgconfig do_stage() { - oe_runmake install prefix=${STAGING_DIR} \ - bindir=${STAGING_BINDIR} \ - includedir=${STAGING_INCDIR} \ - libdir=${STAGING_LIBDIR} \ - datadir=${STAGING_DATADIR} \ - mandir=${STAGING_DATADIR}/man + autotools_stage_all } python do_package() { diff --git a/org.handhelds.familiar/packages/libxrandr/libxrandr_1.0.2.bb b/org.handhelds.familiar/packages/libxrandr/libxrandr_1.0.2.bb index 8d64653..50bb62f 100644 --- a/org.handhelds.familiar/packages/libxrandr/libxrandr_1.0.2.bb +++ b/org.handhelds.familiar/packages/libxrandr/libxrandr_1.0.2.bb @@ -2,7 +2,7 @@ SECTION = "x11/libs" LICENSE = "BSD-X" DEPENDS = "randrext x11 libxrender xext" DESCRIPTION = "X Resize and Rotate extension library." -PR = "r1" +PR = "r2" SRC_URI = "${XLIBS_MIRROR}/libXrandr-${PV}.tar.bz2 \ file://autofoo.patch;patch=1" @@ -11,9 +11,5 @@ S = "${WORKDIR}/libXrandr-${PV}" inherit autotools pkgconfig do_stage() { - oe_runmake install prefix=${STAGING_DIR} \ - bindir=${STAGING_BINDIR} \ - includedir=${STAGING_INCDIR} \ - libdir=${STAGING_LIBDIR} \ - datadir=${STAGING_DATADIR} + autotools_stage_all } diff --git a/org.handhelds.familiar/packages/libxrender/libxrender_0.8.4.bb b/org.handhelds.familiar/packages/libxrender/libxrender_0.8.4.bb index 9257d5e..72d31b4 100644 --- a/org.handhelds.familiar/packages/libxrender/libxrender_0.8.4.bb +++ b/org.handhelds.familiar/packages/libxrender/libxrender_0.8.4.bb @@ -2,7 +2,7 @@ SECTION = "libs" DEPENDS = "renderext x11" DESCRIPTION = "X Render extension library." LICENSE = "BSD" -PR = "r1" +PR = "r2" SRC_URI = "${XLIBS_MIRROR}/libXrender-${PV}.tar.bz2 \ file://autofoo.patch;patch=1" @@ -11,9 +11,5 @@ S = "${WORKDIR}/libXrender-${PV}" inherit autotools pkgconfig do_stage() { - oe_runmake install prefix=${STAGING_DIR} \ - bindir=${STAGING_BINDIR} \ - includedir=${STAGING_INCDIR} \ - libdir=${STAGING_LIBDIR} \ - datadir=${STAGING_DATADIR} + autotools_stage_all } diff --git a/org.handhelds.familiar/packages/libxss/libxss_cvs.bb b/org.handhelds.familiar/packages/libxss/libxss_cvs.bb index 07e1ce3..50859b5 100644 --- a/org.handhelds.familiar/packages/libxss/libxss_cvs.bb +++ b/org.handhelds.familiar/packages/libxss/libxss_cvs.bb @@ -1,7 +1,7 @@ LICENSE = "GPL" PV = "0.0cvs${CVSDATE}" -PR = "r2" +PR = "r3" SECTION = "libs" DEPENDS = "x11 xext" @@ -15,10 +15,5 @@ inherit autotools pkgconfig #CFLAGS_append += " -I ${S}/include/X11/XprintUtil -I ${S}/include/X11/extensions" do_stage() { - oe_runmake install prefix=${STAGING_DIR} \ - bindir=${STAGING_BINDIR} \ - includedir=${STAGING_INCDIR} \ - libdir=${STAGING_LIBDIR} \ - datadir=${STAGING_DATADIR} \ - mandir=${STAGING_DATADIR}/man + autotools_stage_all } diff --git a/org.handhelds.familiar/packages/matchbox-desktop/matchbox-desktop_0.9.1.bb b/org.handhelds.familiar/packages/matchbox-desktop/matchbox-desktop_0.9.1.bb index 5e9748c..7b06921 100644 --- a/org.handhelds.familiar/packages/matchbox-desktop/matchbox-desktop_0.9.1.bb +++ b/org.handhelds.familiar/packages/matchbox-desktop/matchbox-desktop_0.9.1.bb @@ -2,7 +2,7 @@ DESCRIPTION = "Matchbox Window Manager Desktop" LICENSE = "GPL" DEPENDS = "libmatchbox startup-notification" SECTION = "x11/wm" -PR = "r1" +PR = "r2" SRC_URI = "http://projects.o-hand.com/matchbox/sources/matchbox-desktop/0.9/matchbox-desktop-${PV}.tar.bz2 \ file://mb-desktop-multi-category-matching.patch;patch=1" diff --git a/org.handhelds.familiar/packages/pango/pango_1.8.1.bb b/org.handhelds.familiar/packages/pango/pango_1.8.1.bb index 8180710..fbc27d1 100644 --- a/org.handhelds.familiar/packages/pango/pango_1.8.1.bb +++ b/org.handhelds.familiar/packages/pango/pango_1.8.1.bb @@ -5,7 +5,7 @@ DEPENDS = "glib-2.0 fontconfig freetype zlib x11 libxft xt gtk-doc" DESCRIPTION = "The goal of the Pango project is to provide an \ Open Source framework for the layout and rendering of \ internationalized text." -PR = "r2" +PR = "r3" # seems to go wrong with default cflags FULL_OPTIMIZATION_arm = "-O2" diff --git a/org.handhelds.familiar/packages/startup-notification/startup-notification_0.8.bb b/org.handhelds.familiar/packages/startup-notification/startup-notification_0.8.bb index c4cc574..e942046 100644 --- a/org.handhelds.familiar/packages/startup-notification/startup-notification_0.8.bb +++ b/org.handhelds.familiar/packages/startup-notification/startup-notification_0.8.bb @@ -4,11 +4,13 @@ SECTION = "libs" PRIORITY = "optional" MAINTAINER = "Phil Blundell " DEPENDS = "x11" +PR = "r1" inherit autotools pkgconfig SRC_URI = "http://www.freedesktop.org/software/startup-notification/releases/startup-notification-0.8.tar.gz" do_stage () { - oe_runmake install DESTDIR="" bindir=${STAGING_BINDIR} includedir=${STAGING_INCDIR} libdir=${STAGING_LIBDIR} prefix=${STAGING_DIR} + autotools_stage_all } + diff --git a/org.handhelds.familiar/packages/x11/x11_6.2.1.bb b/org.handhelds.familiar/packages/x11/x11_6.2.1.bb index 121c1dd..b1de21c 100644 --- a/org.handhelds.familiar/packages/x11/x11_6.2.1.bb +++ b/org.handhelds.familiar/packages/x11/x11_6.2.1.bb @@ -7,7 +7,7 @@ DESCRIPTION = "Base X libs." FILES_${PN} += "${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB" FILES_${PN}-locale += "${datadir}/X11/locale" PROVIDES = "x11" -PR = "r3" +PR = "r4" SRC_URI = "${XLIBS_MIRROR}/libX11-${PV}.tar.bz2 \ file://errordb-keysymdb-path-fix.patch;patch=1 \ diff --git a/org.handhelds.familiar/packages/xau/xau_0.1.1.bb b/org.handhelds.familiar/packages/xau/xau_0.1.1.bb index aa2c0ec..7b95419 100644 --- a/org.handhelds.familiar/packages/xau/xau_0.1.1.bb +++ b/org.handhelds.familiar/packages/xau/xau_0.1.1.bb @@ -4,7 +4,7 @@ PRIORITY = "optional" MAINTAINER = "Greg Gilbert " DEPENDS = "xproto" DESCRIPTION = "Authorization Protocol for X." -PR = "r1" +PR = "r2" SRC_URI = "${XLIBS_MIRROR}/libXau-${PV}.tar.bz2 \ file://autofoo.patch;patch=1" @@ -13,9 +13,5 @@ S = "${WORKDIR}/libXau-${PV}" inherit autotools pkgconfig do_stage() { - oe_runmake install prefix=${STAGING_DIR} \ - bindir=${STAGING_BINDIR} \ - includedir=${STAGING_INCDIR} \ - libdir=${STAGING_LIBDIR} \ - datadir=${STAGING_DATADIR} + autotools_stage_all } diff --git a/org.handhelds.familiar/packages/xcalibrate/xcalibrate_cvs.bb b/org.handhelds.familiar/packages/xcalibrate/xcalibrate_cvs.bb index 5436bf2..8c408ff 100644 --- a/org.handhelds.familiar/packages/xcalibrate/xcalibrate_cvs.bb +++ b/org.handhelds.familiar/packages/xcalibrate/xcalibrate_cvs.bb @@ -5,6 +5,7 @@ PRIORITY = "optional" MAINTAINER = "Phil Blundell " DEPENDS = "x11 xcalibrateext xext" DESCRIPTION = "XCalibrate client-side library" +PR = "r1" SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xlibs;module=XCalibrate" S = "${WORKDIR}/XCalibrate" @@ -12,9 +13,5 @@ S = "${WORKDIR}/XCalibrate" inherit autotools pkgconfig do_stage() { - oe_runmake install prefix=${STAGING_DIR} \ - bindir=${STAGING_BINDIR} \ - includedir=${STAGING_INCDIR} \ - libdir=${STAGING_LIBDIR} \ - datadir=${STAGING_DATADIR} + autotools_stage_all } diff --git a/org.handhelds.familiar/packages/xcomposite/xcomposite_1.0.1.bb b/org.handhelds.familiar/packages/xcomposite/xcomposite_1.0.1.bb index 1e8d96c..bdd3426 100644 --- a/org.handhelds.familiar/packages/xcomposite/xcomposite_1.0.1.bb +++ b/org.handhelds.familiar/packages/xcomposite/xcomposite_1.0.1.bb @@ -2,7 +2,7 @@ SECTION = "x11/libs" LICENSE= "BSD-X" DEPENDS = "x11 compositeext xextensions libxfixes" DESCRIPTION = "X Composite extension library." -PR = "r1" +PR = "r2" SRC_URI = "${XLIBS_MIRROR}/libXcomposite-${PV}.tar.bz2 \ file://autofoo.patch;patch=1" @@ -11,9 +11,5 @@ S = "${WORKDIR}/libXcomposite-${PV}" inherit autotools pkgconfig do_stage() { - oe_runmake install prefix=${STAGING_DIR} \ - bindir=${STAGING_BINDIR} \ - includedir=${STAGING_INCDIR} \ - libdir=${STAGING_LIBDIR} \ - datadir=${STAGING_DATADIR} + autotools_stage_all } diff --git a/org.handhelds.familiar/packages/xdamage/xdamage_1.0.1.bb b/org.handhelds.familiar/packages/xdamage/xdamage_1.0.1.bb index c8a4189..990ae6a 100644 --- a/org.handhelds.familiar/packages/xdamage/xdamage_1.0.1.bb +++ b/org.handhelds.familiar/packages/xdamage/xdamage_1.0.1.bb @@ -2,7 +2,7 @@ SECTION = "x11/libs" LICENSE= "BSD-X" DEPENDS = "x11 damageext libxfixes xproto" DESCRIPTION = "X Damage extension library." -PR = "r1" +PR = "r2" SRC_URI = "${XLIBS_MIRROR}/libXdamage-${PV}.tar.bz2 \ file://m4.patch;patch=1 \ @@ -12,9 +12,5 @@ S = "${WORKDIR}/libXdamage-${PV}" inherit autotools pkgconfig do_stage() { - oe_runmake install prefix=${STAGING_DIR} \ - bindir=${STAGING_BINDIR} \ - includedir=${STAGING_INCDIR} \ - libdir=${STAGING_LIBDIR} \ - datadir=${STAGING_DATADIR} + autotools_stage_all } diff --git a/org.handhelds.familiar/packages/xdmcp/libxdmcp_0.1.3.bb b/org.handhelds.familiar/packages/xdmcp/libxdmcp_0.1.3.bb index 60d74e9..f74ae50 100644 --- a/org.handhelds.familiar/packages/xdmcp/libxdmcp_0.1.3.bb +++ b/org.handhelds.familiar/packages/xdmcp/libxdmcp_0.1.3.bb @@ -5,7 +5,7 @@ MAINTAINER = "Greg Gilbert " DEPENDS = "xproto" PROVIDES = "xdmcp" DESCRIPTION = "X Display Manager Control Protocol library." -PR = "r1" +PR = "r2" S = "${WORKDIR}/libXdmcp-${PV}" SRC_URI = "${XLIBS_MIRROR}/libXdmcp-${PV}.tar.bz2 \ @@ -14,9 +14,5 @@ SRC_URI = "${XLIBS_MIRROR}/libXdmcp-${PV}.tar.bz2 \ inherit autotools pkgconfig do_stage() { - oe_runmake install prefix=${STAGING_DIR} \ - bindir=${STAGING_BINDIR} \ - includedir=${STAGING_INCDIR} \ - libdir=${STAGING_LIBDIR} \ - datadir=${STAGING_DATADIR} + autotools_stage_all } diff --git a/org.handhelds.familiar/packages/xext/xext_cvs.bb b/org.handhelds.familiar/packages/xext/xext_cvs.bb index e9f3301..a0773fa 100644 --- a/org.handhelds.familiar/packages/xext/xext_cvs.bb +++ b/org.handhelds.familiar/packages/xext/xext_cvs.bb @@ -1,5 +1,5 @@ PV = "0.0cvs${CVSDATE}" -PR = "r1" +PR = "r2" LICENSE= "MIT" DESCRIPTION = "X Server Extension library" SECTION = "x11/libs" @@ -12,10 +12,5 @@ S = "${WORKDIR}/Xext" inherit autotools pkgconfig do_stage() { - oe_runmake install prefix=${STAGING_DIR} \ - bindir=${STAGING_BINDIR} \ - includedir=${STAGING_INCDIR} \ - libdir=${STAGING_LIBDIR} \ - datadir=${STAGING_DATADIR} \ - mandir=${STAGING_DATADIR}/man + autotools_stage_all } diff --git a/org.handhelds.familiar/packages/xfont/xfont_1.4.2.bb b/org.handhelds.familiar/packages/xfont/xfont_1.4.2.bb index 9f87207..630bdb1 100644 --- a/org.handhelds.familiar/packages/xfont/xfont_1.4.2.bb +++ b/org.handhelds.familiar/packages/xfont/xfont_1.4.2.bb @@ -4,7 +4,7 @@ PRIORITY = "optional" MAINTAINER = "Greg Gilbert " DEPENDS = "xproto xtrans zlib" DESCRIPTION = "X font library (used by the X server)." -PR = "r2" +PR = "r3" SRC_URI = "${XLIBS_MIRROR}/libXfont-${PV}.tar.bz2 \ file://scalable.patch;patch=1 \ @@ -14,9 +14,5 @@ S = "${WORKDIR}/libXfont-${PV}" inherit autotools pkgconfig do_stage() { - oe_runmake install prefix=${STAGING_DIR} \ - bindir=${STAGING_BINDIR} \ - includedir=${STAGING_INCDIR} \ - libdir=${STAGING_LIBDIR} \ - datadir=${STAGING_DATADIR} + autotools_stage_all } diff --git a/org.handhelds.familiar/packages/xmu/xmu_cvs.bb b/org.handhelds.familiar/packages/xmu/xmu_cvs.bb index c7e5f84..d564442 100644 --- a/org.handhelds.familiar/packages/xmu/xmu_cvs.bb +++ b/org.handhelds.familiar/packages/xmu/xmu_cvs.bb @@ -4,7 +4,7 @@ SECTION = "x11/libs" PRIORITY = "optional" MAINTAINER = "Phil Blundell " DEPENDS = "xt xext" -PR = "r2" +PR = "r3" SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xlibs;module=Xmu" S = "${WORKDIR}/Xmu" @@ -17,5 +17,5 @@ FILES_xmuu-dev = "${libdir}/libXmuu.so" inherit autotools pkgconfig do_stage () { - oe_runmake install DESTDIR="" bindir=${STAGING_BINDIR} includedir=${STAGING_INCDIR} libdir=${STAGING_LIBDIR} prefix=${STAGING_DIR} + autotools_stage_all } diff --git a/org.handhelds.familiar/packages/xserver/xserver-kdrive_20050207.bb b/org.handhelds.familiar/packages/xserver/xserver-kdrive_20050207.bb index d44731f..15d7654 100644 --- a/org.handhelds.familiar/packages/xserver/xserver-kdrive_20050207.bb +++ b/org.handhelds.familiar/packages/xserver/xserver-kdrive_20050207.bb @@ -20,7 +20,7 @@ DESCRIPTION_xserver-kdrive-epson = "X server from freedesktop.org, supporting Ep DESCRIPTION_xserver-kdrive-fake = "Fake X server" DESCRIPTION_xserver-kdrive-xephyr = "X server in an X window" -PR = "r9" +PR = "r10" FILES_xserver-kdrive-fbdev = "${bindir}/Xfbdev" FILES_xserver-kdrive-ati = "${bindir}/Xati" diff --git a/org.handhelds.familiar/packages/xt/xt_0.1.5.bb b/org.handhelds.familiar/packages/xt/xt_0.1.5.bb index 1d0d794..afa4d19 100644 --- a/org.handhelds.familiar/packages/xt/xt_0.1.5.bb +++ b/org.handhelds.familiar/packages/xt/xt_0.1.5.bb @@ -4,7 +4,7 @@ MAINTAINER = "Phil Blundell " DEPENDS = "x11 libsm" DESCRIPTION = "X Toolkit Intrinsics" LICENSE = "X-MIT" -PR = "r1" +PR = "r2" SRC_URI = "${XLIBS_MIRROR}/libXt-${PV}.tar.bz2 \ file://autofoo.patch;patch=1" S = "${WORKDIR}/libXt-${PV}" @@ -24,5 +24,5 @@ do_compile() { } do_stage () { - oe_runmake install DESTDIR="" bindir=${STAGING_BINDIR} includedir=${STAGING_INCDIR} libdir=${STAGING_LIBDIR} prefix=${STAGING_DIR} + autotools_stage_all } diff --git a/org.handhelds.familiar/packages/xtst/xtst_cvs.bb b/org.handhelds.familiar/packages/xtst/xtst_cvs.bb index 29119df..19344d8 100644 --- a/org.handhelds.familiar/packages/xtst/xtst_cvs.bb +++ b/org.handhelds.familiar/packages/xtst/xtst_cvs.bb @@ -5,7 +5,7 @@ PRIORITY = "optional" MAINTAINER = "Phil Blundell " DEPENDS = "x11 recordext xext" DESCRIPTION = "X Test Extension: client side library" -PR = "r3" +PR = "r4" SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xlibs;module=Xtst" S = "${WORKDIR}/Xtst" @@ -13,9 +13,5 @@ S = "${WORKDIR}/Xtst" inherit autotools pkgconfig do_stage() { - oe_runmake install prefix=${STAGING_DIR} \ - bindir=${STAGING_BINDIR} \ - includedir=${STAGING_INCDIR} \ - libdir=${STAGING_LIBDIR} \ - datadir=${STAGING_DATADIR} + autotools_stage_all } -- 2.41.1