diff options
Diffstat (limited to 'meta/recipes-support/boost')
-rw-r--r-- | meta/recipes-support/boost/boost-1.84.0.inc (renamed from meta/recipes-support/boost/boost-1.75.0.inc) | 6 | ||||
-rw-r--r-- | meta/recipes-support/boost/boost-build-native_1.84.0.bb | 28 | ||||
-rw-r--r-- | meta/recipes-support/boost/boost-build-native_4.3.0.bb | 25 | ||||
-rw-r--r-- | meta/recipes-support/boost/boost.inc | 47 | ||||
-rw-r--r-- | meta/recipes-support/boost/boost/0001-Don-t-set-up-arch-instruction-set-flags-we-do-that-o.patch | 25 | ||||
-rw-r--r-- | meta/recipes-support/boost/boost/0001-dont-setup-compiler-flags-m32-m64.patch | 15 | ||||
-rw-r--r-- | meta/recipes-support/boost/boost/0001-fiber-libs-Define-SYS_futex-if-it-does-not-exist.patch | 54 | ||||
-rw-r--r-- | meta/recipes-support/boost/boost/boost-CVE-2012-2677.patch | 112 | ||||
-rw-r--r-- | meta/recipes-support/boost/boost/boost-math-disable-pch-for-gcc.patch | 9 | ||||
-rw-r--r-- | meta/recipes-support/boost/boost_1.84.0.bb (renamed from meta/recipes-support/boost/boost_1.75.0.bb) | 5 |
10 files changed, 87 insertions, 239 deletions
diff --git a/meta/recipes-support/boost/boost-1.75.0.inc b/meta/recipes-support/boost/boost-1.84.0.inc index e5a8488c58..5bbea2ba5b 100644 --- a/meta/recipes-support/boost/boost-1.75.0.inc +++ b/meta/recipes-support/boost/boost-1.84.0.inc | |||
@@ -11,10 +11,10 @@ BOOST_VER = "${@"_".join(d.getVar("PV").split("."))}" | |||
11 | BOOST_MAJ = "${@"_".join(d.getVar("PV").split(".")[0:2])}" | 11 | BOOST_MAJ = "${@"_".join(d.getVar("PV").split(".")[0:2])}" |
12 | BOOST_P = "boost_${BOOST_VER}" | 12 | BOOST_P = "boost_${BOOST_VER}" |
13 | 13 | ||
14 | SRC_URI = "https://dl.bintray.com/boostorg/release/${PV}/source/${BOOST_P}.tar.bz2" | 14 | SRC_URI = "https://boostorg.jfrog.io/artifactory/main/release/${PV}/source/${BOOST_P}.tar.bz2" |
15 | SRC_URI[sha256sum] = "953db31e016db7bb207f11432bef7df100516eeb746843fa0486a222e3fd49cb" | 15 | SRC_URI[sha256sum] = "cc4b893acf645c9d4b698e9a0f08ca8846aa5d6c68275c14c3e7949c24109454" |
16 | 16 | ||
17 | UPSTREAM_CHECK_URI = "http://www.boost.org/users/download/" | 17 | UPSTREAM_CHECK_URI = "http://www.boost.org/users/download/" |
18 | UPSTREAM_CHECK_REGEX = "boostorg/release/(?P<pver>.*)/source/" | 18 | UPSTREAM_CHECK_REGEX = "release/(?P<pver>.*)/source/" |
19 | 19 | ||
20 | S = "${WORKDIR}/${BOOST_P}" | 20 | S = "${WORKDIR}/${BOOST_P}" |
diff --git a/meta/recipes-support/boost/boost-build-native_1.84.0.bb b/meta/recipes-support/boost/boost-build-native_1.84.0.bb new file mode 100644 index 0000000000..a345bac499 --- /dev/null +++ b/meta/recipes-support/boost/boost-build-native_1.84.0.bb | |||
@@ -0,0 +1,28 @@ | |||
1 | SUMMARY = "Boost.Build" | ||
2 | DESCRIPTION = "B2 makes it easy to build C++ projects, everywhere." | ||
3 | HOMEPAGE = "https://github.com/boostorg/build" | ||
4 | SECTION = "devel" | ||
5 | |||
6 | LICENSE = "BSL-1.0" | ||
7 | LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=e4224ccaecb14d942c71d31bef20d78c" | ||
8 | |||
9 | SRC_URI = "git://github.com/boostorg/build;protocol=https;branch=master" | ||
10 | SRCREV = "8d86b9a85407d73d6e8c631771f18c2a237d2d71" | ||
11 | PE = "1" | ||
12 | |||
13 | UPSTREAM_CHECK_GITTAGREGEX = "boost-(?P<pver>(\d+(\.\d+)+))" | ||
14 | |||
15 | inherit native | ||
16 | |||
17 | S = "${WORKDIR}/git" | ||
18 | |||
19 | do_compile() { | ||
20 | ./bootstrap.sh | ||
21 | } | ||
22 | |||
23 | do_install() { | ||
24 | HOME=/var/run ./b2 install --prefix=${prefix} staging-prefix=${D}${prefix} | ||
25 | } | ||
26 | |||
27 | # The build is either release mode (pre-stripped) or debug (-O0). | ||
28 | INSANE_SKIP:${PN} = "already-stripped" | ||
diff --git a/meta/recipes-support/boost/boost-build-native_4.3.0.bb b/meta/recipes-support/boost/boost-build-native_4.3.0.bb deleted file mode 100644 index 258f8c9cdf..0000000000 --- a/meta/recipes-support/boost/boost-build-native_4.3.0.bb +++ /dev/null | |||
@@ -1,25 +0,0 @@ | |||
1 | SUMMARY = "Boost.Build" | ||
2 | SECTION = "devel" | ||
3 | |||
4 | LICENSE = "BSL-1.0" | ||
5 | LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=e4224ccaecb14d942c71d31bef20d78c" | ||
6 | |||
7 | SRC_URI = "git://github.com/boostorg/build;protocol=https" | ||
8 | SRCREV = "632ea768f3eb225b4472c5ed6d20afee708724ad" | ||
9 | |||
10 | UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>(\d+(\.\d+){2,}))" | ||
11 | |||
12 | inherit native | ||
13 | |||
14 | S = "${WORKDIR}/git" | ||
15 | |||
16 | do_compile() { | ||
17 | ./bootstrap.sh | ||
18 | } | ||
19 | |||
20 | do_install() { | ||
21 | ./b2 install --prefix=${prefix} staging-prefix=${D}${prefix} | ||
22 | } | ||
23 | |||
24 | # The build is either release mode (pre-stripped) or debug (-O0). | ||
25 | INSANE_SKIP_${PN} = "already-stripped" | ||
diff --git a/meta/recipes-support/boost/boost.inc b/meta/recipes-support/boost/boost.inc index c9bb178541..77105aa1fa 100644 --- a/meta/recipes-support/boost/boost.inc +++ b/meta/recipes-support/boost/boost.inc | |||
@@ -1,11 +1,15 @@ | |||
1 | SUMMARY = "Free peer-reviewed portable C++ source libraries" | 1 | SUMMARY = "Free peer-reviewed portable C++ source libraries" |
2 | DESCRIPTION = "Provides free peer-reviewed portable C++ source libraries. The emphasis is on libraries which work well with the C++ \ | ||
3 | Standard Library. One goal is to establish 'existing practice' and \ | ||
4 | provide reference implementations so that the Boost libraries are suitable for eventual standardization. Some of the libraries have already been proposed for inclusion in the C++ Standards Committee's \ | ||
5 | upcoming C++ Standard Library Technical Report." | ||
2 | SECTION = "libs" | 6 | SECTION = "libs" |
3 | DEPENDS = "boost-build-native zlib bzip2" | 7 | DEPENDS = "boost-build-native zlib bzip2" |
4 | 8 | ||
5 | CVE_PRODUCT = "boost:boost" | 9 | CVE_PRODUCT = "boost:boost" |
6 | 10 | ||
7 | ARM_INSTRUCTION_SET_armv4 = "arm" | 11 | ARM_INSTRUCTION_SET:armv4 = "arm" |
8 | ARM_INSTRUCTION_SET_armv5 = "arm" | 12 | ARM_INSTRUCTION_SET:armv5 = "arm" |
9 | 13 | ||
10 | B = "${WORKDIR}/build" | 14 | B = "${WORKDIR}/build" |
11 | do_configure[cleandirs] = "${B}" | 15 | do_configure[cleandirs] = "${B}" |
@@ -24,6 +28,7 @@ BOOST_LIBS = "\ | |||
24 | graph \ | 28 | graph \ |
25 | headers \ | 29 | headers \ |
26 | iostreams \ | 30 | iostreams \ |
31 | json \ | ||
27 | log \ | 32 | log \ |
28 | math \ | 33 | math \ |
29 | program_options \ | 34 | program_options \ |
@@ -35,6 +40,7 @@ BOOST_LIBS = "\ | |||
35 | thread \ | 40 | thread \ |
36 | timer \ | 41 | timer \ |
37 | type_erasure \ | 42 | type_erasure \ |
43 | url \ | ||
38 | wave \ | 44 | wave \ |
39 | " | 45 | " |
40 | 46 | ||
@@ -67,35 +73,35 @@ python __anonymous () { | |||
67 | if "-native" in pn: | 73 | if "-native" in pn: |
68 | pkg = pkg + "-native" | 74 | pkg = pkg + "-native" |
69 | packages.append(mlprefix + pkg) | 75 | packages.append(mlprefix + pkg) |
70 | if not d.getVar("FILES_%s" % pkg): | 76 | if not d.getVar("FILES:%s" % pkg): |
71 | d.setVar("FILES_%s%s" % (mlprefix, pkg), "${libdir}/libboost_%s*.so.*" % lib) | 77 | d.setVar("FILES:%s%s" % (mlprefix, pkg), "${libdir}/libboost_%s*.so.*" % lib) |
72 | else: | 78 | else: |
73 | d.setVar("FILES_%s%s" % (mlprefix, pkg), d.getVar("FILES_%s" % pkg)) | 79 | d.setVar("FILES:%s%s" % (mlprefix, pkg), d.getVar("FILES:%s" % pkg)) |
74 | 80 | ||
75 | d.setVar("BOOST_PACKAGES", " ".join(packages)) | 81 | d.setVar("BOOST_PACKAGES", " ".join(packages)) |
76 | d.setVar("BJAM_EXTRA", " ".join(extras)) | 82 | d.setVar("BJAM_EXTRA", " ".join(extras)) |
77 | } | 83 | } |
78 | 84 | ||
79 | # Override the contents of specific packages | 85 | # Override the contents of specific packages |
80 | FILES_${PN}-graph_parallel = "${libdir}/libboost_graph_parallel.so.*" | 86 | FILES:${PN}-graph_parallel = "${libdir}/libboost_graph_parallel.so.*" |
81 | FILES_${PN}-locale = "${libdir}/libboost_locale.so.*" | 87 | FILES:${PN}-locale = "${libdir}/libboost_locale.so.*" |
82 | FILES_${PN}-mpi = "${libdir}/mpi.so ${libdir}/libboost_mpi*.so.*" | 88 | FILES:${PN}-mpi = "${libdir}/mpi.so ${libdir}/libboost_mpi*.so.*" |
83 | FILES_boost-serialization = "${libdir}/libboost_serialization*.so.* \ | 89 | FILES:boost-serialization = "${libdir}/libboost_serialization*.so.* \ |
84 | ${libdir}/libboost_wserialization*.so.*" | 90 | ${libdir}/libboost_wserialization*.so.*" |
85 | FILES_boost-test = "${libdir}/libboost_prg_exec_monitor*.so.* \ | 91 | FILES:boost-test = "${libdir}/libboost_prg_exec_monitor*.so.* \ |
86 | ${libdir}/libboost_unit_test_framework*.so.*" | 92 | ${libdir}/libboost_unit_test_framework*.so.*" |
87 | 93 | ||
88 | # -dev last to pick up the remaining stuff | 94 | # -dev last to pick up the remaining stuff |
89 | PACKAGES += "${PN}-dev ${PN}-staticdev" | 95 | PACKAGES += "${PN}-dev ${PN}-staticdev" |
90 | FILES_${PN}-dev = "${includedir} ${libdir}/libboost_*.so ${libdir}/cmake" | 96 | FILES:${PN}-dev = "${includedir} ${libdir}/libboost_*.so ${libdir}/cmake" |
91 | FILES_${PN}-staticdev = "${libdir}/libboost_*.a" | 97 | FILES:${PN}-staticdev = "${libdir}/libboost_*.a" |
92 | 98 | ||
93 | # "boost" is a metapackage which pulls in all boost librabries | 99 | # "boost" is a metapackage which pulls in all boost librabries |
94 | PACKAGES += "${PN}" | 100 | PACKAGES += "${PN}" |
95 | FILES_${PN} = "" | 101 | FILES:${PN} = "" |
96 | ALLOW_EMPTY_${PN} = "1" | 102 | ALLOW_EMPTY:${PN} = "1" |
97 | RRECOMMENDS_${PN} += "${BOOST_PACKAGES}" | 103 | RRECOMMENDS:${PN} += "${BOOST_PACKAGES}" |
98 | RRECOMMENDS_${PN}_class-native = "" | 104 | RRECOMMENDS:${PN}:class-native = "" |
99 | 105 | ||
100 | # to avoid GNU_HASH QA errors added LDFLAGS to ARCH; a little bit dirty but at least it works | 106 | # to avoid GNU_HASH QA errors added LDFLAGS to ARCH; a little bit dirty but at least it works |
101 | TARGET_CC_ARCH += "${LDFLAGS}" | 107 | TARGET_CC_ARCH += "${LDFLAGS}" |
@@ -146,19 +152,20 @@ BOOST_PARALLEL_MAKE = "${@oe.utils.parallel_make_argument(d, '-j%d')}" | |||
146 | BJAM_OPTS = '${BOOST_PARALLEL_MAKE} -d+2 -q \ | 152 | BJAM_OPTS = '${BOOST_PARALLEL_MAKE} -d+2 -q \ |
147 | ${BJAM_TOOLS} \ | 153 | ${BJAM_TOOLS} \ |
148 | -sBOOST_BUILD_USER_CONFIG=${WORKDIR}/user-config.jam \ | 154 | -sBOOST_BUILD_USER_CONFIG=${WORKDIR}/user-config.jam \ |
155 | -sICU_PATH=${STAGING_EXECPREFIXDIR} \ | ||
149 | --build-dir=${B} \ | 156 | --build-dir=${B} \ |
150 | --disable-icu \ | 157 | --disable-icu \ |
151 | ${BJAM_EXTRA}' | 158 | ${BJAM_EXTRA}' |
152 | 159 | ||
153 | # Native compilation of bzip2 isn't working | 160 | # Native compilation of bzip2 isn't working |
154 | BJAM_OPTS_append_class-native = ' -sNO_BZIP2=1' | 161 | BJAM_OPTS:append:class-native = ' -sNO_BZIP2=1' |
155 | 162 | ||
156 | # Adjust the build for x32 | 163 | # Adjust the build for x32 |
157 | BJAM_OPTS_append_x86-x32 = " abi=x32 address-model=64" | 164 | BJAM_OPTS:append:x86-x32 = " abi=x32 address-model=64" |
158 | 165 | ||
159 | # cross compiling for arm fails to detect abi, so provide some help | 166 | # cross compiling for arm fails to detect abi, so provide some help |
160 | BJAM_OPTS_append_arm = " abi=aapcs architecture=arm" | 167 | BJAM_OPTS:append:arm = " abi=aapcs architecture=arm" |
161 | BJAM_OPTS_append_aarch64 = " abi=aapcs address-model=64 architecture=arm" | 168 | BJAM_OPTS:append:aarch64 = " abi=aapcs address-model=64 architecture=arm" |
162 | 169 | ||
163 | do_configure() { | 170 | do_configure() { |
164 | cd ${S} | 171 | cd ${S} |
diff --git a/meta/recipes-support/boost/boost/0001-Don-t-set-up-arch-instruction-set-flags-we-do-that-o.patch b/meta/recipes-support/boost/boost/0001-Don-t-set-up-arch-instruction-set-flags-we-do-that-o.patch index 91ab53efd9..9ba5d5cc33 100644 --- a/meta/recipes-support/boost/boost/0001-Don-t-set-up-arch-instruction-set-flags-we-do-that-o.patch +++ b/meta/recipes-support/boost/boost/0001-Don-t-set-up-arch-instruction-set-flags-we-do-that-o.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 8e1d30454afde37eaa3c593ec19d108cd5ed10d0 Mon Sep 17 00:00:00 2001 | 1 | From 18185e939ca121335a6172c8e50872af8122a759 Mon Sep 17 00:00:00 2001 |
2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | 2 | From: Alexander Kanavin <alex.kanavin@gmail.com> |
3 | Date: Tue, 18 Dec 2018 15:42:57 +0100 | 3 | Date: Tue, 18 Dec 2018 15:42:57 +0100 |
4 | Subject: [PATCH] Don't set up arch/instruction-set flags, we do that | 4 | Subject: [PATCH] Don't set up arch/instruction-set flags, we do that |
@@ -8,16 +8,15 @@ ourselves | |||
8 | Upstream-Status: Inappropriate | 8 | Upstream-Status: Inappropriate |
9 | Signed-off-by: Christopher Larson <chris_larson@mentor.com> | 9 | Signed-off-by: Christopher Larson <chris_larson@mentor.com> |
10 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | 10 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> |
11 | |||
12 | --- | 11 | --- |
13 | tools/build/src/tools/gcc.jam | 139 ---------------------------------- | 12 | tools/build/src/tools/gcc.jam | 153 ---------------------------------- |
14 | 1 file changed, 139 deletions(-) | 13 | 1 file changed, 153 deletions(-) |
15 | 14 | ||
16 | diff --git a/tools/build/src/tools/gcc.jam b/tools/build/src/tools/gcc.jam | 15 | diff --git a/tools/build/src/tools/gcc.jam b/tools/build/src/tools/gcc.jam |
17 | index ff3209f7b..70cbc39a5 100644 | 16 | index 834f5e1bf..493a43e6d 100644 |
18 | --- a/tools/build/src/tools/gcc.jam | 17 | --- a/tools/build/src/tools/gcc.jam |
19 | +++ b/tools/build/src/tools/gcc.jam | 18 | +++ b/tools/build/src/tools/gcc.jam |
20 | @@ -1217,142 +1217,3 @@ local rule cpu-flags ( toolset variable : architecture : instruction-set + : | 19 | @@ -1113,156 +1113,3 @@ local rule cpu-flags ( toolset variable : architecture : instruction-set + : |
21 | <architecture>$(architecture)/<instruction-set>$(instruction-set) | 20 | <architecture>$(architecture)/<instruction-set>$(instruction-set) |
22 | : $(values) ; | 21 | : $(values) ; |
23 | } | 22 | } |
@@ -72,6 +71,9 @@ index ff3209f7b..70cbc39a5 100644 | |||
72 | -cpu-flags gcc OPTIONS : x86 : cascadelake : -march=skylake-avx512 -mavx512vnni ; | 71 | -cpu-flags gcc OPTIONS : x86 : cascadelake : -march=skylake-avx512 -mavx512vnni ; |
73 | -cpu-flags gcc OPTIONS : x86 : cooperlake : -march=cooperlake ; | 72 | -cpu-flags gcc OPTIONS : x86 : cooperlake : -march=cooperlake ; |
74 | -cpu-flags gcc OPTIONS : x86 : tigerlake : -march=tigerlake ; | 73 | -cpu-flags gcc OPTIONS : x86 : tigerlake : -march=tigerlake ; |
74 | -cpu-flags gcc OPTIONS : x86 : rocketlake : -march=rocketlake ; | ||
75 | -cpu-flags gcc OPTIONS : x86 : alderlake : -march=alderlake ; | ||
76 | -cpu-flags gcc OPTIONS : x86 : sapphirerapids : -march=sapphirerapids ; | ||
75 | -cpu-flags gcc OPTIONS : x86 : k6 : -march=k6 ; | 77 | -cpu-flags gcc OPTIONS : x86 : k6 : -march=k6 ; |
76 | -cpu-flags gcc OPTIONS : x86 : k6-2 : -march=k6-2 ; | 78 | -cpu-flags gcc OPTIONS : x86 : k6-2 : -march=k6-2 ; |
77 | -cpu-flags gcc OPTIONS : x86 : k6-3 : -march=k6-3 ; | 79 | -cpu-flags gcc OPTIONS : x86 : k6-3 : -march=k6-3 ; |
@@ -98,6 +100,7 @@ index ff3209f7b..70cbc39a5 100644 | |||
98 | -cpu-flags gcc OPTIONS : x86 : btver2 : -march=btver2 ; | 100 | -cpu-flags gcc OPTIONS : x86 : btver2 : -march=btver2 ; |
99 | -cpu-flags gcc OPTIONS : x86 : znver1 : -march=znver1 ; | 101 | -cpu-flags gcc OPTIONS : x86 : znver1 : -march=znver1 ; |
100 | -cpu-flags gcc OPTIONS : x86 : znver2 : -march=znver2 ; | 102 | -cpu-flags gcc OPTIONS : x86 : znver2 : -march=znver2 ; |
103 | -cpu-flags gcc OPTIONS : x86 : znver3 : -march=znver3 ; | ||
101 | -cpu-flags gcc OPTIONS : x86 : winchip-c6 : -march=winchip-c6 ; | 104 | -cpu-flags gcc OPTIONS : x86 : winchip-c6 : -march=winchip-c6 ; |
102 | -cpu-flags gcc OPTIONS : x86 : winchip2 : -march=winchip2 ; | 105 | -cpu-flags gcc OPTIONS : x86 : winchip2 : -march=winchip2 ; |
103 | -cpu-flags gcc OPTIONS : x86 : c3 : -march=c3 ; | 106 | -cpu-flags gcc OPTIONS : x86 : c3 : -march=c3 ; |
@@ -158,5 +161,15 @@ index ff3209f7b..70cbc39a5 100644 | |||
158 | -cpu-flags gcc OPTIONS : s390x : z13 : -march=z13 ; | 161 | -cpu-flags gcc OPTIONS : s390x : z13 : -march=z13 ; |
159 | -cpu-flags gcc OPTIONS : s390x : z14 : -march=z14 ; | 162 | -cpu-flags gcc OPTIONS : s390x : z14 : -march=z14 ; |
160 | -cpu-flags gcc OPTIONS : s390x : z15 : -march=z15 ; | 163 | -cpu-flags gcc OPTIONS : s390x : z15 : -march=z15 ; |
164 | -# ARM | ||
165 | -cpu-flags gcc OPTIONS : arm : cortex-a9+vfpv3 : -mcpu=cortex-a9 -mfpu=vfpv3 -mfloat-abi=hard ; | ||
166 | -cpu-flags gcc OPTIONS : arm : cortex-a53 : -mcpu=cortex-a53 ; | ||
167 | -cpu-flags gcc OPTIONS : arm : cortex-r5 : -mcpu=cortex-r5 ; | ||
168 | -cpu-flags gcc OPTIONS : arm : cortex-r5+vfpv3-d16 : -mcpu=cortex-r5 -mfpu=vfpv3-d16 -mfloat-abi=hard ; | ||
161 | -# AIX variant of RS/6000 & PowerPC | 169 | -# AIX variant of RS/6000 & PowerPC |
162 | -toolset.flags gcc AROPTIONS <address-model>64/<target-os>aix : "-X64" ; | 170 | -toolset.flags gcc AROPTIONS <address-model>64/<target-os>aix : "-X64" ; |
171 | - | ||
172 | -# Enable response file control | ||
173 | -toolset.flags gcc RESPONSE_FILE_SUB <response-file>auto : a ; | ||
174 | -toolset.flags gcc RESPONSE_FILE_SUB <response-file>file : f ; | ||
175 | -toolset.flags gcc RESPONSE_FILE_SUB <response-file>contents : c ; | ||
diff --git a/meta/recipes-support/boost/boost/0001-dont-setup-compiler-flags-m32-m64.patch b/meta/recipes-support/boost/boost/0001-dont-setup-compiler-flags-m32-m64.patch index 78b19225d4..913810a340 100644 --- a/meta/recipes-support/boost/boost/0001-dont-setup-compiler-flags-m32-m64.patch +++ b/meta/recipes-support/boost/boost/0001-dont-setup-compiler-flags-m32-m64.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 59402e3a61d14eb7ce8c2019ea1a87ad4bd28605 Mon Sep 17 00:00:00 2001 | 1 | From bbb0845c0a79238fb2e84cca41826a0944b6ce7e Mon Sep 17 00:00:00 2001 |
2 | From: Anuj Mittal <anuj.mittal@intel.com> | 2 | From: Anuj Mittal <anuj.mittal@intel.com> |
3 | Date: Thu, 14 Nov 2019 10:13:53 +0800 | 3 | Date: Thu, 14 Nov 2019 10:13:53 +0800 |
4 | Subject: [PATCH] dont setup compiler flags -m32/-m64 | 4 | Subject: [PATCH] dont setup compiler flags -m32/-m64 |
@@ -13,13 +13,14 @@ Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> | |||
13 | 1 file changed, 14 deletions(-) | 13 | 1 file changed, 14 deletions(-) |
14 | 14 | ||
15 | diff --git a/tools/build/src/tools/gcc.jam b/tools/build/src/tools/gcc.jam | 15 | diff --git a/tools/build/src/tools/gcc.jam b/tools/build/src/tools/gcc.jam |
16 | index c7e3cf3..24486e0 100644 | 16 | index 493a43e6d..42dccbdfe 100644 |
17 | --- a/tools/build/src/tools/gcc.jam | 17 | --- a/tools/build/src/tools/gcc.jam |
18 | +++ b/tools/build/src/tools/gcc.jam | 18 | +++ b/tools/build/src/tools/gcc.jam |
19 | @@ -430,20 +430,6 @@ local rule compile-link-flags ( * ) | 19 | @@ -360,20 +360,6 @@ local rule compile-link-flags ( * ) |
20 | compile-link-flags <link>shared/<target-os>$(non-windows) : -fPIC ; | ||
20 | } | 21 | } |
21 | 22 | ||
22 | { | 23 | -{ |
23 | - # Handle address-model | 24 | - # Handle address-model |
24 | - compile-link-flags <target-os>aix/<address-model>32 : -maix32 ; | 25 | - compile-link-flags <target-os>aix/<address-model>32 : -maix32 ; |
25 | - compile-link-flags <target-os>aix/<address-model>64 : -maix64 ; | 26 | - compile-link-flags <target-os>aix/<address-model>64 : -maix64 ; |
@@ -33,10 +34,6 @@ index c7e3cf3..24486e0 100644 | |||
33 | - compile-link-flags <target-os>$(generic-os)/<architecture>$(arch)/<address-model>64 : -m64 ; | 34 | - compile-link-flags <target-os>$(generic-os)/<architecture>$(arch)/<address-model>64 : -m64 ; |
34 | -} | 35 | -} |
35 | - | 36 | - |
36 | -{ | 37 | { |
37 | # Handle threading | 38 | # Handle threading |
38 | local rule threading-flags ( * ) | 39 | local rule threading-flags ( * ) |
39 | { | ||
40 | -- | ||
41 | 2.7.4 | ||
42 | |||
diff --git a/meta/recipes-support/boost/boost/0001-fiber-libs-Define-SYS_futex-if-it-does-not-exist.patch b/meta/recipes-support/boost/boost/0001-fiber-libs-Define-SYS_futex-if-it-does-not-exist.patch deleted file mode 100644 index 523568e9bc..0000000000 --- a/meta/recipes-support/boost/boost/0001-fiber-libs-Define-SYS_futex-if-it-does-not-exist.patch +++ /dev/null | |||
@@ -1,54 +0,0 @@ | |||
1 | From d6f7b6064dc91d1d5fa18554b40b14822ab7a32b Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Fri, 16 Oct 2020 11:13:22 -0700 | ||
4 | Subject: [PATCH] fiber,libs: Define SYS_futex if it does not exist | ||
5 | |||
6 | __NR_futex is not defines by newer architectures e.g. arc, riscv32 as | ||
7 | they only have 64bit variant of time_t. Glibc defines SYS_futex interface based on | ||
8 | __NR_futex, since this is used in applications, such applications start | ||
9 | to fail to build for these newer architectures. This patch defines a | ||
10 | fallback to alias __NR_futex to __NR_futex_tim64 so SYS_futex keeps | ||
11 | working | ||
12 | |||
13 | Upstream-Status: Pending | ||
14 | |||
15 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
16 | --- | ||
17 | boost/fiber/detail/futex.hpp | 5 +++++ | ||
18 | libs/log/src/event.cpp | 4 ++++ | ||
19 | 2 files changed, 9 insertions(+) | ||
20 | |||
21 | diff --git a/boost/fiber/detail/futex.hpp b/boost/fiber/detail/futex.hpp | ||
22 | index e64bd5990..16bee64f1 100644 | ||
23 | --- a/boost/fiber/detail/futex.hpp | ||
24 | +++ b/boost/fiber/detail/futex.hpp | ||
25 | @@ -17,6 +17,11 @@ extern "C" { | ||
26 | #include <linux/futex.h> | ||
27 | #include <sys/syscall.h> | ||
28 | } | ||
29 | + | ||
30 | +#if !defined(SYS_futex) && defined(SYS_futex_time64) | ||
31 | +#define SYS_futex SYS_futex_time64 | ||
32 | +#endif | ||
33 | + | ||
34 | #elif BOOST_OS_WINDOWS | ||
35 | #include <windows.h> | ||
36 | #endif | ||
37 | diff --git a/libs/log/src/event.cpp b/libs/log/src/event.cpp | ||
38 | index 5485154d7..2c7c0381f 100644 | ||
39 | --- a/libs/log/src/event.cpp | ||
40 | +++ b/libs/log/src/event.cpp | ||
41 | @@ -31,6 +31,10 @@ | ||
42 | #include <linux/futex.h> | ||
43 | #include <boost/memory_order.hpp> | ||
44 | |||
45 | +#if !defined(SYS_futex) && defined(SYS_futex_time64) | ||
46 | +#define SYS_futex SYS_futex_time64 | ||
47 | +#endif | ||
48 | + | ||
49 | // Some Android NDKs (Google NDK and older Crystax.NET NDK versions) don't define SYS_futex | ||
50 | #if defined(SYS_futex) | ||
51 | #define BOOST_LOG_SYS_FUTEX SYS_futex | ||
52 | -- | ||
53 | 2.28.0 | ||
54 | |||
diff --git a/meta/recipes-support/boost/boost/boost-CVE-2012-2677.patch b/meta/recipes-support/boost/boost/boost-CVE-2012-2677.patch deleted file mode 100644 index 917617a044..0000000000 --- a/meta/recipes-support/boost/boost/boost-CVE-2012-2677.patch +++ /dev/null | |||
@@ -1,112 +0,0 @@ | |||
1 | Reference | ||
2 | |||
3 | https://svn.boost.org/trac/boost/changeset/78326 | ||
4 | |||
5 | Upstream-Status: Backport | ||
6 | CVE: CVE-2012-2677 | ||
7 | Signed-off-by: Yue Tao <yue.tao@windriver.com> | ||
8 | |||
9 | diff --git a/boost/pool/pool.hpp.old b/boost/pool/pool.hpp | ||
10 | index c47b11f..417a1e0 100644 | ||
11 | --- a/boost/pool/pool.hpp.old | ||
12 | +++ b/boost/pool/pool.hpp | ||
13 | @@ -26,6 +26,8 @@ | ||
14 | |||
15 | #include <boost/pool/poolfwd.hpp> | ||
16 | |||
17 | +// std::numeric_limits | ||
18 | +#include <boost/limits.hpp> | ||
19 | // boost::integer::static_lcm | ||
20 | #include <boost/integer/common_factor_ct.hpp> | ||
21 | // boost::simple_segregated_storage | ||
22 | @@ -355,6 +357,15 @@ class pool: protected simple_segregated_storage < typename UserAllocator::size_t | ||
23 | return s; | ||
24 | } | ||
25 | |||
26 | + size_type max_chunks() const | ||
27 | + { //! Calculated maximum number of memory chunks that can be allocated in a single call by this Pool. | ||
28 | + size_type partition_size = alloc_size(); | ||
29 | + size_type POD_size = integer::static_lcm<sizeof(size_type), sizeof(void *)>::value + sizeof(size_type); | ||
30 | + size_type max_chunks = (std::numeric_limits<size_type>::max() - POD_size) / alloc_size(); | ||
31 | + | ||
32 | + return max_chunks; | ||
33 | + } | ||
34 | + | ||
35 | static void * & nextof(void * const ptr) | ||
36 | { //! \returns Pointer dereferenced. | ||
37 | //! (Provided and used for the sake of code readability :) | ||
38 | @@ -375,6 +386,8 @@ class pool: protected simple_segregated_storage < typename UserAllocator::size_t | ||
39 | //! the first time that object needs to allocate system memory. | ||
40 | //! The default is 32. This parameter may not be 0. | ||
41 | //! \param nmax_size is the maximum number of chunks to allocate in one block. | ||
42 | + set_next_size(nnext_size); | ||
43 | + set_max_size(nmax_size); | ||
44 | } | ||
45 | |||
46 | ~pool() | ||
47 | @@ -398,8 +411,8 @@ class pool: protected simple_segregated_storage < typename UserAllocator::size_t | ||
48 | } | ||
49 | void set_next_size(const size_type nnext_size) | ||
50 | { //! Set number of chunks to request from the system the next time that object needs to allocate system memory. This value should never be set to 0. | ||
51 | - //! \returns nnext_size. | ||
52 | - next_size = start_size = nnext_size; | ||
53 | + BOOST_USING_STD_MIN(); | ||
54 | + next_size = start_size = min BOOST_PREVENT_MACRO_SUBSTITUTION(nnext_size, max_chunks()); | ||
55 | } | ||
56 | size_type get_max_size() const | ||
57 | { //! \returns max_size. | ||
58 | @@ -407,7 +420,8 @@ class pool: protected simple_segregated_storage < typename UserAllocator::size_t | ||
59 | } | ||
60 | void set_max_size(const size_type nmax_size) | ||
61 | { //! Set max_size. | ||
62 | - max_size = nmax_size; | ||
63 | + BOOST_USING_STD_MIN(); | ||
64 | + max_size = min BOOST_PREVENT_MACRO_SUBSTITUTION(nmax_size, max_chunks()); | ||
65 | } | ||
66 | size_type get_requested_size() const | ||
67 | { //! \returns the requested size passed into the constructor. | ||
68 | @@ -708,9 +722,9 @@ void * pool<UserAllocator>::malloc_need_resize() | ||
69 | |||
70 | BOOST_USING_STD_MIN(); | ||
71 | if(!max_size) | ||
72 | - next_size <<= 1; | ||
73 | + set_next_size(next_size << 1); | ||
74 | else if( next_size*partition_size/requested_size < max_size) | ||
75 | - next_size = min BOOST_PREVENT_MACRO_SUBSTITUTION(next_size << 1, max_size*requested_size/ partition_size); | ||
76 | + set_next_size(min BOOST_PREVENT_MACRO_SUBSTITUTION(next_size << 1, max_size * requested_size / partition_size)); | ||
77 | |||
78 | // initialize it, | ||
79 | store().add_block(node.begin(), node.element_size(), partition_size); | ||
80 | @@ -748,9 +762,9 @@ void * pool<UserAllocator>::ordered_malloc_need_resize() | ||
81 | |||
82 | BOOST_USING_STD_MIN(); | ||
83 | if(!max_size) | ||
84 | - next_size <<= 1; | ||
85 | + set_next_size(next_size << 1); | ||
86 | else if( next_size*partition_size/requested_size < max_size) | ||
87 | - next_size = min BOOST_PREVENT_MACRO_SUBSTITUTION(next_size << 1, max_size*requested_size/ partition_size); | ||
88 | + set_next_size(min BOOST_PREVENT_MACRO_SUBSTITUTION(next_size << 1, max_size * requested_size / partition_size)); | ||
89 | |||
90 | // initialize it, | ||
91 | // (we can use "add_block" here because we know that | ||
92 | @@ -792,6 +806,8 @@ void * pool<UserAllocator>::ordered_malloc(const size_type n) | ||
93 | { //! Gets address of a chunk n, allocating new memory if not already available. | ||
94 | //! \returns Address of chunk n if allocated ok. | ||
95 | //! \returns 0 if not enough memory for n chunks. | ||
96 | + if (n > max_chunks()) | ||
97 | + return 0; | ||
98 | |||
99 | const size_type partition_size = alloc_size(); | ||
100 | const size_type total_req_size = n * requested_size; | ||
101 | @@ -840,9 +856,9 @@ void * pool<UserAllocator>::ordered_malloc(const size_type n) | ||
102 | |||
103 | BOOST_USING_STD_MIN(); | ||
104 | if(!max_size) | ||
105 | - next_size <<= 1; | ||
106 | + set_next_size(next_size << 1); | ||
107 | else if( next_size*partition_size/requested_size < max_size) | ||
108 | - next_size = min BOOST_PREVENT_MACRO_SUBSTITUTION(next_size << 1, max_size*requested_size/ partition_size); | ||
109 | + set_next_size(min BOOST_PREVENT_MACRO_SUBSTITUTION(next_size << 1, max_size * requested_size / partition_size)); | ||
110 | |||
111 | // insert it into the list, | ||
112 | // handle border case. | ||
diff --git a/meta/recipes-support/boost/boost/boost-math-disable-pch-for-gcc.patch b/meta/recipes-support/boost/boost/boost-math-disable-pch-for-gcc.patch index 595ba17865..9b6fcc6358 100644 --- a/meta/recipes-support/boost/boost/boost-math-disable-pch-for-gcc.patch +++ b/meta/recipes-support/boost/boost/boost-math-disable-pch-for-gcc.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From cabfcba1ff7511ffd6b91ca244288d44f585aad2 Mon Sep 17 00:00:00 2001 | 1 | From d6864bd78c01c5e8578805a7b67555c70a0e99a2 Mon Sep 17 00:00:00 2001 |
2 | From: Jackie Huang <jackie.huang@windriver.com> | 2 | From: Jackie Huang <jackie.huang@windriver.com> |
3 | Date: Fri, 23 Sep 2016 01:04:50 -0700 | 3 | Date: Fri, 23 Sep 2016 01:04:50 -0700 |
4 | Subject: [PATCH] boost-math: disable pch for gcc | 4 | Subject: [PATCH] boost-math: disable pch for gcc |
@@ -14,10 +14,10 @@ Signed-off-by: Jackie Huang <jackie.huang@windriver.com> | |||
14 | 1 file changed, 1 insertion(+), 1 deletion(-) | 14 | 1 file changed, 1 insertion(+), 1 deletion(-) |
15 | 15 | ||
16 | diff --git a/libs/math/build/Jamfile.v2 b/libs/math/build/Jamfile.v2 | 16 | diff --git a/libs/math/build/Jamfile.v2 b/libs/math/build/Jamfile.v2 |
17 | index e19fb2e..82472a7 100644 | 17 | index fd840287e..5aff7d724 100644 |
18 | --- a/libs/math/build/Jamfile.v2 | 18 | --- a/libs/math/build/Jamfile.v2 |
19 | +++ b/libs/math/build/Jamfile.v2 | 19 | +++ b/libs/math/build/Jamfile.v2 |
20 | @@ -13,7 +13,7 @@ project | 20 | @@ -14,7 +14,7 @@ project |
21 | #<toolset>intel-linux:<pch>off | 21 | #<toolset>intel-linux:<pch>off |
22 | <toolset>intel-darwin:<pch>off | 22 | <toolset>intel-darwin:<pch>off |
23 | <toolset>msvc-7.1:<pch>off | 23 | <toolset>msvc-7.1:<pch>off |
@@ -26,6 +26,3 @@ index e19fb2e..82472a7 100644 | |||
26 | #<toolset>gcc:<cxxflags>-fvisibility=hidden | 26 | #<toolset>gcc:<cxxflags>-fvisibility=hidden |
27 | <toolset>intel-linux:<cxxflags>-fvisibility=hidden | 27 | <toolset>intel-linux:<cxxflags>-fvisibility=hidden |
28 | #<toolset>sun:<cxxflags>-xldscope=hidden | 28 | #<toolset>sun:<cxxflags>-xldscope=hidden |
29 | -- | ||
30 | 2.7.4 | ||
31 | |||
diff --git a/meta/recipes-support/boost/boost_1.75.0.bb b/meta/recipes-support/boost/boost_1.84.0.bb index 23b0ffc67e..4b580d078b 100644 --- a/meta/recipes-support/boost/boost_1.75.0.bb +++ b/meta/recipes-support/boost/boost_1.84.0.bb | |||
@@ -1,10 +1,7 @@ | |||
1 | require boost-${PV}.inc | 1 | require boost-${PV}.inc |
2 | require boost.inc | 2 | require boost.inc |
3 | 3 | ||
4 | SRC_URI += " \ | 4 | SRC_URI += "file://boost-math-disable-pch-for-gcc.patch \ |
5 | file://boost-CVE-2012-2677.patch \ | ||
6 | file://boost-math-disable-pch-for-gcc.patch \ | ||
7 | file://0001-Don-t-set-up-arch-instruction-set-flags-we-do-that-o.patch \ | 5 | file://0001-Don-t-set-up-arch-instruction-set-flags-we-do-that-o.patch \ |
8 | file://0001-dont-setup-compiler-flags-m32-m64.patch \ | 6 | file://0001-dont-setup-compiler-flags-m32-m64.patch \ |
9 | file://0001-fiber-libs-Define-SYS_futex-if-it-does-not-exist.patch \ | ||
10 | " | 7 | " |