diff options
| -rw-r--r-- | glib-2.0/glib-2.0-native_2.4.1.oe | 5 | ||||
| -rw-r--r-- | glib-2.0/glib-2.0_2.4.1.oe | 11 | ||||
| -rw-r--r-- | gnome/orbit2-2.10.2/gtk-doc.make | 0 | ||||
| -rw-r--r-- | gnome/orbit2-native_2.10.2.oe | 4 | ||||
| -rw-r--r-- | gnome/orbit2_2.10.2.oe | 6 | ||||
| -rw-r--r-- | xserver/xserver-xorg_cvs.oe | 0 |
6 files changed, 18 insertions, 8 deletions
diff --git a/glib-2.0/glib-2.0-native_2.4.1.oe b/glib-2.0/glib-2.0-native_2.4.1.oe index 81fd512989..81fbeda10f 100644 --- a/glib-2.0/glib-2.0-native_2.4.1.oe +++ b/glib-2.0/glib-2.0-native_2.4.1.oe @@ -99,8 +99,9 @@ do_stage () { install -m 0644 ${S}/gobject/gvaluetypes.h ${STAGING_INCDIR}/glib-2.0/gobject/gvaluetypes.h install -m 0644 ${S}/gobject/gobjectnotifyqueue.c ${STAGING_INCDIR}/glib-2.0/gobject/gobjectnotifyqueue.c install -m 0644 ${S}/gobject/gmarshal.h ${STAGING_INCDIR}/glib-2.0/gobject/gmarshal.h - install -m 0644 ${S}/m4macros/glib-2.0.m4 ${STAGING_DATADIR}/aclocal/ - install -m 0644 ${S}/m4macros/glib-gettext.m4 ${STAGING_DATADIR}/aclocal/ + install -d ${STAGING_DATADIR}/aclocal + install -m 0644 ${S}/m4macros/glib-2.0.m4 ${STAGING_DATADIR}/aclocal/glib-2.0.m4 + install -m 0644 ${S}/m4macros/glib-gettext.m4 ${STAGING_DATADIR}/aclocal/glib-gettext.m4 } do_install () { diff --git a/glib-2.0/glib-2.0_2.4.1.oe b/glib-2.0/glib-2.0_2.4.1.oe index cba1903851..c0c984d7db 100644 --- a/glib-2.0/glib-2.0_2.4.1.oe +++ b/glib-2.0/glib-2.0_2.4.1.oe @@ -7,6 +7,10 @@ SECTION = "libs" PRIORITY = "optional" MAINTAINER = "Philip Blundell <pb@handhelds.org>" DEPENDS = "virtual/libc glib-2.0-native" +PACKAGES =+ "glib-2.0-utils " + +LEAD_SONAME = "libglib-2.0.*" +FILES_glib-2.0-utils = "${bindir}/*" EXTRA_OECONF = "--disable-debug" @@ -16,7 +20,7 @@ SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.4/glib-${PV}.tar.bz2 \ S = "${WORKDIR}/glib-${PV}" -inherit autotools pkgconfig +inherit autotools pkgconfig acpaths = "" do_configure_prepend () { @@ -96,6 +100,7 @@ do_stage () { install -m 0644 ${S}/gobject/gvaluetypes.h ${STAGING_INCDIR}/glib-2.0/gobject/gvaluetypes.h install -m 0644 ${S}/gobject/gobjectnotifyqueue.c ${STAGING_INCDIR}/glib-2.0/gobject/gobjectnotifyqueue.c install -m 0644 ${S}/gobject/gmarshal.h ${STAGING_INCDIR}/glib-2.0/gobject/gmarshal.h - install -m 0644 ${S}/m4macros/glib-2.0.m4 ${STAGING_DATADIR}/aclocal/ - install -m 0644 ${S}/m4macros/glib-gettext.m4 ${STAGING_DATADIR}/aclocal/ + install -d ${STAGING_DATADIR}/aclocal + install -m 0644 ${S}/m4macros/glib-2.0.m4 ${STAGING_DATADIR}/aclocal/glib-2.0.m4 + install -m 0644 ${S}/m4macros/glib-gettext.m4 ${STAGING_DATADIR}/aclocal/glib-gettext.m4 } diff --git a/gnome/orbit2-2.10.2/gtk-doc.make b/gnome/orbit2-2.10.2/gtk-doc.make new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/gnome/orbit2-2.10.2/gtk-doc.make diff --git a/gnome/orbit2-native_2.10.2.oe b/gnome/orbit2-native_2.10.2.oe index e34bdfb0d2..7f32dd3e6f 100644 --- a/gnome/orbit2-native_2.10.2.oe +++ b/gnome/orbit2-native_2.10.2.oe @@ -2,15 +2,17 @@ DESCRIPTION = "CORBA ORB" SECTION = "gnome/base" SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/ORBit2/2.10/ORBit2-${PV}.tar.bz2 \ file://${FILESDIR}/gtk-doc.m4 \ + file://${FILESDIR}/gtk-doc.make \ file://${FILESDIR}/configure-lossage.patch;patch=1;pnum=1" DEPENDS = "libidl-native popt-native" S = "${WORKDIR}/ORBit2-${PV}" FILESDIR = "${@os.path.dirname(oe.data.getVar('FILE',d,1))}/orbit2-${PV}" -inherit native +inherit autotools native do_configure_prepend() { install -d m4 install ${FILESDIR}/gtk-doc.m4 m4/ + install ${FILESDIR}/gtk-doc.make ./ } diff --git a/gnome/orbit2_2.10.2.oe b/gnome/orbit2_2.10.2.oe index d538807569..fa9ce0e0fd 100644 --- a/gnome/orbit2_2.10.2.oe +++ b/gnome/orbit2_2.10.2.oe @@ -2,12 +2,13 @@ DESCRIPTION = "CORBA ORB" SECTION = "gnome/base" SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/ORBit2/2.10/ORBit2-${PV}.tar.bz2 \ file://${FILESDIR}/gtk-doc.m4 \ + file://${FILESDIR}/gtk-doc.make \ file://${FILESDIR}/configure-lossage.patch;patch=1;pnum=1" DEPENDS = "libidl popt orbit2-native" S = "${WORKDIR}/ORBit2-${PV}" -inherit autotools pkgconfig +inherit autotools pkgconfig do_compile() { oe_runmake IDL_COMPILER="`which orbit-idl-2`" @@ -16,13 +17,14 @@ do_compile() { do_configure_prepend() { install -d m4 install ${FILESDIR}/gtk-doc.m4 m4/ + install ${FILESDIR}/gtk-doc.make ./ } do_stage() { oe_libinstall -so -C src/orb libORBit-2 ${STAGING_LIBDIR} oe_libinstall -so -C src/services/name libORBitCosNaming-2 ${STAGING_LIBDIR} - oe_libinstall -a -C src/services/name libname-server-2 ${STAGING_LIBDIR} oe_libinstall -so -C src/services/imodule libORBit-imodule-2 ${STAGING_LIBDIR} + install -m 0644 src/services/name/libname-server-2.a ${STAGING_LIBDIR}/ for dir in orbit orbit/poa orbit/orb-core orbit/util orbit/dynamic; do install -d ${STAGING_INCDIR}/orbit-2.0/$dir diff --git a/xserver/xserver-xorg_cvs.oe b/xserver/xserver-xorg_cvs.oe new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/xserver/xserver-xorg_cvs.oe |