diff options
| author | Richard Purdie <richard@openedhand.com> | 2008-02-11 23:01:28 +0000 |
|---|---|---|
| committer | Richard Purdie <richard@openedhand.com> | 2008-02-11 23:01:28 +0000 |
| commit | fbd561a1f65518a076eed7de0539389d913259d3 (patch) | |
| tree | dd440202539661811c0932a6828a59b717c0b8be /meta/conf | |
| parent | c47528db49c58374a8e8541a9aa83c0f5b12f9be (diff) | |
| download | openembedded-core-fbd561a1f65518a076eed7de0539389d913259d3.tar.gz openembedded-core-fbd561a1f65518a076eed7de0539389d913259d3.tar.bz2 openembedded-core-fbd561a1f65518a076eed7de0539389d913259d3.zip | |
bitbake.conf: Account for different shared library extensions on darwin in default FILES expressions, add layout_base_prefix to some extra layout variables
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@3774 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta/conf')
| -rw-r--r-- | meta/conf/bitbake.conf | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index 1e6fc19b73..455fc29ce4 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf @@ -13,9 +13,9 @@ layout_base_sbindir = "${layout_base_prefix}/sbin" layout_base_libdir = "${layout_base_prefix}/lib" # Architecture independent paths -layout_sysconfdir = "/etc" -layout_localstatedir = "/var" -layout_servicedir = "/srv" +layout_sysconfdir = "${layout_base_prefix}/etc" +layout_localstatedir = "${layout_base_prefix}/var" +layout_servicedir = "${layout_base_prefix}/srv" layout_sharedstatedir = "${layout_prefix}/com" layout_datadir = "${layout_prefix}/share" layout_infodir = "${layout_datadir}/info" @@ -159,12 +159,17 @@ RPROVIDES = "" MULTI_PROVIDER_WHITELIST = "virtual/libintl" +SOLIBS = ".so.*" +SOLIBS_darwin = ".*.dylib" +SOLIBSDEV = ".so" +SOLIBSDEV_darwin = ".dylib" + PACKAGES = "${PN}-dbg ${PN} ${PN}-doc ${PN}-dev ${PN}-locale" FILES = "" -FILES_${PN} = "${bindir}/* ${sbindir}/* ${libexecdir}/* ${libdir}/lib*.so.* \ +FILES_${PN} = "${bindir}/* ${sbindir}/* ${libexecdir}/* ${libdir}/lib*${SOLIBS} \ ${sysconfdir} ${sharedstatedir} ${localstatedir} \ - ${base_bindir}/* ${base_sbindir}/* ${base_libdir}/*.so* ${datadir}/${PN} ${libdir}/${PN}/* \ + ${base_bindir}/* ${base_sbindir}/* ${base_libdir}/${SOLIBS} ${datadir}/${PN} ${libdir}/${PN}/* \ ${datadir}/pixmaps ${datadir}/applications \ ${datadir}/idl ${datadir}/omf ${datadir}/sounds \ ${libdir}/bonobo/servers" @@ -173,7 +178,7 @@ FILES_${PN}-doc = "${docdir} ${mandir} ${infodir} ${datadir}/gtk-doc \ ${datadir}/gnome/help" SECTION_${PN}-doc = "doc" -FILES_${PN}-dev = "${includedir} ${libdir}/lib*.so ${libdir}/*.la \ +FILES_${PN}-dev = "${includedir} ${libdir}/lib*${SOLIBSDEV} ${libdir}/*.la \ ${libdir}/*.a ${libdir}/*.o ${libdir}/pkgconfig \ ${base_libdir}/*.a ${base_libdir}/*.o ${datadir}/aclocal" SECTION_${PN}-dev = "devel" |