diff options
| author | Richard Purdie <rpurdie@rpsys.net> | 2007-08-08 21:38:40 +0000 |
|---|---|---|
| committer | Richard Purdie <rpurdie@rpsys.net> | 2007-08-08 21:38:40 +0000 |
| commit | dcbb746bfb540d16d547b2b5b3477f7434fb85ac (patch) | |
| tree | f6e535d2afc71ea8ca763d1ebd292c40f73fcdc0 /conf | |
| parent | d9e16f02594b391b5e04f960b38e19d48f564d08 (diff) | |
bitbake.conf: Merge in section and dependency setting for -dbg and -dev packages (from poky). Start to allow multiple entries in PKG_CONFIG_PATH (from poky)
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/bitbake.conf | 19 |
1 files changed, 15 insertions, 4 deletions
diff --git a/conf/bitbake.conf b/conf/bitbake.conf index 19910d32e7..3b60983bcc 100644 --- a/conf/bitbake.conf +++ b/conf/bitbake.conf @@ -110,23 +110,33 @@ RPROVIDES = "" PACKAGES = "${PN}-dbg ${PN} ${PN}-doc ${PN}-dev ${PN}-locale" FILES = "" + FILES_${PN} = "${bindir}/* ${sbindir}/* ${libexecdir}/* ${libdir}/lib*.so.* \ ${sysconfdir} ${sharedstatedir} ${localstatedir} \ /bin/* /sbin/* /lib/*.so* ${datadir}/${PN} ${libdir}/${PN}/* \ ${datadir}/pixmaps ${datadir}/applications \ ${datadir}/idl ${datadir}/omf ${datadir}/sounds \ ${libdir}/bonobo/servers" -SECTION_${PN}-doc = "doc" + FILES_${PN}-doc = "${docdir} ${mandir} ${infodir} ${datadir}/gtk-doc \ ${datadir}/gnome/help" -SECTION_${PN}-dev = "devel" +SECTION_${PN}-doc = "doc" + FILES_${PN}-dev = "${includedir} ${libdir}/lib*.so ${libdir}/*.la \ ${libdir}/*.a ${libdir}/*.o ${libdir}/pkgconfig \ /lib/*.a /lib/*.o ${datadir}/aclocal" -FILES_${PN}-locale = "${datadir}/locale" +SECTION_${PN}-dev = "devel" +ALLOW_EMPTY_${PN}-dev = "1" +RDEPENDS_${PN}-dev = "${@['', '${PN} (>= ${PV})'][packaged(bb.data.getVar('PN', d, 1), d) == True]}" + FILES_${PN}-dbg = "${bindir}/.debug ${sbindir}/.debug ${libexecdir}/.debug ${libdir}/.debug \ /bin/.debug /sbin/.debug /lib/.debug ${libdir}/${PN}/.debug \ ${libdir}/matchbox-panel/.debug" +SECTION_${PN}-dbg = "devel" +ALLOW_EMPTY_${PN}-dbg = "1" +RRECOMMENDS_${PN}-dbg = "${@['', '${PN} (>= ${PV})'][packaged(bb.data.getVar('PN', d, 1), d) == True]}" + +FILES_${PN}-locale = "${datadir}/locale" # File manifest @@ -414,7 +424,8 @@ SLOT = "0" # Other -export PKG_CONFIG_PATH = "${STAGING_LIBDIR}/pkgconfig" +export PKG_CONFIG_DIR = "${STAGING_LIBDIR}/pkgconfig" +export PKG_CONFIG_PATH = "${PKG_CONFIG_DIR}" export PKG_CONFIG_DISABLE_UNINSTALLED = "yes" export QMAKE_MKSPEC_PATH = "${STAGING_DIR}/${BUILD_SYS}/share/qmake" |