diff options
| author |   Phil Blundell <philb@gnu.org> | 2004-06-03 17:09:05 +0000 |
|---|---|---|
| committer | Phil Blundell <philb@gnu.org> | 2004-06-03 17:09:05 +0000 |
| commit | c0f408c18665e3f3f4e61237db2f7f9172614a1d (patch) | |
| tree | 37db3d19958c25a83c61f2144f98b5314ffafd57 | |
| parent | 64fdb6ef1c26be02dc9a29b74e65f46ea6abc5a2 (diff) | |
| download | openembedded-c0f408c18665e3f3f4e61237db2f7f9172614a1d.tar.gz | |
Merge bk://openembedded@openembedded.bkbits.net/packages
into gandalf.tm.informatik.uni-frankfurt.de:/home/pb_/packages
2004/06/03 19:09:01+02:00 uni-frankfurt.de!pb_
try to fix some gnome build issues
BKrev: 40bf5b31ApqZYFkfC9NzXZ315is-kg
| -rw-r--r-- | gnome/gconf_2.6.1.oe | 2 | ||||
| -rw-r--r-- | gnome/orbit2-native_2.10.2.oe | 14 | ||||
| -rw-r--r-- | gnome/orbit2_2.10.2.oe | 18 |
3 files changed, 19 insertions, 15 deletions
diff --git a/gnome/gconf_2.6.1.oe b/gnome/gconf_2.6.1.oe index f17592c77c..a326e3f27a 100644 --- a/gnome/gconf_2.6.1.oe +++ b/gnome/gconf_2.6.1.oe @@ -2,7 +2,7 @@ SECTION = "gnome/base" DESCRIPTION = "GNOME configuration database system" SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/GConf/2.6/GConf-${PV}.tar.bz2 \ file://backends.patch;patch=1" -DEPENDS = "orbit2 glib-2.0 gettext" +DEPENDS = "orbit2 glib-2.0 gettext-native" FILES_${PN} += " ${libdir}/GConf/*" diff --git a/gnome/orbit2-native_2.10.2.oe b/gnome/orbit2-native_2.10.2.oe index 5ec1607d88..ce1f22e438 100644 --- a/gnome/orbit2-native_2.10.2.oe +++ b/gnome/orbit2-native_2.10.2.oe @@ -2,17 +2,19 @@ DESCRIPTION = "CORBA ORB" SECTION = "gnome/base" SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/ORBit2/2.10/ORBit2-${PV}.tar.bz2 \ file://configure-lossage.patch;patch=1;pnum=1 \ - file://gtk-doc.m4 \ - file://gtk-doc.make" -DEPENDS = "libidl-native popt-native" + file://gtk-doc.m4 \ + file://gtk-doc.make" +DEPENDS = "libidl-native popt-native gtk-doc" S = "${WORKDIR}/ORBit2-${PV}" FILESDIR = "${@os.path.dirname(oe.data.getVar('FILE',d,1))}/orbit2-${PV}" -inherit autotools native +inherit autotools native pkgconfig + +EXTRA_OECONF = "--disable-gtk-doc" do_configure_prepend() { - install -d m4 - install ${WORKDIR}/gtk-doc.m4 m4/ + mkdir -p m4 + install ${WORKDIR}/gtk-doc.m4 ./m4/ install ${WORKDIR}/gtk-doc.make ./ } diff --git a/gnome/orbit2_2.10.2.oe b/gnome/orbit2_2.10.2.oe index 63c95301da..a4b918f456 100644 --- a/gnome/orbit2_2.10.2.oe +++ b/gnome/orbit2_2.10.2.oe @@ -2,24 +2,26 @@ DESCRIPTION = "CORBA ORB" SECTION = "gnome/base" SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/ORBit2/2.10/ORBit2-${PV}.tar.bz2 \ file://configure-lossage.patch;patch=1;pnum=1 \ - file://gtk-doc.m4 \ - file://gtk-doc.make" -DEPENDS = "libidl popt orbit2-native" + file://gtk-doc.m4 \ + file://gtk-doc.make" +DEPENDS = "libidl popt orbit2-native gtk-doc" S = "${WORKDIR}/ORBit2-${PV}" inherit autotools pkgconfig -do_compile() { - oe_runmake IDL_COMPILER="`which orbit-idl-2`" -} +EXTRA_OECONF = "--disable-gtk-doc" do_configure_prepend() { - install -d m4 - install ${WORKDIR}/gtk-doc.m4 m4/ + mkdir -p m4 + install ${WORKDIR}/gtk-doc.m4 ./m4/ install ${WORKDIR}/gtk-doc.make ./ } +do_compile() { + oe_runmake IDL_COMPILER="`which orbit-idl-2`" +} + do_stage() { oe_libinstall -so -C src/orb libORBit-2 ${STAGING_LIBDIR} oe_libinstall -so -C src/services/name libORBitCosNaming-2 ${STAGING_LIBDIR} |