[oe-commits] : gconf: fix compilation for version 2.6.1
OE GIT Trial
gittrial at amethyst.openembedded.net
Wed Aug 6 00:29:06 UTC 2008
Module: OE.dev
Branch: org.openembedded.dev
Commit: 4eac8f8b4279033c1e690316159fffeda41245c5
URL: http://gitweb.openembedded.net//OE.dev.git/?a=commit;h=4eac8f8b4279033c1e690316159fffeda41245c5
Author: <Laibsch at openembedded.org>
Date: Tue Aug 5 15:10:37 2008 +0000
gconf: fix compilation for version 2.6.1
* remove autotools_stage_all. For some reason it does not work
* I would have thought that FILES_${PN}-dbg and FILES_gconf-dbg are the same
for the gconf package. bitbake seems to think otherwise, so I'm renaming
to actually fix bug 3505.
---
packages/gnome/gconf_2.6.1.bb | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/packages/gnome/gconf_2.6.1.bb b/packages/gnome/gconf_2.6.1.bb
index fc2089e..9b9db4a 100644
--- a/packages/gnome/gconf_2.6.1.bb
+++ b/packages/gnome/gconf_2.6.1.bb
@@ -3,7 +3,7 @@ SECTION = "x11/gnome"
LICENSE = "LGPL"
DEPENDS = "orbit2 glib-2.0 libxml2"
ORBIT_IDL_SRC = "${STAGING_BINDIR_NATIVE}/orbit-idl-2"
-PR = "r1"
+PR = "r2"
S = "${WORKDIR}/GConf-${PV}"
@@ -20,7 +20,10 @@ do_compile() {
}
do_stage() {
- autotools_stage_all
+ oe_libinstall -so -C gconf libgconf-2 ${STAGING_LIBDIR}
+ install -d ${STAGING_INCDIR}/gconf/2/gconf/
+ ( cd gconf; for i in ${HEADERS}; do install -m 0644 $i ${STAGING_INCDIR}/gconf/2/gconf/$i; done )
+ install -m 0644 gconf.m4 ${STAGING_DATADIR}/aclocal/gconf-2.m4
}
do_install() {
@@ -28,4 +31,4 @@ do_install() {
}
FILES_${PN} += " ${libdir}/GConf/*"
-FILES_gconf-dbg += "${libdir}/*/*/.debug"
+FILES_${PN}-dbg += "${libdir}/*/*/.debug"
More information about the Openembedded-commits
mailing list