diff options
author | Saul Wold <sgw@linux.intel.com> | 2011-11-15 12:58:44 -0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-11-16 17:32:45 +0000 |
commit | 65333d263e92d6cece36e87f7cd2ccc27d074cec (patch) | |
tree | bf08fa12cd589c6952e249a6a199e93c0bcdfcac /meta/recipes-support/boost/boost-36.inc | |
parent | 7fb529436942015aebd6db0eb55c4a5e1e9c787a (diff) | |
download | poky-65333d263e92d6cece36e87f7cd2ccc27d074cec.tar.gz |
boost: Update to 1.47.0 & Cleanup
Removed boost-jam-native since it was an older version
no incompatible with boost 1.47.
Modified boost to use BBCLASSEXTEND native for the bjam
native binary.
Removed older unused patches.
(From OE-Core rev: 67df7590d0a6600cb9768b3df2b56983a5fe234f)
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-support/boost/boost-36.inc')
-rw-r--r-- | meta/recipes-support/boost/boost-36.inc | 150 |
1 files changed, 0 insertions, 150 deletions
diff --git a/meta/recipes-support/boost/boost-36.inc b/meta/recipes-support/boost/boost-36.inc deleted file mode 100644 index 8b0622f6ba..0000000000 --- a/meta/recipes-support/boost/boost-36.inc +++ /dev/null | |||
@@ -1,150 +0,0 @@ | |||
1 | # The Boost web site provides free peer-reviewed portable | ||
2 | # C++ source libraries. The emphasis is on libraries which | ||
3 | # work well with the C++ Standard Library. The libraries are | ||
4 | # intended to be widely useful, and are in regular use by | ||
5 | # thousands of programmers across a broad spectrum of applications. | ||
6 | DESCRIPTION = "Free peer-reviewed portable C++ source libraries" | ||
7 | HOMEPAGE = "http://www.boost.org/" | ||
8 | SECTION = "libs" | ||
9 | DEPENDS = "boost-jam-native zlib" | ||
10 | LICENSE = "Boost" | ||
11 | PR = "r4" | ||
12 | |||
13 | ARM_INSTRUCTION_SET = "arm" | ||
14 | BOOST_VER = "${@"_".join(d.getVar("PV",1).split("."))}" | ||
15 | BOOST_MAJ = "${@"_".join(d.getVar("PV",1).split(".")[0:2])}" | ||
16 | BOOST_P = "boost_${BOOST_VER}" | ||
17 | |||
18 | BOOST_LIBS = "\ | ||
19 | date_time \ | ||
20 | filesystem \ | ||
21 | graph \ | ||
22 | iostreams \ | ||
23 | program_options \ | ||
24 | regex \ | ||
25 | signals \ | ||
26 | system \ | ||
27 | test \ | ||
28 | thread \ | ||
29 | " | ||
30 | |||
31 | # FIXME: for some reason this fails on powerpc | ||
32 | #BOOST_LIBS += "serialization" | ||
33 | |||
34 | # To enable python, uncomment the following: | ||
35 | #BOOST_LIBS += "python" | ||
36 | #DEPENDS += "python" | ||
37 | #PYTHON_ROOT = "${STAGING_DIR_HOST}/${prefix}" | ||
38 | #PYTHON_VERSION = "2.5" | ||
39 | |||
40 | S = "${WORKDIR}/${BOOST_P}" | ||
41 | |||
42 | # Make a package for each library, plus -dev | ||
43 | PACKAGES = "${PN}-dbg ${BOOST_PACKAGES}" | ||
44 | python __anonymous () { | ||
45 | import bb | ||
46 | |||
47 | packages = [] | ||
48 | extras = [] | ||
49 | for lib in d.getVar('BOOST_LIBS', 1).split( ): | ||
50 | pkg = "boost-%s" % lib.replace("_", "-") | ||
51 | extras.append("--with-%s" % lib) | ||
52 | packages.append(pkg) | ||
53 | if not d.getVar("FILES_%s" % pkg, 1): | ||
54 | d.setVar("FILES_%s" % pkg, "${libdir}/libboost_%s*.so.*" % lib) | ||
55 | bb.data.setVar("BOOST_PACKAGES", " ".join(packages), d) | ||
56 | bb.data.setVar("BJAM_EXTRA", " ".join(extras), d) | ||
57 | } | ||
58 | |||
59 | # Override the contents of specific packages | ||
60 | FILES_boost-serialization = "${libdir}/libboost_serialization*.so.* \ | ||
61 | ${libdir}/libboost_wserialization*.so.*" | ||
62 | FILES_boost-test = "${libdir}/libboost_prg_exec_monitor*.so.* \ | ||
63 | ${libdir}/libboost_unit_test_framework*.so.*" | ||
64 | |||
65 | # -dev last to pick up the remaining stuff | ||
66 | PACKAGES += "${PN}-dev" | ||
67 | FILES_${PN}-dev = "${includedir} ${libdir}/libboost_*.so ${libdir}/libboost_*.a" | ||
68 | |||
69 | # "boost" is a metapackage which pulls in all boost librabries | ||
70 | PACKAGES += "${PN}" | ||
71 | RRECOMMENDS_${PN} += "${BOOST_PACKAGES}" | ||
72 | ALLOW_EMPTY_${PN} = "1" | ||
73 | |||
74 | # to avoid GNU_HASH QA errors added LDFLAGS to ARCH; a little bit dirty but at least it works | ||
75 | TARGET_CC_ARCH += " ${LDFLAGS}" | ||
76 | |||
77 | # Oh yippee, a new build system, it's sooo cooool I could eat my own | ||
78 | # foot. inlining=on lets the compiler choose, I think. At least this | ||
79 | # stuff is documented... | ||
80 | # NOTE: if you leave <debug-symbols>on then in a debug build the build sys | ||
81 | # objcopy will be invoked, and that won't work. Building debug apparently | ||
82 | # requires hacking gcc-tools.jam | ||
83 | # | ||
84 | # Sometimes I wake up screaming. Famous figures are gathered in the nightmare, | ||
85 | # Steve Bourne, Larry Wall, the whole of the ANSI C committee. They're just | ||
86 | # standing there, waiting, but the truely terrifying thing is what they carry | ||
87 | # in their hands. At first sight each seems to bear the same thing, but it is | ||
88 | # not so for the forms in their grasp are ever so slightly different one from | ||
89 | # the other. Each is twisted in some grotesque way from the other to make each | ||
90 | # an unspeakable perversion impossible to perceive without the onset of madness. | ||
91 | # True insanity awaits anyone who perceives all of these horrors together. | ||
92 | # | ||
93 | # Quotation marks, there might be an easier way to do this, but I can't find | ||
94 | # it. The problem is that the user.hpp configuration file must receive a | ||
95 | # pre-processor macro defined as the appropriate string - complete with "'s | ||
96 | # around it. (<> is a possibility here but the danger to that is that the | ||
97 | # failure case interprets the < and > as shell redirections, creating | ||
98 | # random files in the source tree.) | ||
99 | # | ||
100 | #bjam: '-DBOOST_PLATFORM_CONFIG=\"config\"' | ||
101 | #do_compile: '-sGCC=... '"'-DBOOST_PLATFORM_CONFIG=\"config\"'" | ||
102 | SQD = '"' | ||
103 | EQD = '\"' | ||
104 | #boost.bb: "... '-sGCC=... '${SQD}'-DBOOST_PLATFORM_CONFIG=${EQD}config${EQD}'${SQD} ..." | ||
105 | BJAM_CONF = "${SQD}'-DBOOST_PLATFORM_CONFIG=${EQD}boost/config/platform/${TARGET_OS}.hpp${EQD}'${SQD}" | ||
106 | |||
107 | # bzip2 and zip are disabled because... they're broken - the compilation simply | ||
108 | # isn't working with bjam. I guess they will fix it, but who needs it? This | ||
109 | # only affects the (new in 33) iostream library. | ||
110 | BJAM_TOOLS = "-sTOOLS=gcc \ | ||
111 | '-sGCC=${CC} '${BJAM_CONF} \ | ||
112 | '-sGXX=${CXX} '${BJAM_CONF} \ | ||
113 | '-sGCC_INCLUDE_DIRECTORY=${STAGING_INCDIR}' \ | ||
114 | '-sGCC_STDLIB_DIRECTORY=${STAGING_LIBDIR}' \ | ||
115 | '-sNO_BZIP2=1' \ | ||
116 | '-sNO_ZLIB=1' \ | ||
117 | '-sBUILD=release <optimization>space <inlining>on <debug-symbols>off' \ | ||
118 | '-sPYTHON_VERSION=${PYTHON_VERSION}' \ | ||
119 | '--layout=system' \ | ||
120 | " | ||
121 | |||
122 | BJAM_OPTS = '${BJAM_TOOLS} \ | ||
123 | --builddir=${S}/${TARGET_SYS} \ | ||
124 | --with-python-root=${PYTHON_ROOT} \ | ||
125 | ${BJAM_EXTRA}' | ||
126 | |||
127 | |||
128 | do_boostconfig() { | ||
129 | cp -f boost/config/platform/linux.hpp boost/config/platform/linux-gnueabi.hpp | ||
130 | |||
131 | echo 'using gcc : 4.3.1 : ${CXX} : compileflags -DBOOST_SP_USE_PTHREADS -I${includedir} linkflags -L${libdir} ;' >> ${S}/tools/build/v2/user-config.jam | ||
132 | } | ||
133 | |||
134 | addtask do_boostconfig after do_patch before do_configure | ||
135 | |||
136 | do_compile() { | ||
137 | set -ex | ||
138 | bjam ${BJAM_OPTS} --prefix=${prefix} \ | ||
139 | --exec-prefix=${exec_prefix} \ | ||
140 | --libdir=${libdir} \ | ||
141 | --includedir=${includedir} | ||
142 | } | ||
143 | |||
144 | do_install() { | ||
145 | set -ex | ||
146 | bjam ${BJAM_OPTS} \ | ||
147 | --libdir=${D}${libdir} \ | ||
148 | --includedir=${D}${includedir} \ | ||
149 | install | ||
150 | } | ||