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

diff --git a/gnome/gconf_2.6.1.oe b/gnome/gconf_2.6.1.oe
index f17592c..a326e3f 100644 (file)
--- 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 5ec1607..ce1f22e 100644 (file)
--- 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 63c9530..a4b918f 100644 (file)
--- 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}