diff options
author | Andrew Geissler <geissonator@yahoo.com> | 2020-04-13 21:39:40 +0300 |
---|---|---|
committer | Andrew Geissler <geissonator@yahoo.com> | 2020-05-05 16:30:44 +0300 |
commit | 82c905dc58a36aeae40b1b273a12f63fb1973cf4 (patch) | |
tree | 38caf00263451b5036435cdc36e035b25d32e623 /meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs/0007-v8-don-t-override-ARM-CFLAGS.patch | |
parent | 83ecb75644b3d677c274188f9ac0b2374d6f6925 (diff) | |
download | openbmc-82c905dc58a36aeae40b1b273a12f63fb1973cf4.tar.xz |
meta-openembedded and poky: subtree updates
Squash of the following due to dependencies among them
and OpenBMC changes:
meta-openembedded: subtree update:d0748372d2..9201611135
meta-openembedded: subtree update:9201611135..17fd382f34
poky: subtree update:9052e5b32a..2e11d97b6c
poky: subtree update:2e11d97b6c..a8544811d7
The change log was too large for the jenkins plugin
to handle therefore it has been removed. Here is
the first and last commit of each subtree:
meta-openembedded:d0748372d2
cppzmq: bump to version 4.6.0
meta-openembedded:17fd382f34
mpv: Remove X11 dependency
poky:9052e5b32a
package_ipk: Remove pointless comment to trigger rebuild
poky:a8544811d7
pbzip2: Fix license warning
Change-Id: If0fc6c37629642ee207a4ca2f7aa501a2c673cd6
Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
Diffstat (limited to 'meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs/0007-v8-don-t-override-ARM-CFLAGS.patch')
-rw-r--r-- | meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs/0007-v8-don-t-override-ARM-CFLAGS.patch | 102 |
1 files changed, 0 insertions, 102 deletions
diff --git a/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs/0007-v8-don-t-override-ARM-CFLAGS.patch b/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs/0007-v8-don-t-override-ARM-CFLAGS.patch deleted file mode 100644 index eb2cbfb8b1..0000000000 --- a/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs/0007-v8-don-t-override-ARM-CFLAGS.patch +++ /dev/null @@ -1,102 +0,0 @@ -From 47ee5cc5501289205d3e8e9f27ea9daf18cebac1 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <git@andred.net> -Date: Sat, 9 Nov 2019 14:45:30 +0000 -Subject: [PATCH] v8: don't override ARM CFLAGS -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -This overrides yocto-provided build flags with its own, e.g we get - arm-poky-linux-musleabi-g++ -mthumb -mfpu=neon -mfloat-abi=hard -mcpu=cortex-a7 \ - ... \ - -march=armv7-a -mfpu=neon -mfloat-abi=hard -marm - -Causing the latter to override the former, and compiler warnings: - cc1plus: warning: switch '-mcpu=cortex-a7' conflicts with '-march=armv7-a' switch - -Patch this out, so that yocto-provided flags take precedence. -Note that in reality the same should probably be done for all the other -supported architectures, too. - -Note that this also switches to Thumb(2) mode (in my case). No obvious -problems have been noted during compilation or runtime. - -Upstream-Status: Inappropriate [oe-specific] -Signed-off-by: André Draszik <git@andred.net> ---- - deps/v8/gypfiles/toolchain.gypi | 52 ++------------------------------- - 1 file changed, 2 insertions(+), 50 deletions(-) - -diff --git a/deps/v8/gypfiles/toolchain.gypi b/deps/v8/gypfiles/toolchain.gypi -index 910a212..1390b15 100644 ---- a/deps/v8/gypfiles/toolchain.gypi -+++ b/deps/v8/gypfiles/toolchain.gypi -@@ -199,31 +199,7 @@ - 'target_conditions': [ - ['_toolset=="host"', { - 'conditions': [ -- ['v8_target_arch==host_arch', { -- # Host built with an Arm CXX compiler. -- 'conditions': [ -- [ 'arm_version==7', { -- 'cflags': ['-march=armv7-a',], -- }], -- [ 'arm_version==7 or arm_version=="default"', { -- 'conditions': [ -- [ 'arm_fpu!="default"', { -- 'cflags': ['-mfpu=<(arm_fpu)',], -- }], -- ], -- }], -- [ 'arm_float_abi!="default"', { -- 'cflags': ['-mfloat-abi=<(arm_float_abi)',], -- }], -- [ 'arm_thumb==1', { -- 'cflags': ['-mthumb',], -- }], -- [ 'arm_thumb==0', { -- 'cflags': ['-marm',], -- }], -- ], -- }, { -- # 'v8_target_arch!=host_arch' -+ ['v8_target_arch!=host_arch', { - # Host not built with an Arm CXX compiler (simulator build). - 'conditions': [ - [ 'arm_float_abi=="hard"', { -@@ -242,31 +218,7 @@ - }], # _toolset=="host" - ['_toolset=="target"', { - 'conditions': [ -- ['v8_target_arch==target_arch', { -- # Target built with an Arm CXX compiler. -- 'conditions': [ -- [ 'arm_version==7', { -- 'cflags': ['-march=armv7-a',], -- }], -- [ 'arm_version==7 or arm_version=="default"', { -- 'conditions': [ -- [ 'arm_fpu!="default"', { -- 'cflags': ['-mfpu=<(arm_fpu)',], -- }], -- ], -- }], -- [ 'arm_float_abi!="default"', { -- 'cflags': ['-mfloat-abi=<(arm_float_abi)',], -- }], -- [ 'arm_thumb==1', { -- 'cflags': ['-mthumb',], -- }], -- [ 'arm_thumb==0', { -- 'cflags': ['-marm',], -- }], -- ], -- }, { -- # 'v8_target_arch!=target_arch' -+ ['v8_target_arch!=target_arch', { - # Target not built with an Arm CXX compiler (simulator build). - 'conditions': [ - [ 'arm_float_abi=="hard"', { --- -2.23.0.rc1 - |