diff options
author | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2018-12-17 04:11:34 +0300 |
---|---|---|
committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-01-09 02:21:44 +0300 |
commit | 1a4b7ee28bf7413af6513fb45ad0d0736048f866 (patch) | |
tree | 79f6d8ea698cab8f2eaf4f54b793d2ca7a1451ce /poky/meta/recipes-support/boost | |
parent | 5b9ede0403237c7dace972affa65cf64a1aadd0e (diff) | |
download | openbmc-1a4b7ee28bf7413af6513fb45ad0d0736048f866.tar.xz |
reset upstream subtrees to yocto 2.6
Reset the following subtrees on thud HEAD:
poky: 87e3a9739d
meta-openembedded: 6094ae18c8
meta-security: 31dc4e7532
meta-raspberrypi: a48743dc36
meta-xilinx: c42016e2e6
Also re-apply backports that didn't make it into thud:
poky:
17726d0 systemd-systemctl-native: handle Install wildcards
meta-openembedded:
4321a5d libtinyxml2: update to 7.0.1
042f0a3 libcereal: Add native and nativesdk classes
e23284f libcereal: Allow empty package
030e8d4 rsyslog: curl-less build with fmhttp PACKAGECONFIG
179a1b9 gtest: update to 1.8.1
Squashed OpenBMC subtree compatibility updates:
meta-aspeed:
Brad Bishop (1):
aspeed: add yocto 2.6 compatibility
meta-ibm:
Brad Bishop (1):
ibm: prepare for yocto 2.6
meta-ingrasys:
Brad Bishop (1):
ingrasys: set layer compatibility to yocto 2.6
meta-openpower:
Brad Bishop (1):
openpower: set layer compatibility to yocto 2.6
meta-phosphor:
Brad Bishop (3):
phosphor: set layer compatibility to thud
phosphor: libgpg-error: drop patches
phosphor: react to fitimage artifact rename
Ed Tanous (4):
Dropbear: upgrade options for latest upgrade
yocto2.6: update openssl options
busybox: remove upstream watchdog patch
systemd: Rebase CONFIG_CGROUP_BPF patch
Change-Id: I7b1fe71cca880d0372a82d94b5fd785323e3a9e7
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'poky/meta/recipes-support/boost')
-rw-r--r-- | poky/meta/recipes-support/boost/bjam-native_1.68.0.bb (renamed from poky/meta/recipes-support/boost/bjam-native_1.66.0.bb) | 2 | ||||
-rw-r--r-- | poky/meta/recipes-support/boost/boost-1.68.0.inc (renamed from poky/meta/recipes-support/boost/boost-1.66.0.inc) | 4 | ||||
-rw-r--r-- | poky/meta/recipes-support/boost/boost.inc | 6 | ||||
-rw-r--r-- | poky/meta/recipes-support/boost/boost/0001-make_x86_64_sysv_elf_gas.S-set-.file-section.patch | 48 | ||||
-rw-r--r-- | poky/meta/recipes-support/boost/boost/0002-Don-t-set-up-m32-m64-we-do-that-ourselves.patch | 65 | ||||
-rw-r--r-- | poky/meta/recipes-support/boost/boost_1.66.0.bb | 11 | ||||
-rw-r--r-- | poky/meta/recipes-support/boost/boost_1.68.0.bb | 11 | ||||
-rw-r--r-- | poky/meta/recipes-support/boost/files/0001-Fix-a-strange-assert-typo-how-was-this-released-with.patch | 37 |
8 files changed, 65 insertions, 119 deletions
diff --git a/poky/meta/recipes-support/boost/bjam-native_1.66.0.bb b/poky/meta/recipes-support/boost/bjam-native_1.68.0.bb index 92c86a3ef..94f96e62d 100644 --- a/poky/meta/recipes-support/boost/bjam-native_1.66.0.bb +++ b/poky/meta/recipes-support/boost/bjam-native_1.68.0.bb @@ -6,7 +6,7 @@ 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 diff --git a/poky/meta/recipes-support/boost/boost-1.66.0.inc b/poky/meta/recipes-support/boost/boost-1.68.0.inc index fe2b8639f..b367a80b6 100644 --- a/poky/meta/recipes-support/boost/boost-1.66.0.inc +++ b/poky/meta/recipes-support/boost/boost-1.68.0.inc @@ -12,8 +12,8 @@ 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" +SRC_URI[md5sum] = "7fbd1890f571051f2a209681d57d486a" +SRC_URI[sha256sum] = "7f6130bc3cf65f56a618888ce9d5ea704fa10b462be126ad053e80e553d6d8b7" UPSTREAM_CHECK_URI = "http://www.boost.org/users/download/" UPSTREAM_CHECK_REGEX = "boostorg/release/(?P<pver>.*)/source/" diff --git a/poky/meta/recipes-support/boost/boost.inc b/poky/meta/recipes-support/boost/boost.inc index 0ff5b7a77..c4faea211 100644 --- a/poky/meta/recipes-support/boost/boost.inc +++ b/poky/meta/recipes-support/boost/boost.inc @@ -9,6 +9,7 @@ BOOST_LIBS = "\ atomic \ chrono \ container \ + contract \ date_time \ exception \ filesystem \ @@ -134,9 +135,8 @@ BJAM_TOOLS = "--ignore-site-config \ '--layout=system' \ " -# use PARALLEL_MAKE to speed up the build, but limit it by -j 64, greater parallelism causes bjam to segfault or to ignore -j -# https://svn.boost.org/trac/boost/ticket/7634 -BOOST_PARALLEL_MAKE = "${@oe.utils.parallel_make_argument(d, '-j%d', limit=64)}" +# use PARALLEL_MAKE to speed up the build +BOOST_PARALLEL_MAKE = "${@oe.utils.parallel_make_argument(d, '-j%d')}" BJAM_OPTS = '${BOOST_PARALLEL_MAKE} -d+2 -q \ ${BJAM_TOOLS} \ -sBOOST_BUILD_USER_CONFIG=${WORKDIR}/user-config.jam \ diff --git a/poky/meta/recipes-support/boost/boost/0001-make_x86_64_sysv_elf_gas.S-set-.file-section.patch b/poky/meta/recipes-support/boost/boost/0001-make_x86_64_sysv_elf_gas.S-set-.file-section.patch new file mode 100644 index 000000000..c2ac49e58 --- /dev/null +++ b/poky/meta/recipes-support/boost/boost/0001-make_x86_64_sysv_elf_gas.S-set-.file-section.patch @@ -0,0 +1,48 @@ +From c99f798407e44c86e9f64f5b1adf3b4d0549eef2 Mon Sep 17 00:00:00 2001 +From: Mingli Yu <Mingli.Yu@windriver.com> +Date: Fri, 15 Jun 2018 16:21:56 +0800 +Subject: [PATCH] make_x86_64_sysv_elf_gas.S: set .file section + +Set .file section explicitly for .S files to avoid +the linker introduces the host path in symbols for +object files whose source file is .S +Otherwise, there is a host path in the symbols as below: +$ readelf --wide --symbols /my-build/boost/1.67.0-r0/boost_1_67_0/x86_64-poky-linux/boost/bin.v2/libs/context/build/aca09349fdb84d131321425f6c3a38ed/libboost_context.so.1.67.0 + +42: 0000000000000000 0 FILE LOCAL DEFAULT ABS /my-build/boost/1.67.0-r0/boost_1_67_0/x86_64-poky-linux/boost/bin.v2/libs/context/build/aca09349fdb84d131321425f6c3a38ed/asm/make_x86_64_sysv_elf_gas.o + +Upstream-Status: Pending + +Signed-off-by: Mingli Yu <Mingli.Yu@windriver.com> +--- + libs/context/src/asm/make_i386_sysv_elf_gas.S | 1 + + libs/context/src/asm/make_x86_64_sysv_elf_gas.S | 1 + + 2 files changed, 2 insertions(+) + +diff --git a/libs/context/src/asm/make_i386_sysv_elf_gas.S b/libs/context/src/asm/make_i386_sysv_elf_gas.S +index de77e88..b76de26 100644 +--- a/libs/context/src/asm/make_i386_sysv_elf_gas.S ++++ b/libs/context/src/asm/make_i386_sysv_elf_gas.S +@@ -24,6 +24,7 @@ + * * + ****************************************************************************************/ + ++.file "make_i386_sysv_elf_gas.S" + .text + .globl make_fcontext + .align 2 +diff --git a/libs/context/src/asm/make_x86_64_sysv_elf_gas.S b/libs/context/src/asm/make_x86_64_sysv_elf_gas.S +index 25a0c00..0ef3756 100644 +--- a/libs/context/src/asm/make_x86_64_sysv_elf_gas.S ++++ b/libs/context/src/asm/make_x86_64_sysv_elf_gas.S +@@ -24,6 +24,7 @@ + * * + ****************************************************************************************/ + ++.file "make_x86_64_sysv_elf_gas.S" + .text + .globl make_fcontext + .type make_fcontext,@function +-- +2.7.4 + diff --git a/poky/meta/recipes-support/boost/boost/0002-Don-t-set-up-m32-m64-we-do-that-ourselves.patch b/poky/meta/recipes-support/boost/boost/0002-Don-t-set-up-m32-m64-we-do-that-ourselves.patch deleted file mode 100644 index 26f3cbb05..000000000 --- a/poky/meta/recipes-support/boost/boost/0002-Don-t-set-up-m32-m64-we-do-that-ourselves.patch +++ /dev/null @@ -1,65 +0,0 @@ -From e4d3a7470b307693660d0412732e7266d1738d8c Mon Sep 17 00:00:00 2001 -From: Christopher Larson <chris_larson@mentor.com> -Date: Tue, 13 Dec 2016 10:29:17 -0700 -Subject: [PATCH 6/6] Don't set up -m32/-m64, we do that ourselves - -Upstream-Status: Inappropriate -Signed-off-by: Christopher Larson <chris_larson@mentor.com> - ---- - 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 e4fc6c32..37914fd0 100644 ---- a/tools/build/src/tools/gcc.jam -+++ b/tools/build/src/tools/gcc.jam -@@ -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) ; - } - } --- -2.15.1 - diff --git a/poky/meta/recipes-support/boost/boost_1.66.0.bb b/poky/meta/recipes-support/boost/boost_1.66.0.bb deleted file mode 100644 index 63b82a599..000000000 --- a/poky/meta/recipes-support/boost/boost_1.66.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://0002-Don-t-set-up-m32-m64-we-do-that-ourselves.patch \ -" diff --git a/poky/meta/recipes-support/boost/boost_1.68.0.bb b/poky/meta/recipes-support/boost/boost_1.68.0.bb new file mode 100644 index 000000000..c7958a4c5 --- /dev/null +++ b/poky/meta/recipes-support/boost/boost_1.68.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://0001-make_x86_64_sysv_elf_gas.S-set-.file-section.patch \ + " diff --git a/poky/meta/recipes-support/boost/files/0001-Fix-a-strange-assert-typo-how-was-this-released-with.patch b/poky/meta/recipes-support/boost/files/0001-Fix-a-strange-assert-typo-how-was-this-released-with.patch deleted file mode 100644 index a75133d2b..000000000 --- a/poky/meta/recipes-support/boost/files/0001-Fix-a-strange-assert-typo-how-was-this-released-with.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 5685527364198597f25fc1c6236cb64cbc3de44f Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin <alex.kanavin@gmail.com> -Date: Wed, 4 Oct 2017 18:16:08 +0300 -Subject: [PATCH] Fix a strange assert typo; how was this released without - noticing? - -Upstream-Status: Pending -Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> ---- - tools/build/src/engine/debugger.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/tools/build/src/engine/debugger.c b/tools/build/src/engine/debugger.c -index 802f262..152a7e6 100644 ---- a/tools/build/src/engine/debugger.c -+++ b/tools/build/src/engine/debugger.c -@@ -1092,7 +1092,7 @@ static void debug_start_child( int argc, const char * * argv ) - PROCESS_INFORMATION pi = { NULL, NULL, 0, 0 }; - STARTUPINFO si = { sizeof( STARTUPINFO ), 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0 }; -- assert( DEBUG_STATE == DEBUG_NO_CHILD ); -+ assert( debug_state == DEBUG_NO_CHILD ); - if ( ! CreatePipe( &pipe1[ 0 ], &pipe1[ 1 ], &sa, 0 ) ) - { - printf("internal error\n"); -@@ -1176,7 +1176,7 @@ static void debug_start_child( int argc, const char * * argv ) - int read_fd; - int pid; - int i; -- assert( DEBUG_STATE == DEBUG_NO_CHILD ); -+ assert( debug_state == DEBUG_NO_CHILD ); - pipe(pipe1); - pipe(pipe2); - pid = fork(); --- -2.14.1 - |