Merge pull request #148 from bulwahn/master

Simple minor improvements from pull request #144 to be included in version 0.1
This commit is contained in:
herbrechtsmeier 2013-08-18 23:48:39 -07:00
commit cd16977300
4 changed files with 12 additions and 2 deletions

View File

@ -3,6 +3,8 @@ HOMEPAGE = "http://pocoproject.org"
LICENSE = "BSL-1.0" LICENSE = "BSL-1.0"
LIC_FILES_CHKSUM = "file://LICENSE;md5=e4224ccaecb14d942c71d31bef20d78c" LIC_FILES_CHKSUM = "file://LICENSE;md5=e4224ccaecb14d942c71d31bef20d78c"
PR = "r1"
DEPENDS = "expat zlib libpcre openssl" DEPENDS = "expat zlib libpcre openssl"
SRC_URI = "${SOURCEFORGE_MIRROR}/poco/poco-${PV}-all.tar.bz2 \ SRC_URI = "${SOURCEFORGE_MIRROR}/poco/poco-${PV}-all.tar.bz2 \
@ -21,7 +23,13 @@ EXTRA_OECONF += "--config=OE --no-samples --no-wstring --no-tests --unbundled \
--omit=Data/MySQL,Data/SQLite,Data/ODBC,PageCompiler \ --omit=Data/MySQL,Data/SQLite,Data/ODBC,PageCompiler \
" "
EXTRA_OEMAKE += 'STRIP=""'
do_configure_prepend() { do_configure_prepend() {
install ${WORKDIR}/OE ${S}/build/config/OE install ${WORKDIR}/OE ${S}/build/config/OE
export POCO_TARGET_OSARCH=${TARGET_ARCH} export POCO_TARGET_OSARCH=${TARGET_ARCH}
} }
do_install_append () {
rmdir ${D}${bindir}
}

View File

@ -4,3 +4,5 @@ LICENSE = "BSD"
LIC_FILES_CHKSUM = "file://package.xml;beginline=8;endline=8;md5=d566ef916e9dedc494f5f793a6690ba5" LIC_FILES_CHKSUM = "file://package.xml;beginline=8;endline=8;md5=d566ef916e9dedc494f5f793a6690ba5"
require common-msgs.inc require common-msgs.inc
DEPENDS += "geometry-msgs"

View File

@ -3,6 +3,6 @@ SECTION = "devel"
LICENSE = "BSD" LICENSE = "BSD"
LIC_FILES_CHKSUM = "file://package.xml;beginline=10;endline=10;md5=d566ef916e9dedc494f5f793a6690ba5" LIC_FILES_CHKSUM = "file://package.xml;beginline=10;endline=10;md5=d566ef916e9dedc494f5f793a6690ba5"
DEPENDS = "actionlib rosgraph tf2 tf2-py" DEPENDS = "actionlib message-filters rosgraph tf2 tf2-py"
require geometry-experimental.inc require geometry-experimental.inc

@ -1 +1 @@
Subproject commit fb3414e6e565577b3a50c2634acac602843c0215 Subproject commit f17d2e752b78abeed788425c0641f7da98bbf919