From 18e94bc08db55afb2d9b9db9a51c6a2d5478c056 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Thu, 1 Feb 2018 20:02:01 +0200 Subject: boost: update to 1.66.0 Rework 0002-Don-t-set-up-m32-m64-we-do-that-ourselves.patch to remove the offending bits from the function instead of removing calls to the function all over the place. Signed-off-by: Alexander Kanavin Signed-off-by: Ross Burton --- meta/recipes-support/boost/bjam-native_1.65.1.bb | 19 --- meta/recipes-support/boost/bjam-native_1.66.0.bb | 19 +++ meta/recipes-support/boost/boost-1.65.1.inc | 21 ---- meta/recipes-support/boost/boost-1.66.0.inc | 21 ++++ ...or-which-appeared-when-compiling-non-c-co.patch | 28 ----- ...Don-t-set-up-m32-m64-we-do-that-ourselves.patch | 138 ++++++++------------- ...p-arch-instruction-set-flags-we-do-that-o.patch | 22 ++-- meta/recipes-support/boost/boost_1.65.1.bb | 12 -- meta/recipes-support/boost/boost_1.66.0.bb | 11 ++ 9 files changed, 119 insertions(+), 172 deletions(-) delete mode 100644 meta/recipes-support/boost/bjam-native_1.65.1.bb create mode 100644 meta/recipes-support/boost/bjam-native_1.66.0.bb delete mode 100644 meta/recipes-support/boost/boost-1.65.1.inc create mode 100644 meta/recipes-support/boost/boost-1.66.0.inc delete mode 100644 meta/recipes-support/boost/boost/0001-correct-error-which-appeared-when-compiling-non-c-co.patch delete mode 100644 meta/recipes-support/boost/boost_1.65.1.bb create mode 100644 meta/recipes-support/boost/boost_1.66.0.bb (limited to 'meta/recipes-support') diff --git a/meta/recipes-support/boost/bjam-native_1.65.1.bb b/meta/recipes-support/boost/bjam-native_1.65.1.bb deleted file mode 100644 index 92c86a3ef5..0000000000 --- a/meta/recipes-support/boost/bjam-native_1.65.1.bb +++ /dev/null @@ -1,19 +0,0 @@ -require boost-${PV}.inc - -SUMMARY = "Portable Boost.Jam build tool for boost" -SECTION = "devel" - -inherit native - -SRC_URI += "file://bjam-native-build-bjam.debug.patch \ - file://0001-Fix-a-strange-assert-typo-how-was-this-released-with.patch" - -do_compile() { - ./bootstrap.sh --with-toolset=gcc -} - -do_install() { - install -d ${D}${bindir}/ - # install unstripped version for bjam - install -c -m 755 bjam.debug ${D}${bindir}/bjam -} diff --git a/meta/recipes-support/boost/bjam-native_1.66.0.bb b/meta/recipes-support/boost/bjam-native_1.66.0.bb new file mode 100644 index 0000000000..92c86a3ef5 --- /dev/null +++ b/meta/recipes-support/boost/bjam-native_1.66.0.bb @@ -0,0 +1,19 @@ +require boost-${PV}.inc + +SUMMARY = "Portable Boost.Jam build tool for boost" +SECTION = "devel" + +inherit native + +SRC_URI += "file://bjam-native-build-bjam.debug.patch \ + file://0001-Fix-a-strange-assert-typo-how-was-this-released-with.patch" + +do_compile() { + ./bootstrap.sh --with-toolset=gcc +} + +do_install() { + install -d ${D}${bindir}/ + # install unstripped version for bjam + install -c -m 755 bjam.debug ${D}${bindir}/bjam +} diff --git a/meta/recipes-support/boost/boost-1.65.1.inc b/meta/recipes-support/boost/boost-1.65.1.inc deleted file mode 100644 index f0ca88ca3e..0000000000 --- a/meta/recipes-support/boost/boost-1.65.1.inc +++ /dev/null @@ -1,21 +0,0 @@ -# The Boost web site provides free peer-reviewed portable -# C++ source libraries. The emphasis is on libraries which -# work well with the C++ Standard Library. The libraries are -# intended to be widely useful, and are in regular use by -# thousands of programmers across a broad spectrum of applications. -HOMEPAGE = "http://www.boost.org/" -LICENSE = "BSL-1.0 & MIT & Python-2.0" -LIC_FILES_CHKSUM = "file://LICENSE_1_0.txt;md5=e4224ccaecb14d942c71d31bef20d78c" - -BOOST_VER = "${@"_".join(d.getVar("PV").split("."))}" -BOOST_MAJ = "${@"_".join(d.getVar("PV").split(".")[0:2])}" -BOOST_P = "boost_${BOOST_VER}" - -SRC_URI = "${SOURCEFORGE_MIRROR}/project/boost/boost/${PV}/${BOOST_P}.tar.bz2" -SRC_URI[md5sum] = "41d7542ce40e171f3f7982aff008ff0d" -SRC_URI[sha256sum] = "9807a5d16566c57fd74fb522764e0b134a8bbe6b6e8967b83afefd30dcd3be81" - -UPSTREAM_CHECK_URI = "http://www.boost.org/users/download/" -UPSTREAM_CHECK_REGEX = "boostorg/release/(?P.*)/source/" - -S = "${WORKDIR}/${BOOST_P}" diff --git a/meta/recipes-support/boost/boost-1.66.0.inc b/meta/recipes-support/boost/boost-1.66.0.inc new file mode 100644 index 0000000000..fe2b8639f7 --- /dev/null +++ b/meta/recipes-support/boost/boost-1.66.0.inc @@ -0,0 +1,21 @@ +# The Boost web site provides free peer-reviewed portable +# C++ source libraries. The emphasis is on libraries which +# work well with the C++ Standard Library. The libraries are +# intended to be widely useful, and are in regular use by +# thousands of programmers across a broad spectrum of applications. +HOMEPAGE = "http://www.boost.org/" +LICENSE = "BSL-1.0 & MIT & Python-2.0" +LIC_FILES_CHKSUM = "file://LICENSE_1_0.txt;md5=e4224ccaecb14d942c71d31bef20d78c" + +BOOST_VER = "${@"_".join(d.getVar("PV").split("."))}" +BOOST_MAJ = "${@"_".join(d.getVar("PV").split(".")[0:2])}" +BOOST_P = "boost_${BOOST_VER}" + +SRC_URI = "${SOURCEFORGE_MIRROR}/project/boost/boost/${PV}/${BOOST_P}.tar.bz2" +SRC_URI[md5sum] = "b2dfbd6c717be4a7bb2d88018eaccf75" +SRC_URI[sha256sum] = "5721818253e6a0989583192f96782c4a98eb6204965316df9f5ad75819225ca9" + +UPSTREAM_CHECK_URI = "http://www.boost.org/users/download/" +UPSTREAM_CHECK_REGEX = "boostorg/release/(?P.*)/source/" + +S = "${WORKDIR}/${BOOST_P}" diff --git a/meta/recipes-support/boost/boost/0001-correct-error-which-appeared-when-compiling-non-c-co.patch b/meta/recipes-support/boost/boost/0001-correct-error-which-appeared-when-compiling-non-c-co.patch deleted file mode 100644 index f96005ebc7..0000000000 --- a/meta/recipes-support/boost/boost/0001-correct-error-which-appeared-when-compiling-non-c-co.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 02fa5cee1b8d0321787113e2dc10b162c657f333 Mon Sep 17 00:00:00 2001 -From: Robert Ramey -Date: Wed, 1 Feb 2017 16:43:59 -0800 -Subject: [PATCH] correct error which appeared when compiling non c++ compliant - code for arrays - -Upstream-Status: Backport [expected to be released in v1.65] - ---- - boost/serialization/array.hpp | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/boost/serialization/array.hpp b/boost/serialization/array.hpp -index 61708b3..612d1a6 100644 ---- a/boost/serialization/array.hpp -+++ b/boost/serialization/array.hpp -@@ -23,6 +23,8 @@ namespace std{ - } // namespace std - #endif - -+#include -+ - #ifndef BOOST_NO_CXX11_HDR_ARRAY - - #include --- -2.9.3 - diff --git a/meta/recipes-support/boost/boost/0002-Don-t-set-up-m32-m64-we-do-that-ourselves.patch b/meta/recipes-support/boost/boost/0002-Don-t-set-up-m32-m64-we-do-that-ourselves.patch index e9c7e4c555..26f3cbb051 100644 --- a/meta/recipes-support/boost/boost/0002-Don-t-set-up-m32-m64-we-do-that-ourselves.patch +++ b/meta/recipes-support/boost/boost/0002-Don-t-set-up-m32-m64-we-do-that-ourselves.patch @@ -1,97 +1,65 @@ -From c0e785f8da2caa6617052b1c7b347e0dffb1520d Mon Sep 17 00:00:00 2001 +From e4d3a7470b307693660d0412732e7266d1738d8c Mon Sep 17 00:00:00 2001 From: Christopher Larson Date: Tue, 13 Dec 2016 10:29:17 -0700 -Subject: [PATCH 2/3] Don't set up -m32/-m64, we do that ourselves +Subject: [PATCH 6/6] Don't set up -m32/-m64, we do that ourselves Upstream-Status: Inappropriate Signed-off-by: Christopher Larson + --- - tools/build/src/tools/gcc.jam | 10 ---------- - 1 file changed, 10 deletions(-) + tools/build/src/tools/gcc.jam | 39 --------------------------------------- + 1 file changed, 39 deletions(-) diff --git a/tools/build/src/tools/gcc.jam b/tools/build/src/tools/gcc.jam -index 0f346a5..942f141 100644 +index e4fc6c32..37914fd0 100644 --- a/tools/build/src/tools/gcc.jam +++ b/tools/build/src/tools/gcc.jam -@@ -509,7 +509,6 @@ rule compile.c++.pch ( targets * : sources * : properties * ) - { - setup-threading $(targets) : $(sources) : $(properties) ; - setup-fpic $(targets) : $(sources) : $(properties) ; -- setup-address-model $(targets) : $(sources) : $(properties) ; - } - - actions compile.c++.pch -@@ -521,7 +520,6 @@ rule compile.c.pch ( targets * : sources * : properties * ) - { - setup-threading $(targets) : $(sources) : $(properties) ; - setup-fpic $(targets) : $(sources) : $(properties) ; -- setup-address-model $(targets) : $(sources) : $(properties) ; - } - - actions compile.c.pch -@@ -533,7 +531,6 @@ rule compile.c++.preprocess ( targets * : sources * : properties * ) - { - setup-threading $(targets) : $(sources) : $(properties) ; - setup-fpic $(targets) : $(sources) : $(properties) ; -- setup-address-model $(targets) : $(sources) : $(properties) ; - - # Some extensions are compiled as C++ by default. For others, we need to - # pass -x c++. We could always pass -x c++ but distcc does not work with it. -@@ -548,7 +545,6 @@ rule compile.c.preprocess ( targets * : sources * : properties * ) - { - setup-threading $(targets) : $(sources) : $(properties) ; - setup-fpic $(targets) : $(sources) : $(properties) ; -- setup-address-model $(targets) : $(sources) : $(properties) ; - - # If we use the name g++ then default file suffix -> language mapping does - # not work. So have to pass -x option. Maybe, we can work around this by -@@ -564,7 +560,6 @@ rule compile.c++ ( targets * : sources * : properties * ) - { - setup-threading $(targets) : $(sources) : $(properties) ; - setup-fpic $(targets) : $(sources) : $(properties) ; -- setup-address-model $(targets) : $(sources) : $(properties) ; - - # Some extensions are compiled as C++ by default. For others, we need to - # pass -x c++. We could always pass -x c++ but distcc does not work with it. -@@ -594,7 +589,6 @@ rule compile.c ( targets * : sources * : properties * ) - { - setup-threading $(targets) : $(sources) : $(properties) ; - setup-fpic $(targets) : $(sources) : $(properties) ; -- setup-address-model $(targets) : $(sources) : $(properties) ; - - # If we use the name g++ then default file suffix -> language mapping does - # not work. So have to pass -x option. Maybe, we can work around this by -@@ -610,7 +604,6 @@ rule compile.fortran ( targets * : sources * : properties * ) - { - setup-threading $(targets) : $(sources) : $(properties) ; - setup-fpic $(targets) : $(sources) : $(properties) ; -- setup-address-model $(targets) : $(sources) : $(properties) ; +@@ -337,45 +337,6 @@ rule set-address-model-options ( targets * : sources * : properties * ) + { + local option ; + local target-os = [ feature.get-values target-os : $(properties) ] ; +- if $(target-os) = aix +- { +- if $(model) = 32 +- { +- option = -maix32 ; +- } +- else +- { +- option = -maix64 ; +- } +- } +- else if $(target-os) = hpux +- { +- if $(model) = 32 +- { +- option = -milp32 ; +- } +- else +- { +- option = -mlp64 ; +- } +- } +- else +- { +- local arch = [ feature.get-values architecture : $(properties) ] ; +- if $(arch) = power || $(arch) = sparc || $(arch) = x86 +- { +- if $(model) = 32 +- { +- option = -m32 ; +- } +- else if $(model) = 64 +- { +- option = -m64 ; +- } +- } +- # For darwin, the model can be 32_64. darwin.jam will handle that +- # on its own. +- } + OPTIONS on $(targets) += $(option) ; + } } - - actions compile.c++ bind PCH_FILE -@@ -641,7 +634,6 @@ actions compile.fortran - rule compile.asm ( targets * : sources * : properties * ) - { - setup-fpic $(targets) : $(sources) : $(properties) ; -- setup-address-model $(targets) : $(sources) : $(properties) ; - LANG on $(<) = "-x assembler-with-cpp" ; - } - -@@ -950,7 +942,6 @@ rule quote-rpath ( targets * ) - rule link ( targets * : sources * : properties * ) - { - setup-threading $(targets) : $(sources) : $(properties) ; -- setup-address-model $(targets) : $(sources) : $(properties) ; - SPACE on $(targets) = " " ; - # Serialize execution of the 'link' action, since running N links in - # parallel is just slower. For now, serialize only gcc links, it might be a -@@ -1018,7 +1009,6 @@ actions piecemeal archive - rule link.dll ( targets * : sources * : properties * ) - { - setup-threading $(targets) : $(sources) : $(properties) ; -- setup-address-model $(targets) : $(sources) : $(properties) ; - SPACE on $(targets) = " " ; - JAM_SEMAPHORE on $(targets) = gcc-link-semaphore ; - quote-rpath $(targets) ; -- -2.8.0 +2.15.1 + diff --git a/meta/recipes-support/boost/boost/0003-Don-t-set-up-arch-instruction-set-flags-we-do-that-o.patch b/meta/recipes-support/boost/boost/0003-Don-t-set-up-arch-instruction-set-flags-we-do-that-o.patch index 6bb25f885c..fb6d9711b9 100644 --- a/meta/recipes-support/boost/boost/0003-Don-t-set-up-arch-instruction-set-flags-we-do-that-o.patch +++ b/meta/recipes-support/boost/boost/0003-Don-t-set-up-arch-instruction-set-flags-we-do-that-o.patch @@ -1,20 +1,21 @@ -From 7c49525812567f1219706c4ed330b3bd2cc8e94a Mon Sep 17 00:00:00 2001 +From 0868761e7d2d75d472090e3ef96f3d2f9ced27f3 Mon Sep 17 00:00:00 2001 From: Christopher Larson Date: Tue, 13 Dec 2016 10:29:32 -0700 -Subject: [PATCH 3/3] Don't set up arch/instruction-set flags, we do that +Subject: [PATCH 5/6] Don't set up arch/instruction-set flags, we do that ourselves Upstream-Status: Inappropriate Signed-off-by: Christopher Larson + --- - tools/build/src/tools/gcc.jam | 121 ------------------------------------------ - 1 file changed, 121 deletions(-) + tools/build/src/tools/gcc.jam | 127 ------------------------------------------ + 1 file changed, 127 deletions(-) diff --git a/tools/build/src/tools/gcc.jam b/tools/build/src/tools/gcc.jam -index 942f141..d062c20 100644 +index e3b1b952..e4fc6c32 100644 --- a/tools/build/src/tools/gcc.jam +++ b/tools/build/src/tools/gcc.jam -@@ -1068,124 +1068,3 @@ local rule cpu-flags ( toolset variable : architecture : instruction-set + : +@@ -1276,130 +1276,3 @@ local rule cpu-flags ( toolset variable : architecture : instruction-set + : $(architecture)/$(instruction-set) : $(values) ; } @@ -60,6 +61,10 @@ index 942f141..d062c20 100644 -cpu-flags gcc OPTIONS : x86 : core-avx-i : -march=core-avx-i ; -cpu-flags gcc OPTIONS : x86 : ivy-bridge : -march=core-avx-i ; -cpu-flags gcc OPTIONS : x86 : haswell : -march=core-avx-i -mavx2 -mfma -mbmi -mbmi2 -mlzcnt ; +-cpu-flags gcc OPTIONS : x86 : broadwell : -march=broadwell ; +-cpu-flags gcc OPTIONS : x86 : skylake : -march=skylake ; +-cpu-flags gcc OPTIONS : x86 : skylake-avx512 : -march=skylake-avx512 ; +-cpu-flags gcc OPTIONS : x86 : cannonlake : -march=skylake-avx512 -mavx512vbmi -mavx512ifma -msha ; -cpu-flags gcc OPTIONS : x86 : k6 : -march=k6 ; -cpu-flags gcc OPTIONS : x86 : k6-2 : -march=k6-2 ; -cpu-flags gcc OPTIONS : x86 : k6-3 : -march=k6-3 ; @@ -81,8 +86,10 @@ index 942f141..d062c20 100644 -cpu-flags gcc OPTIONS : x86 : bdver1 : -march=bdver1 ; -cpu-flags gcc OPTIONS : x86 : bdver2 : -march=bdver2 ; -cpu-flags gcc OPTIONS : x86 : bdver3 : -march=bdver3 ; +-cpu-flags gcc OPTIONS : x86 : bdver4 : -march=bdver4 ; -cpu-flags gcc OPTIONS : x86 : btver1 : -march=btver1 ; -cpu-flags gcc OPTIONS : x86 : btver2 : -march=btver2 ; +-cpu-flags gcc OPTIONS : x86 : znver1 : -march=znver1 ; -cpu-flags gcc OPTIONS : x86 : winchip-c6 : -march=winchip-c6 ; -cpu-flags gcc OPTIONS : x86 : winchip2 : -march=winchip2 ; -cpu-flags gcc OPTIONS : x86 : c3 : -march=c3 ; @@ -140,4 +147,5 @@ index 942f141..d062c20 100644 -# AIX variant of RS/6000 & PowerPC -toolset.flags gcc AROPTIONS 64/aix : "-X64" ; -- -2.8.0 +2.15.1 + diff --git a/meta/recipes-support/boost/boost_1.65.1.bb b/meta/recipes-support/boost/boost_1.65.1.bb deleted file mode 100644 index 9ba56703a5..0000000000 --- a/meta/recipes-support/boost/boost_1.65.1.bb +++ /dev/null @@ -1,12 +0,0 @@ -require boost-${PV}.inc -require boost.inc - -SRC_URI += "\ - file://arm-intrinsics.patch \ - file://boost-CVE-2012-2677.patch \ - file://boost-math-disable-pch-for-gcc.patch \ - file://0001-Apply-boost-1.62.0-no-forced-flags.patch.patch \ - file://0003-Don-t-set-up-arch-instruction-set-flags-we-do-that-o.patch \ - file://0002-Don-t-set-up-m32-m64-we-do-that-ourselves.patch \ - file://0001-correct-error-which-appeared-when-compiling-non-c-co.patch \ -" diff --git a/meta/recipes-support/boost/boost_1.66.0.bb b/meta/recipes-support/boost/boost_1.66.0.bb new file mode 100644 index 0000000000..63b82a5995 --- /dev/null +++ b/meta/recipes-support/boost/boost_1.66.0.bb @@ -0,0 +1,11 @@ +require boost-${PV}.inc +require boost.inc + +SRC_URI += "\ + file://arm-intrinsics.patch \ + file://boost-CVE-2012-2677.patch \ + file://boost-math-disable-pch-for-gcc.patch \ + file://0001-Apply-boost-1.62.0-no-forced-flags.patch.patch \ + file://0003-Don-t-set-up-arch-instruction-set-flags-we-do-that-o.patch \ + file://0002-Don-t-set-up-m32-m64-we-do-that-ourselves.patch \ +" -- cgit 1.2.3-korg