diff options
| author | Michael Lauer <mickey@vanille-media.de> | 2004-05-13 22:32:40 +0000 |
|---|---|---|
| committer | Michael Lauer <mickey@vanille-media.de> | 2004-05-13 22:32:40 +0000 |
| commit | 8aef67dcbdae874cb409af3869bc18009789ff57 (patch) | |
| tree | 9712ddca53bff9e6f6fe2379a160ac4fa76f15bc /gnome | |
| parent | d05d947fa47cbfcef76b28d3e50b62c8016a88c6 (diff) | |
Merge ssh://pb_@gandalf.tm.informatik.uni-frankfurt.de/packages
into allanon.vanille.de:/usr/local/projects/oe-packages
2004/05/13 23:33:05+02:00 uni-frankfurt.de!pb_
staging tweaks, and put binaries in glib-2.0-utils
2004/05/13 23:24:50+02:00 uni-frankfurt.de!pb_
add xserver-xorg
2004/05/13 09:07:09+02:00 uni-frankfurt.de!pb_
ORBit2 fixes
BKrev: 40a3f788F0fJkbHTDtLm--13yauHMA
Diffstat (limited to 'gnome')
| -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 |
3 files changed, 7 insertions, 3 deletions
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 |