Patchwork boost: Activate zlib and bzip2 because they now work.

login
register
mail settings
Submitter Denis Carikli
Date Oct. 20, 2012, 3:50 p.m.
Message ID <1350748213-6436-1-git-send-email-GNUtoo@no-log.org>
Download mbox | patch
Permalink /patch/38351/
State New
Headers show

Comments

Denis Carikli - Oct. 20, 2012, 3:50 p.m.
This patch is needed for making wesnoth(will be sumbited
  in meta-games) work.

Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@no-log.org>
---
 meta/recipes-support/boost/boost.inc |    7 +------
 1 files changed, 1 insertions(+), 6 deletions(-)
Richard Purdie - Oct. 22, 2012, 3:39 p.m.
On Sat, 2012-10-20 at 17:50 +0200, Denis 'GNUtoo' Carikli wrote:
> This patch is needed for making wesnoth(will be sumbited
>   in meta-games) work.
> 
> Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@no-log.org>
> ---
>  meta/recipes-support/boost/boost.inc |    7 +------
>  1 files changed, 1 insertions(+), 6 deletions(-)

I tried this in master-next, the build broke:

| libs/iostreams/src/bzip2.cpp:20:56: fatal error: bzlib.h: No such file or directory
| compilation terminated.
| 
|     "i586-poky-linux-g++" "-m32" "-march=i586" "-Wl,-O1" "-Wl,--hash-style=gnu" "-Wl,--as-needed" "--sysroot=/srv/home/pokybuild/yocto-autobuilder/yocto-slave/nightly-world/build/build/tmp/sysroots/qemux86"  -ftemplate-depth-128 -O3 -finline-functions -Wno-inline -Wall -pthread -fPIC  -DBOOST_ALL_NO_LIB=1 -DBOOST_IOSTREAMS_DYN_LINK=1 -DBOOST_IOSTREAMS_USE_DEPRECATED -DNDEBUG  -I"." -c -o "bin.v2/libs/iostreams/build/aca09349fdb84d131321425f6c3a38ed/bzip2.o" "libs/iostreams/src/bzip2.cpp"
| 
| ...failed gcc.compile.c++ bin.v2/libs/iostreams/build/aca09349fdb84d131321425f6c3a38ed/bzip2.o...
| ...skipped <pbin.v2/libs/iostreams/build/aca09349fdb84d131321425f6c3a38ed>libboost_iostreams.so.1.51.0 for lack of <pbin.v2/libs/iostreams/build/aca09349fdb84d131321425f6c3a38ed>bzip2.o...
| ...skipped <pstage/lib>libboost_iostreams.so.1.51.0 for lack of <pbin.v2/libs/iostreams/build/aca09349fdb84d131321425f6c3a38ed>libboost_iostreams.so.1.51.0...
| ...skipped <pstage/lib>libboost_iostreams.so for lack of <pstage/lib>libboost_iostreams.so.1.51.0...
| common.mkdir bin.v2/libs/program_options
| common.mkdir bin.v2/libs/program_options/build
| common.mkdir bin.v2/libs/program_options/build/aca09349fdb84d131321425f6c3a38ed
| gcc.compile.c++ bin.v2/libs/program_options/build/aca09349fdb84d131321425f6c3a38ed/cmdline.o
| gcc.compile.c++ bin.v2/libs/program_options/build/aca09349fdb84d131321425f6c3a38ed/config_file.o
| gcc.compile.c++ bin.v2/libs/program_options/build/aca09349fdb84d131321425f6c3a38ed/options_description.o
| gcc.compile.c++ bin.v2/libs/program_options/build/aca09349fdb84d131321425f6c3a38ed/parsers.o
| gcc.compile.c++ bin.v2/libs/program_options/build/aca09349fdb84d131321425f6c3a38ed/variables_map.o
| gcc.compile.c++ bin.v2/libs/program_options/build/aca09349fdb84d131321425f6c3a38ed/value_semantic.o
| gcc.compile.c++ bin.v2/libs/program_options/build/aca09349fdb84d131321425f6c3a38ed/positional_options.o
| gcc.compile.c++ bin.v2/libs/program_options/build/aca09349fdb84d131321425f6c3a38ed/utf8_codecvt_facet.o
| gcc.compile.c++ bin.v2/libs/program_options/build/aca09349fdb84d131321425f6c3a38ed/convert.o
| gcc.compile.c++ bin.v2/libs/program_options/build/aca09349fdb84d131321425f6c3a38ed/winmain.o
| gcc.compile.c++ bin.v2/libs/program_options/build/aca09349fdb84d131321425f6c3a38ed/split.o
| gcc.link.dll bin.v2/libs/program_options/build/aca09349fdb84d131321425f6c3a38ed/libboost_program_options.so.1.51.0
| common.copy stage/lib/libboost_program_options.so.1.51.0

http://autobuilder.yoctoproject.org:8010/builders/nightly-world/builds/348/steps/shell_41/logs/stdio

Missing changes to DEPENDS maybe?

Cheers,

Richard
Denis Carikli - Oct. 22, 2012, 7:22 p.m.
On Mon, 22 Oct 2012 16:39:42 +0100
Richard Purdie <richard.purdie@linuxfoundation.org> wrote:

> On Sat, 2012-10-20 at 17:50 +0200, Denis 'GNUtoo' Carikli wrote:
> > This patch is needed for making wesnoth(will be sumbited
> >   in meta-games) work.
> > 
> > Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@no-log.org>
> > ---
> >  meta/recipes-support/boost/boost.inc |    7 +------
> >  1 files changed, 1 insertions(+), 6 deletions(-)
> 
> I tried this in master-next, the build broke:
> 
> | libs/iostreams/src/bzip2.cpp:20:56: fatal error: bzlib.h: No such
> file or directory | compilation terminated.
[...]
> http://autobuilder.yoctoproject.org:8010/builders/nightly-world/builds/348/steps/shell_41/logs/stdio
> 
> Missing changes to DEPENDS maybe?
yes probably, I have that:
./work/armv7a-vfp-neon-oe-linux-gnueabi/bzip2/bzip2-1.0.6-r5/sysroot-destdir/usr/include/bzlib.h
So it should depend on bzip2...

Denis.

Patch

diff --git a/meta/recipes-support/boost/boost.inc b/meta/recipes-support/boost/boost.inc
index ec602a6..f836243 100644
--- a/meta/recipes-support/boost/boost.inc
+++ b/meta/recipes-support/boost/boost.inc
@@ -16,7 +16,7 @@  BOOST_VER = "${@"_".join(d.getVar("PV",1).split("."))}"
 BOOST_MAJ = "${@"_".join(d.getVar("PV",1).split(".")[0:2])}"
 BOOST_P = "boost_${BOOST_VER}"
 
-INC_PR = "r4"
+INC_PR = "r5"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BOOST_P}.tar.bz2"
 
@@ -109,16 +109,11 @@  EQD = '\"'
 #boost.bb:   "...  '-sGCC=... '${SQD}'-DBOOST_PLATFORM_CONFIG=${EQD}config${EQD}'${SQD} ..."
 BJAM_CONF = "${SQD}'-DBOOST_PLATFORM_CONFIG=${EQD}boost/config/platform/${TARGET_OS}.hpp${EQD}'${SQD}"
 
-# bzip2 and zip are disabled because... they're broken - the compilation simply
-# isn't working with bjam.  I guess they will fix it, but who needs it?  This
-# only affects the (new in 33) iostream library.
 BJAM_TOOLS   = "-sTOOLS=gcc \
 		'-sGCC=${CC} '${BJAM_CONF} \
 		'-sGXX=${CXX} '${BJAM_CONF} \
 		'-sGCC_INCLUDE_DIRECTORY=${STAGING_INCDIR}' \
 		'-sGCC_STDLIB_DIRECTORY=${STAGING_LIBDIR}' \
-		'-sNO_BZIP2=1' \
-		'-sNO_ZLIB=1' \
 		'-sBUILD=release <optimization>space <threading>multi <inlining>on <debug-symbols>off' \
 		'-sPYTHON_VERSION=${PYTHON_VERSION}' \
 		'-sPYTHON_ROOT=${PYTHON_ROOT}' \