From 894d2867275e72caac9181ea3b859d7595268f7f Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Tue, 18 Dec 2018 17:30:01 +0100 Subject: boost: update to 1.69.0 Drop upstreamed reproducibility-add-file-directive-to-assembler.patch Drop signals library as upstream has removed it: https://www.boost.org/users/history/version_1_69_0.html Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- meta/recipes-support/boost/bjam-native_1.68.0.bb | 19 -- meta/recipes-support/boost/bjam-native_1.69.0.bb | 19 ++ meta/recipes-support/boost/boost-1.68.0.inc | 21 -- meta/recipes-support/boost/boost-1.69.0.inc | 21 ++ meta/recipes-support/boost/boost.inc | 1 - ...p-arch-instruction-set-flags-we-do-that-o.patch | 148 +++++++++++++ ...p-arch-instruction-set-flags-we-do-that-o.patch | 151 ------------- ...ucibility-add-file-directive-to-assembler.patch | 243 --------------------- meta/recipes-support/boost/boost_1.68.0.bb | 11 - meta/recipes-support/boost/boost_1.69.0.bb | 9 + 10 files changed, 197 insertions(+), 446 deletions(-) delete mode 100644 meta/recipes-support/boost/bjam-native_1.68.0.bb create mode 100644 meta/recipes-support/boost/bjam-native_1.69.0.bb delete mode 100644 meta/recipes-support/boost/boost-1.68.0.inc create mode 100644 meta/recipes-support/boost/boost-1.69.0.inc create mode 100644 meta/recipes-support/boost/boost/0001-Don-t-set-up-arch-instruction-set-flags-we-do-that-o.patch delete mode 100644 meta/recipes-support/boost/boost/0003-Don-t-set-up-arch-instruction-set-flags-we-do-that-o.patch delete mode 100644 meta/recipes-support/boost/boost/reproducibility-add-file-directive-to-assembler.patch delete mode 100644 meta/recipes-support/boost/boost_1.68.0.bb create mode 100644 meta/recipes-support/boost/boost_1.69.0.bb diff --git a/meta/recipes-support/boost/bjam-native_1.68.0.bb b/meta/recipes-support/boost/bjam-native_1.68.0.bb deleted file mode 100644 index 94f96e62d8..0000000000 --- a/meta/recipes-support/boost/bjam-native_1.68.0.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 \ -" - -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.69.0.bb b/meta/recipes-support/boost/bjam-native_1.69.0.bb new file mode 100644 index 0000000000..94f96e62d8 --- /dev/null +++ b/meta/recipes-support/boost/bjam-native_1.69.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 \ +" + +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.68.0.inc b/meta/recipes-support/boost/boost-1.68.0.inc deleted file mode 100644 index b367a80b64..0000000000 --- a/meta/recipes-support/boost/boost-1.68.0.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] = "7fbd1890f571051f2a209681d57d486a" -SRC_URI[sha256sum] = "7f6130bc3cf65f56a618888ce9d5ea704fa10b462be126ad053e80e553d6d8b7" - -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.69.0.inc b/meta/recipes-support/boost/boost-1.69.0.inc new file mode 100644 index 0000000000..923436b1e0 --- /dev/null +++ b/meta/recipes-support/boost/boost-1.69.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] = "a1332494397bf48332cb152abfefcec2" +SRC_URI[sha256sum] = "8f32d4617390d1c2d16f26a27ab60d97807b35440d45891fa340fc2648b04406" + +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.inc b/meta/recipes-support/boost/boost.inc index c4faea211f..9be3717fd6 100644 --- a/meta/recipes-support/boost/boost.inc +++ b/meta/recipes-support/boost/boost.inc @@ -21,7 +21,6 @@ BOOST_LIBS = "\ random \ regex \ serialization \ - signals \ system \ timer \ test \ 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 new file mode 100644 index 0000000000..8944cb37b4 --- /dev/null +++ b/meta/recipes-support/boost/boost/0001-Don-t-set-up-arch-instruction-set-flags-we-do-that-o.patch @@ -0,0 +1,148 @@ +From 3e4eb02eb5951058bc6f8dffbf049eb189df8291 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin +Date: Tue, 18 Dec 2018 15:42:57 +0100 +Subject: [PATCH] Don't set up arch/instruction-set flags, we do that ourselves + +Upstream-Status: Inappropriate +Signed-off-by: Christopher Larson +Signed-off-by: Alexander Kanavin +--- + tools/build/src/tools/gcc.jam | 128 ---------------------------------- + 1 file changed, 128 deletions(-) + +diff --git a/tools/build/src/tools/gcc.jam b/tools/build/src/tools/gcc.jam +index c57c773f..28618fb1 100644 +--- a/tools/build/src/tools/gcc.jam ++++ b/tools/build/src/tools/gcc.jam +@@ -1152,131 +1152,3 @@ local rule cpu-flags ( toolset variable : architecture : instruction-set + : + $(architecture)/$(instruction-set) + : $(values) ; + } +- +- +-# Set architecture/instruction-set options. +-# +-# x86 and compatible +-# The 'native' option appeared in gcc 4.2 so we cannot safely use it as default. +-# Use i686 instead for 32-bit. +-toolset.flags gcc OPTIONS x86/32/ : -march=i686 ; +-cpu-flags gcc OPTIONS : x86 : native : -march=native ; +-cpu-flags gcc OPTIONS : x86 : i486 : -march=i486 ; +-cpu-flags gcc OPTIONS : x86 : i586 : -march=i586 ; +-cpu-flags gcc OPTIONS : x86 : i686 : -march=i686 ; +-cpu-flags gcc OPTIONS : x86 : pentium : -march=pentium ; +-cpu-flags gcc OPTIONS : x86 : pentium-mmx : -march=pentium-mmx ; +-cpu-flags gcc OPTIONS : x86 : pentiumpro : -march=pentiumpro ; +-cpu-flags gcc OPTIONS : x86 : pentium2 : -march=pentium2 ; +-cpu-flags gcc OPTIONS : x86 : pentium3 : -march=pentium3 ; +-cpu-flags gcc OPTIONS : x86 : pentium3m : -march=pentium3m ; +-cpu-flags gcc OPTIONS : x86 : pentium-m : -march=pentium-m ; +-cpu-flags gcc OPTIONS : x86 : pentium4 : -march=pentium4 ; +-cpu-flags gcc OPTIONS : x86 : pentium4m : -march=pentium4m ; +-cpu-flags gcc OPTIONS : x86 : prescott : -march=prescott ; +-cpu-flags gcc OPTIONS : x86 : nocona : -march=nocona ; +-cpu-flags gcc OPTIONS : x86 : core2 : -march=core2 ; +-cpu-flags gcc OPTIONS : x86 : conroe : -march=core2 ; +-cpu-flags gcc OPTIONS : x86 : conroe-xe : -march=core2 ; +-cpu-flags gcc OPTIONS : x86 : conroe-l : -march=core2 ; +-cpu-flags gcc OPTIONS : x86 : allendale : -march=core2 ; +-cpu-flags gcc OPTIONS : x86 : wolfdale : -march=core2 -msse4.1 ; +-cpu-flags gcc OPTIONS : x86 : merom : -march=core2 ; +-cpu-flags gcc OPTIONS : x86 : merom-xe : -march=core2 ; +-cpu-flags gcc OPTIONS : x86 : kentsfield : -march=core2 ; +-cpu-flags gcc OPTIONS : x86 : kentsfield-xe : -march=core2 ; +-cpu-flags gcc OPTIONS : x86 : yorksfield : -march=core2 ; +-cpu-flags gcc OPTIONS : x86 : penryn : -march=core2 ; +-cpu-flags gcc OPTIONS : x86 : corei7 : -march=corei7 ; +-cpu-flags gcc OPTIONS : x86 : nehalem : -march=corei7 ; +-cpu-flags gcc OPTIONS : x86 : corei7-avx : -march=corei7-avx ; +-cpu-flags gcc OPTIONS : x86 : sandy-bridge : -march=corei7-avx ; +-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 : icelake : -march=icelake ; +-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 ; +-cpu-flags gcc OPTIONS : x86 : athlon : -march=athlon ; +-cpu-flags gcc OPTIONS : x86 : athlon-tbird : -march=athlon-tbird ; +-cpu-flags gcc OPTIONS : x86 : athlon-4 : -march=athlon-4 ; +-cpu-flags gcc OPTIONS : x86 : athlon-xp : -march=athlon-xp ; +-cpu-flags gcc OPTIONS : x86 : athlon-mp : -march=athlon-mp ; +-## +-cpu-flags gcc OPTIONS : x86 : k8 : -march=k8 ; +-cpu-flags gcc OPTIONS : x86 : opteron : -march=opteron ; +-cpu-flags gcc OPTIONS : x86 : athlon64 : -march=athlon64 ; +-cpu-flags gcc OPTIONS : x86 : athlon-fx : -march=athlon-fx ; +-cpu-flags gcc OPTIONS : x86 : k8-sse3 : -march=k8-sse3 ; +-cpu-flags gcc OPTIONS : x86 : opteron-sse3 : -march=opteron-sse3 ; +-cpu-flags gcc OPTIONS : x86 : athlon64-sse3 : -march=athlon64-sse3 ; +-cpu-flags gcc OPTIONS : x86 : amdfam10 : -march=amdfam10 ; +-cpu-flags gcc OPTIONS : x86 : barcelona : -march=barcelona ; +-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 ; +-cpu-flags gcc OPTIONS : x86 : c3-2 : -march=c3-2 ; +-## +-cpu-flags gcc OPTIONS : x86 : atom : -march=atom ; +-# Sparc +-cpu-flags gcc OPTIONS : sparc : v7 : -mcpu=v7 : default ; +-cpu-flags gcc OPTIONS : sparc : cypress : -mcpu=cypress ; +-cpu-flags gcc OPTIONS : sparc : v8 : -mcpu=v8 ; +-cpu-flags gcc OPTIONS : sparc : supersparc : -mcpu=supersparc ; +-cpu-flags gcc OPTIONS : sparc : sparclite : -mcpu=sparclite ; +-cpu-flags gcc OPTIONS : sparc : hypersparc : -mcpu=hypersparc ; +-cpu-flags gcc OPTIONS : sparc : sparclite86x : -mcpu=sparclite86x ; +-cpu-flags gcc OPTIONS : sparc : f930 : -mcpu=f930 ; +-cpu-flags gcc OPTIONS : sparc : f934 : -mcpu=f934 ; +-cpu-flags gcc OPTIONS : sparc : sparclet : -mcpu=sparclet ; +-cpu-flags gcc OPTIONS : sparc : tsc701 : -mcpu=tsc701 ; +-cpu-flags gcc OPTIONS : sparc : v9 : -mcpu=v9 ; +-cpu-flags gcc OPTIONS : sparc : ultrasparc : -mcpu=ultrasparc ; +-cpu-flags gcc OPTIONS : sparc : ultrasparc3 : -mcpu=ultrasparc3 ; +-# RS/6000 & PowerPC +-cpu-flags gcc OPTIONS : power : 403 : -mcpu=403 ; +-cpu-flags gcc OPTIONS : power : 505 : -mcpu=505 ; +-cpu-flags gcc OPTIONS : power : 601 : -mcpu=601 ; +-cpu-flags gcc OPTIONS : power : 602 : -mcpu=602 ; +-cpu-flags gcc OPTIONS : power : 603 : -mcpu=603 ; +-cpu-flags gcc OPTIONS : power : 603e : -mcpu=603e ; +-cpu-flags gcc OPTIONS : power : 604 : -mcpu=604 ; +-cpu-flags gcc OPTIONS : power : 604e : -mcpu=604e ; +-cpu-flags gcc OPTIONS : power : 620 : -mcpu=620 ; +-cpu-flags gcc OPTIONS : power : 630 : -mcpu=630 ; +-cpu-flags gcc OPTIONS : power : 740 : -mcpu=740 ; +-cpu-flags gcc OPTIONS : power : 7400 : -mcpu=7400 ; +-cpu-flags gcc OPTIONS : power : 7450 : -mcpu=7450 ; +-cpu-flags gcc OPTIONS : power : 750 : -mcpu=750 ; +-cpu-flags gcc OPTIONS : power : 801 : -mcpu=801 ; +-cpu-flags gcc OPTIONS : power : 821 : -mcpu=821 ; +-cpu-flags gcc OPTIONS : power : 823 : -mcpu=823 ; +-cpu-flags gcc OPTIONS : power : 860 : -mcpu=860 ; +-cpu-flags gcc OPTIONS : power : 970 : -mcpu=970 ; +-cpu-flags gcc OPTIONS : power : 8540 : -mcpu=8540 ; +-cpu-flags gcc OPTIONS : power : power : -mcpu=power ; +-cpu-flags gcc OPTIONS : power : power2 : -mcpu=power2 ; +-cpu-flags gcc OPTIONS : power : power3 : -mcpu=power3 ; +-cpu-flags gcc OPTIONS : power : power4 : -mcpu=power4 ; +-cpu-flags gcc OPTIONS : power : power5 : -mcpu=power5 ; +-cpu-flags gcc OPTIONS : power : powerpc : -mcpu=powerpc ; +-cpu-flags gcc OPTIONS : power : powerpc64 : -mcpu=powerpc64 ; +-cpu-flags gcc OPTIONS : power : rios : -mcpu=rios ; +-cpu-flags gcc OPTIONS : power : rios1 : -mcpu=rios1 ; +-cpu-flags gcc OPTIONS : power : rios2 : -mcpu=rios2 ; +-cpu-flags gcc OPTIONS : power : rsc : -mcpu=rsc ; +-cpu-flags gcc OPTIONS : power : rs64a : -mcpu=rs64 ; +-# AIX variant of RS/6000 & PowerPC +-toolset.flags gcc AROPTIONS 64/aix : "-X64" ; 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 deleted file mode 100644 index fb6d9711b9..0000000000 --- a/meta/recipes-support/boost/boost/0003-Don-t-set-up-arch-instruction-set-flags-we-do-that-o.patch +++ /dev/null @@ -1,151 +0,0 @@ -From 0868761e7d2d75d472090e3ef96f3d2f9ced27f3 Mon Sep 17 00:00:00 2001 -From: Christopher Larson -Date: Tue, 13 Dec 2016 10:29:32 -0700 -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 | 127 ------------------------------------------ - 1 file changed, 127 deletions(-) - -diff --git a/tools/build/src/tools/gcc.jam b/tools/build/src/tools/gcc.jam -index e3b1b952..e4fc6c32 100644 ---- a/tools/build/src/tools/gcc.jam -+++ b/tools/build/src/tools/gcc.jam -@@ -1276,130 +1276,3 @@ local rule cpu-flags ( toolset variable : architecture : instruction-set + : - $(architecture)/$(instruction-set) - : $(values) ; - } -- -- --# Set architecture/instruction-set options. --# --# x86 and compatible --# The 'native' option appeared in gcc 4.2 so we cannot safely use it as default. --# Use i686 instead for 32-bit. --toolset.flags gcc OPTIONS x86/32/ : -march=i686 ; --cpu-flags gcc OPTIONS : x86 : native : -march=native ; --cpu-flags gcc OPTIONS : x86 : i486 : -march=i486 ; --cpu-flags gcc OPTIONS : x86 : i586 : -march=i586 ; --cpu-flags gcc OPTIONS : x86 : i686 : -march=i686 ; --cpu-flags gcc OPTIONS : x86 : pentium : -march=pentium ; --cpu-flags gcc OPTIONS : x86 : pentium-mmx : -march=pentium-mmx ; --cpu-flags gcc OPTIONS : x86 : pentiumpro : -march=pentiumpro ; --cpu-flags gcc OPTIONS : x86 : pentium2 : -march=pentium2 ; --cpu-flags gcc OPTIONS : x86 : pentium3 : -march=pentium3 ; --cpu-flags gcc OPTIONS : x86 : pentium3m : -march=pentium3m ; --cpu-flags gcc OPTIONS : x86 : pentium-m : -march=pentium-m ; --cpu-flags gcc OPTIONS : x86 : pentium4 : -march=pentium4 ; --cpu-flags gcc OPTIONS : x86 : pentium4m : -march=pentium4m ; --cpu-flags gcc OPTIONS : x86 : prescott : -march=prescott ; --cpu-flags gcc OPTIONS : x86 : nocona : -march=nocona ; --cpu-flags gcc OPTIONS : x86 : core2 : -march=core2 ; --cpu-flags gcc OPTIONS : x86 : conroe : -march=core2 ; --cpu-flags gcc OPTIONS : x86 : conroe-xe : -march=core2 ; --cpu-flags gcc OPTIONS : x86 : conroe-l : -march=core2 ; --cpu-flags gcc OPTIONS : x86 : allendale : -march=core2 ; --cpu-flags gcc OPTIONS : x86 : wolfdale : -march=core2 -msse4.1 ; --cpu-flags gcc OPTIONS : x86 : merom : -march=core2 ; --cpu-flags gcc OPTIONS : x86 : merom-xe : -march=core2 ; --cpu-flags gcc OPTIONS : x86 : kentsfield : -march=core2 ; --cpu-flags gcc OPTIONS : x86 : kentsfield-xe : -march=core2 ; --cpu-flags gcc OPTIONS : x86 : yorksfield : -march=core2 ; --cpu-flags gcc OPTIONS : x86 : penryn : -march=core2 ; --cpu-flags gcc OPTIONS : x86 : corei7 : -march=corei7 ; --cpu-flags gcc OPTIONS : x86 : nehalem : -march=corei7 ; --cpu-flags gcc OPTIONS : x86 : corei7-avx : -march=corei7-avx ; --cpu-flags gcc OPTIONS : x86 : sandy-bridge : -march=corei7-avx ; --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 ; --cpu-flags gcc OPTIONS : x86 : athlon : -march=athlon ; --cpu-flags gcc OPTIONS : x86 : athlon-tbird : -march=athlon-tbird ; --cpu-flags gcc OPTIONS : x86 : athlon-4 : -march=athlon-4 ; --cpu-flags gcc OPTIONS : x86 : athlon-xp : -march=athlon-xp ; --cpu-flags gcc OPTIONS : x86 : athlon-mp : -march=athlon-mp ; --## --cpu-flags gcc OPTIONS : x86 : k8 : -march=k8 ; --cpu-flags gcc OPTIONS : x86 : opteron : -march=opteron ; --cpu-flags gcc OPTIONS : x86 : athlon64 : -march=athlon64 ; --cpu-flags gcc OPTIONS : x86 : athlon-fx : -march=athlon-fx ; --cpu-flags gcc OPTIONS : x86 : k8-sse3 : -march=k8-sse3 ; --cpu-flags gcc OPTIONS : x86 : opteron-sse3 : -march=opteron-sse3 ; --cpu-flags gcc OPTIONS : x86 : athlon64-sse3 : -march=athlon64-sse3 ; --cpu-flags gcc OPTIONS : x86 : amdfam10 : -march=amdfam10 ; --cpu-flags gcc OPTIONS : x86 : barcelona : -march=barcelona ; --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 ; --cpu-flags gcc OPTIONS : x86 : c3-2 : -march=c3-2 ; --## --cpu-flags gcc OPTIONS : x86 : atom : -march=atom ; --# Sparc --cpu-flags gcc OPTIONS : sparc : v7 : -mcpu=v7 : default ; --cpu-flags gcc OPTIONS : sparc : cypress : -mcpu=cypress ; --cpu-flags gcc OPTIONS : sparc : v8 : -mcpu=v8 ; --cpu-flags gcc OPTIONS : sparc : supersparc : -mcpu=supersparc ; --cpu-flags gcc OPTIONS : sparc : sparclite : -mcpu=sparclite ; --cpu-flags gcc OPTIONS : sparc : hypersparc : -mcpu=hypersparc ; --cpu-flags gcc OPTIONS : sparc : sparclite86x : -mcpu=sparclite86x ; --cpu-flags gcc OPTIONS : sparc : f930 : -mcpu=f930 ; --cpu-flags gcc OPTIONS : sparc : f934 : -mcpu=f934 ; --cpu-flags gcc OPTIONS : sparc : sparclet : -mcpu=sparclet ; --cpu-flags gcc OPTIONS : sparc : tsc701 : -mcpu=tsc701 ; --cpu-flags gcc OPTIONS : sparc : v9 : -mcpu=v9 ; --cpu-flags gcc OPTIONS : sparc : ultrasparc : -mcpu=ultrasparc ; --cpu-flags gcc OPTIONS : sparc : ultrasparc3 : -mcpu=ultrasparc3 ; --# RS/6000 & PowerPC --cpu-flags gcc OPTIONS : power : 403 : -mcpu=403 ; --cpu-flags gcc OPTIONS : power : 505 : -mcpu=505 ; --cpu-flags gcc OPTIONS : power : 601 : -mcpu=601 ; --cpu-flags gcc OPTIONS : power : 602 : -mcpu=602 ; --cpu-flags gcc OPTIONS : power : 603 : -mcpu=603 ; --cpu-flags gcc OPTIONS : power : 603e : -mcpu=603e ; --cpu-flags gcc OPTIONS : power : 604 : -mcpu=604 ; --cpu-flags gcc OPTIONS : power : 604e : -mcpu=604e ; --cpu-flags gcc OPTIONS : power : 620 : -mcpu=620 ; --cpu-flags gcc OPTIONS : power : 630 : -mcpu=630 ; --cpu-flags gcc OPTIONS : power : 740 : -mcpu=740 ; --cpu-flags gcc OPTIONS : power : 7400 : -mcpu=7400 ; --cpu-flags gcc OPTIONS : power : 7450 : -mcpu=7450 ; --cpu-flags gcc OPTIONS : power : 750 : -mcpu=750 ; --cpu-flags gcc OPTIONS : power : 801 : -mcpu=801 ; --cpu-flags gcc OPTIONS : power : 821 : -mcpu=821 ; --cpu-flags gcc OPTIONS : power : 823 : -mcpu=823 ; --cpu-flags gcc OPTIONS : power : 860 : -mcpu=860 ; --cpu-flags gcc OPTIONS : power : 970 : -mcpu=970 ; --cpu-flags gcc OPTIONS : power : 8540 : -mcpu=8540 ; --cpu-flags gcc OPTIONS : power : power : -mcpu=power ; --cpu-flags gcc OPTIONS : power : power2 : -mcpu=power2 ; --cpu-flags gcc OPTIONS : power : power3 : -mcpu=power3 ; --cpu-flags gcc OPTIONS : power : power4 : -mcpu=power4 ; --cpu-flags gcc OPTIONS : power : power5 : -mcpu=power5 ; --cpu-flags gcc OPTIONS : power : powerpc : -mcpu=powerpc ; --cpu-flags gcc OPTIONS : power : powerpc64 : -mcpu=powerpc64 ; --cpu-flags gcc OPTIONS : power : rios : -mcpu=rios ; --cpu-flags gcc OPTIONS : power : rios1 : -mcpu=rios1 ; --cpu-flags gcc OPTIONS : power : rios2 : -mcpu=rios2 ; --cpu-flags gcc OPTIONS : power : rsc : -mcpu=rsc ; --cpu-flags gcc OPTIONS : power : rs64a : -mcpu=rs64 ; --# AIX variant of RS/6000 & PowerPC --toolset.flags gcc AROPTIONS 64/aix : "-X64" ; --- -2.15.1 - diff --git a/meta/recipes-support/boost/boost/reproducibility-add-file-directive-to-assembler.patch b/meta/recipes-support/boost/boost/reproducibility-add-file-directive-to-assembler.patch deleted file mode 100644 index 155653316c..0000000000 --- a/meta/recipes-support/boost/boost/reproducibility-add-file-directive-to-assembler.patch +++ /dev/null @@ -1,243 +0,0 @@ -Author: Douglas Royds -Date: Thu Nov 22 09:34:22 2018 +1300 - -Add a .file directive explicitly for all *_elf_gas.S files to prevent the linker -adding a host build-system path as a FILE symbol to the object file. - -This replaces the existing patch that added the .file directive to a small -subset of these files. - -Upstream-Status: Submitted [https://github.com/boostorg/context/issues/91] -Signed-off-by: Douglas Royds - -diff -ur boost_1_68_0.original/libs/context/src/asm/jump_arm64_aapcs_elf_gas.S boost_1_68_0/libs/context/src/asm/jump_arm64_aapcs_elf_gas.S ---- boost_1_68_0.original/libs/context/src/asm/jump_arm64_aapcs_elf_gas.S 2018-11-21 16:31:18.601760893 +1300 -+++ boost_1_68_0/libs/context/src/asm/jump_arm64_aapcs_elf_gas.S 2018-11-22 09:04:27.900876941 +1300 -@@ -51,6 +51,7 @@ - * * - *******************************************************/ - -+.file "jump_arm64_aapcs_elf_gas.S" - .text - .align 2 - .global jump_fcontext -diff -ur boost_1_68_0.original/libs/context/src/asm/jump_arm_aapcs_elf_gas.S boost_1_68_0/libs/context/src/asm/jump_arm_aapcs_elf_gas.S ---- boost_1_68_0.original/libs/context/src/asm/jump_arm_aapcs_elf_gas.S 2018-11-21 16:31:18.601760893 +1300 -+++ boost_1_68_0/libs/context/src/asm/jump_arm_aapcs_elf_gas.S 2018-11-22 09:04:28.876898240 +1300 -@@ -38,6 +38,7 @@ - * * - *******************************************************/ - -+.file "jump_arm_aapcs_elf_gas.S" - .text - .globl jump_fcontext - .align 2 -diff -ur boost_1_68_0.original/libs/context/src/asm/jump_i386_sysv_elf_gas.S boost_1_68_0/libs/context/src/asm/jump_i386_sysv_elf_gas.S ---- boost_1_68_0.original/libs/context/src/asm/jump_i386_sysv_elf_gas.S 2018-11-21 16:31:18.601760893 +1300 -+++ boost_1_68_0/libs/context/src/asm/jump_i386_sysv_elf_gas.S 2018-11-22 09:04:29.904920674 +1300 -@@ -24,6 +24,7 @@ - * * - ****************************************************************************************/ - -+.file "jump_i386_sysv_elf_gas.S" - .text - .globl jump_fcontext - .align 2 -diff -ur boost_1_68_0.original/libs/context/src/asm/jump_mips32_o32_elf_gas.S boost_1_68_0/libs/context/src/asm/jump_mips32_o32_elf_gas.S ---- boost_1_68_0.original/libs/context/src/asm/jump_mips32_o32_elf_gas.S 2018-11-21 16:31:18.601760893 +1300 -+++ boost_1_68_0/libs/context/src/asm/jump_mips32_o32_elf_gas.S 2018-11-22 09:04:41.021163195 +1300 -@@ -38,6 +38,7 @@ - * * - * *****************************************************/ - -+.file "jump_mips32_o32_elf_gas.S" - .text - .globl jump_fcontext - .align 2 -diff -ur boost_1_68_0.original/libs/context/src/asm/jump_ppc32_sysv_elf_gas.S boost_1_68_0/libs/context/src/asm/jump_ppc32_sysv_elf_gas.S ---- boost_1_68_0.original/libs/context/src/asm/jump_ppc32_sysv_elf_gas.S 2018-11-21 16:31:18.601760893 +1300 -+++ boost_1_68_0/libs/context/src/asm/jump_ppc32_sysv_elf_gas.S 2018-11-22 09:04:42.281190679 +1300 -@@ -73,6 +73,7 @@ - * * - *******************************************************/ - -+.file "jump_ppc32_sysv_elf_gas.S" - .text - .globl jump_fcontext - .align 2 -diff -ur boost_1_68_0.original/libs/context/src/asm/jump_ppc64_sysv_elf_gas.S boost_1_68_0/libs/context/src/asm/jump_ppc64_sysv_elf_gas.S ---- boost_1_68_0.original/libs/context/src/asm/jump_ppc64_sysv_elf_gas.S 2018-11-21 16:31:18.601760893 +1300 -+++ boost_1_68_0/libs/context/src/asm/jump_ppc64_sysv_elf_gas.S 2018-11-22 09:04:43.193210571 +1300 -@@ -66,6 +66,7 @@ - * * - *******************************************************/ - -+.file "jump_ppc64_sysv_elf_gas.S" - .globl jump_fcontext - #if _CALL_ELF == 2 - .text -diff -ur boost_1_68_0.original/libs/context/src/asm/jump_x86_64_sysv_elf_gas.S boost_1_68_0/libs/context/src/asm/jump_x86_64_sysv_elf_gas.S ---- boost_1_68_0.original/libs/context/src/asm/jump_x86_64_sysv_elf_gas.S 2018-11-21 16:31:18.601760893 +1300 -+++ boost_1_68_0/libs/context/src/asm/jump_x86_64_sysv_elf_gas.S 2018-11-22 09:04:44.213232818 +1300 -@@ -24,6 +24,7 @@ - * * - ****************************************************************************************/ - -+.file "jump_x86_64_sysv_elf_gas.S" - .text - .globl jump_fcontext - .type jump_fcontext,@function -diff -ur boost_1_68_0.original/libs/context/src/asm/make_arm64_aapcs_elf_gas.S boost_1_68_0/libs/context/src/asm/make_arm64_aapcs_elf_gas.S ---- boost_1_68_0.original/libs/context/src/asm/make_arm64_aapcs_elf_gas.S 2018-11-21 16:31:18.601760893 +1300 -+++ boost_1_68_0/libs/context/src/asm/make_arm64_aapcs_elf_gas.S 2018-11-22 09:04:45.153253319 +1300 -@@ -51,6 +51,7 @@ - * * - *******************************************************/ - -+.file "make_arm64_aapcs_elf_gas.S" - .text - .align 2 - .global make_fcontext -diff -ur boost_1_68_0.original/libs/context/src/asm/make_arm_aapcs_elf_gas.S boost_1_68_0/libs/context/src/asm/make_arm_aapcs_elf_gas.S ---- boost_1_68_0.original/libs/context/src/asm/make_arm_aapcs_elf_gas.S 2018-11-21 16:31:18.601760893 +1300 -+++ boost_1_68_0/libs/context/src/asm/make_arm_aapcs_elf_gas.S 2018-11-22 09:04:46.097273908 +1300 -@@ -38,6 +38,7 @@ - * * - *******************************************************/ - -+.file "make_arm_aapcs_elf_gas.S" - .text - .globl make_fcontext - .align 2 -diff -ur boost_1_68_0.original/libs/context/src/asm/make_i386_sysv_elf_gas.S boost_1_68_0/libs/context/src/asm/make_i386_sysv_elf_gas.S ---- boost_1_68_0.original/libs/context/src/asm/make_i386_sysv_elf_gas.S 2018-11-21 16:31:18.601760893 +1300 -+++ boost_1_68_0/libs/context/src/asm/make_i386_sysv_elf_gas.S 2018-11-22 09:04:46.973293012 +1300 -@@ -24,6 +24,7 @@ - * * - ****************************************************************************************/ - -+.file "make_i386_sysv_elf_gas.S" - .text - .globl make_fcontext - .align 2 -diff -ur boost_1_68_0.original/libs/context/src/asm/make_mips32_o32_elf_gas.S boost_1_68_0/libs/context/src/asm/make_mips32_o32_elf_gas.S ---- boost_1_68_0.original/libs/context/src/asm/make_mips32_o32_elf_gas.S 2018-11-21 16:31:18.601760893 +1300 -+++ boost_1_68_0/libs/context/src/asm/make_mips32_o32_elf_gas.S 2018-11-22 09:04:47.925313772 +1300 -@@ -38,6 +38,7 @@ - * * - * *****************************************************/ - -+.file "make_mips32_o32_elf_gas.S" - .text - .globl make_fcontext - .align 2 -diff -ur boost_1_68_0.original/libs/context/src/asm/make_ppc32_sysv_elf_gas.S boost_1_68_0/libs/context/src/asm/make_ppc32_sysv_elf_gas.S ---- boost_1_68_0.original/libs/context/src/asm/make_ppc32_sysv_elf_gas.S 2018-11-21 16:31:18.601760893 +1300 -+++ boost_1_68_0/libs/context/src/asm/make_ppc32_sysv_elf_gas.S 2018-11-22 09:04:48.865334271 +1300 -@@ -73,6 +73,7 @@ - * * - *******************************************************/ - -+.file "make_ppc32_sysv_elf_gas.S" - .text - .globl make_fcontext - .align 2 -diff -ur boost_1_68_0.original/libs/context/src/asm/make_ppc64_sysv_elf_gas.S boost_1_68_0/libs/context/src/asm/make_ppc64_sysv_elf_gas.S ---- boost_1_68_0.original/libs/context/src/asm/make_ppc64_sysv_elf_gas.S 2018-11-21 16:31:18.601760893 +1300 -+++ boost_1_68_0/libs/context/src/asm/make_ppc64_sysv_elf_gas.S 2018-11-22 09:04:50.049360089 +1300 -@@ -66,6 +66,7 @@ - * * - *******************************************************/ - -+.file "make_ppc64_sysv_elf_gas.S" - .globl make_fcontext - #if _CALL_ELF == 2 - .text -diff -ur boost_1_68_0.original/libs/context/src/asm/make_x86_64_sysv_elf_gas.S boost_1_68_0/libs/context/src/asm/make_x86_64_sysv_elf_gas.S ---- boost_1_68_0.original/libs/context/src/asm/make_x86_64_sysv_elf_gas.S 2018-11-21 16:31:18.601760893 +1300 -+++ boost_1_68_0/libs/context/src/asm/make_x86_64_sysv_elf_gas.S 2018-11-22 09:04:51.117383378 +1300 -@@ -24,6 +24,7 @@ - * * - ****************************************************************************************/ - -+.file "make_x86_64_sysv_elf_gas.S" - .text - .globl make_fcontext - .type make_fcontext,@function -diff -ur boost_1_68_0.original/libs/context/src/asm/ontop_arm64_aapcs_elf_gas.S boost_1_68_0/libs/context/src/asm/ontop_arm64_aapcs_elf_gas.S ---- boost_1_68_0.original/libs/context/src/asm/ontop_arm64_aapcs_elf_gas.S 2018-11-21 16:31:18.601760893 +1300 -+++ boost_1_68_0/libs/context/src/asm/ontop_arm64_aapcs_elf_gas.S 2018-11-22 09:04:52.201407013 +1300 -@@ -51,6 +51,7 @@ - * * - *******************************************************/ - -+.file "ontop_arm64_aapcs_elf_gas.S" - .text - .align 2 - .global ontop_fcontext -diff -ur boost_1_68_0.original/libs/context/src/asm/ontop_arm_aapcs_elf_gas.S boost_1_68_0/libs/context/src/asm/ontop_arm_aapcs_elf_gas.S ---- boost_1_68_0.original/libs/context/src/asm/ontop_arm_aapcs_elf_gas.S 2018-11-21 16:31:18.605760935 +1300 -+++ boost_1_68_0/libs/context/src/asm/ontop_arm_aapcs_elf_gas.S 2018-11-22 09:04:53.269430300 +1300 -@@ -38,6 +38,7 @@ - * * - *******************************************************/ - -+.file "ontop_arm_aapcs_elf_gas.S" - .text - .globl ontop_fcontext - .align 2 -diff -ur boost_1_68_0.original/libs/context/src/asm/ontop_i386_sysv_elf_gas.S boost_1_68_0/libs/context/src/asm/ontop_i386_sysv_elf_gas.S ---- boost_1_68_0.original/libs/context/src/asm/ontop_i386_sysv_elf_gas.S 2018-11-21 16:31:18.605760935 +1300 -+++ boost_1_68_0/libs/context/src/asm/ontop_i386_sysv_elf_gas.S 2018-11-22 09:04:54.389454719 +1300 -@@ -24,6 +24,7 @@ - * * - ****************************************************************************************/ - -+.file "ontop_i386_sysv_elf_gas.S" - .text - .globl ontop_fcontext - .align 2 -diff -ur boost_1_68_0.original/libs/context/src/asm/ontop_mips32_o32_elf_gas.S boost_1_68_0/libs/context/src/asm/ontop_mips32_o32_elf_gas.S ---- boost_1_68_0.original/libs/context/src/asm/ontop_mips32_o32_elf_gas.S 2018-11-21 16:31:18.605760935 +1300 -+++ boost_1_68_0/libs/context/src/asm/ontop_mips32_o32_elf_gas.S 2018-11-22 09:04:55.657482363 +1300 -@@ -38,6 +38,7 @@ - * * - * *****************************************************/ - -+.file "ontop_mips32_o32_elf_gas.S" - .text - .globl ontop_fcontext - .align 2 -diff -ur boost_1_68_0.original/libs/context/src/asm/ontop_ppc32_sysv_elf_gas.S boost_1_68_0/libs/context/src/asm/ontop_ppc32_sysv_elf_gas.S ---- boost_1_68_0.original/libs/context/src/asm/ontop_ppc32_sysv_elf_gas.S 2018-11-21 16:31:18.605760935 +1300 -+++ boost_1_68_0/libs/context/src/asm/ontop_ppc32_sysv_elf_gas.S 2018-11-22 09:04:56.777506781 +1300 -@@ -73,6 +73,7 @@ - * * - *******************************************************/ - -+.file "ontop_ppc32_sysv_elf_gas.S" - .text - .globl ontop_fcontext - .align 2 -diff -ur boost_1_68_0.original/libs/context/src/asm/ontop_ppc64_sysv_elf_gas.S boost_1_68_0/libs/context/src/asm/ontop_ppc64_sysv_elf_gas.S ---- boost_1_68_0.original/libs/context/src/asm/ontop_ppc64_sysv_elf_gas.S 2018-11-21 16:31:18.605760935 +1300 -+++ boost_1_68_0/libs/context/src/asm/ontop_ppc64_sysv_elf_gas.S 2018-11-22 09:04:58.485544015 +1300 -@@ -66,6 +66,7 @@ - * * - *******************************************************/ - -+.file "ontop_ppc64_sysv_elf_gas.S" - .globl ontop_fcontext - #if _CALL_ELF == 2 - .text -diff -ur boost_1_68_0.original/libs/context/src/asm/ontop_x86_64_sysv_elf_gas.S boost_1_68_0/libs/context/src/asm/ontop_x86_64_sysv_elf_gas.S ---- boost_1_68_0.original/libs/context/src/asm/ontop_x86_64_sysv_elf_gas.S 2018-11-21 16:31:18.605760935 +1300 -+++ boost_1_68_0/libs/context/src/asm/ontop_x86_64_sysv_elf_gas.S 2018-11-22 09:04:59.609568516 +1300 -@@ -24,6 +24,7 @@ - * * - ****************************************************************************************/ - -+.file "ontop_x86_64_sysv_elf_gas.S" - .text - .globl ontop_fcontext - .type ontop_fcontext,@function diff --git a/meta/recipes-support/boost/boost_1.68.0.bb b/meta/recipes-support/boost/boost_1.68.0.bb deleted file mode 100644 index 82e36fd732..0000000000 --- a/meta/recipes-support/boost/boost_1.68.0.bb +++ /dev/null @@ -1,11 +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://reproducibility-add-file-directive-to-assembler.patch \ - " diff --git a/meta/recipes-support/boost/boost_1.69.0.bb b/meta/recipes-support/boost/boost_1.69.0.bb new file mode 100644 index 0000000000..324b46f168 --- /dev/null +++ b/meta/recipes-support/boost/boost_1.69.0.bb @@ -0,0 +1,9 @@ +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://0001-Don-t-set-up-arch-instruction-set-flags-we-do-that-o.patch \ + " -- cgit 1.2.3-korg