diff options
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/boost/boost-36.inc | 5 | ||||
| -rw-r--r-- | packages/boost/boost_1.36.0.bb | 4 | ||||
| -rw-r--r-- | packages/wt/wt_2.2.3.bb | 31 |
3 files changed, 36 insertions, 4 deletions
diff --git a/packages/boost/boost-36.inc b/packages/boost/boost-36.inc index 0ad71ca9d6..5ab187d89d 100644 --- a/packages/boost/boost-36.inc +++ b/packages/boost/boost-36.inc @@ -9,7 +9,7 @@ SECTION = "libs" DEPENDS = "boost-jam-native zlib" PRIORITY = "optional" LICENSE = "Boost Software License" -PR = "r1" +PR = "r2" BOOST_VER = "${@"_".join(bb.data.getVar("PV",d,1).split("."))}" BOOST_MAJ = "${@"_".join(bb.data.getVar("PV",d,1).split(".")[0:2])}" @@ -70,6 +70,9 @@ FILES_${PN}-dev = "${includedir} ${libdir}/libboost_*.so ${libdir}/libboost_*.a" PACKAGES += "${PN}" RRECOMMENDS_${PN} += "${BOOST_PACKAGES}" +# to avoid GNU_HASH QA errors added LDFLAGS to ARCH; a little bit dirty but at least it works +TARGET_CC_ARCH += " ${LDFLAGS}" + # Oh yippee, a new build system, it's sooo cooool I could eat my own # foot. inlining=on lets the compiler choose, I think. At least this # stuff is documented... diff --git a/packages/boost/boost_1.36.0.bb b/packages/boost/boost_1.36.0.bb index 77d99e4fda..76c8322fb9 100644 --- a/packages/boost/boost_1.36.0.bb +++ b/packages/boost/boost_1.36.0.bb @@ -1,8 +1,6 @@ include boost-36.inc -DEFAULT_PREFERENCE = "-1" - -PR = "r4" +PR = "r5" SRC_URI = "${SOURCEFORGE_MIRROR}/boost/${BOOST_P}.tar.bz2 \ file://arm-intrinsics.patch;patch=1 \ diff --git a/packages/wt/wt_2.2.3.bb b/packages/wt/wt_2.2.3.bb new file mode 100644 index 0000000000..ec0f3cc302 --- /dev/null +++ b/packages/wt/wt_2.2.3.bb @@ -0,0 +1,31 @@ +DESCRIPTION = "A C++ Web Toolkit" +PRIORITY = "optional" +SECTION = "devel" +LICENSE = "GPL" +DEPENDS = "boost zlib openssl" +PR = "r0" + +SRC_URI = "${SOURCEFORGE_MIRROR}/witty/wt-${PV}.tar.gz \ + file://cmakelist.patch;patch=1" + +FILES_${PN} += "${datadir}/Wt" +FILES_${PN}-dev += "${datadir}/cmake-2.*" + +inherit cmake + +STAGE_TEMP = "${WORKDIR}/temp-staging" + +do_configure_append() { + ${BUILD_CXX} ${BUILD_CXXFLAGS} -o src/filetostring src/web/skeleton/FileToString.C +} + +do_stage() { + rm -rf ${STAGE_TEMP} + mkdir -p ${STAGE_TEMP} + oe_runmake DESTDIR="${STAGE_TEMP}" install + cp -pPR ${STAGE_TEMP}/${includedir}/* ${STAGING_INCDIR} + cp -pPR ${STAGE_TEMP}/${libdir}/* ${STAGING_LIBDIR} + cp -pPR ${STAGE_TEMP}/${datadir}/cmake-2.* ${STAGING_DATADIR} + rm -rf ${STAGE_TEMP} +} + |