diff options
Diffstat (limited to 'recipes-qt/qt5/qtwebkit_git.bb')
-rw-r--r-- | recipes-qt/qt5/qtwebkit_git.bb | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/recipes-qt/qt5/qtwebkit_git.bb b/recipes-qt/qt5/qtwebkit_git.bb index fc9ca922..6ff0eba7 100644 --- a/recipes-qt/qt5/qtwebkit_git.bb +++ b/recipes-qt/qt5/qtwebkit_git.bb | |||
@@ -23,8 +23,8 @@ SRC_URI += "\ | |||
23 | file://0009-Riscv-Add-support-for-riscv.patch \ | 23 | file://0009-Riscv-Add-support-for-riscv.patch \ |
24 | " | 24 | " |
25 | 25 | ||
26 | SRC_URI_append_riscv32 = " file://0010-webdriver-libatomic.patch " | 26 | SRC_URI:append:riscv32 = " file://0010-webdriver-libatomic.patch " |
27 | SRC_URI_append_riscv64 = " file://0010-webdriver-libatomic.patch " | 27 | SRC_URI:append:riscv64 = " file://0010-webdriver-libatomic.patch " |
28 | 28 | ||
29 | inherit cmake_qt5 perlnative | 29 | inherit cmake_qt5 perlnative |
30 | 30 | ||
@@ -34,16 +34,16 @@ inherit python3native | |||
34 | # | {standard input}: Assembler messages: | 34 | # | {standard input}: Assembler messages: |
35 | # | {standard input}:106: Error: invalid immediate: 983040 is out of range | 35 | # | {standard input}:106: Error: invalid immediate: 983040 is out of range |
36 | # | {standard input}:106: Error: value of 983040 too large for field of 2 bytes at 146 | 36 | # | {standard input}:106: Error: value of 983040 too large for field of 2 bytes at 146 |
37 | ARM_INSTRUCTION_SET_armv4 = "arm" | 37 | ARM_INSTRUCTION_SET:armv4 = "arm" |
38 | ARM_INSTRUCTION_SET_armv5 = "arm" | 38 | ARM_INSTRUCTION_SET:armv5 = "arm" |
39 | 39 | ||
40 | # https://bugzilla.yoctoproject.org/show_bug.cgi?id=9474 | 40 | # https://bugzilla.yoctoproject.org/show_bug.cgi?id=9474 |
41 | # https://bugs.webkit.org/show_bug.cgi?id=159880 | 41 | # https://bugs.webkit.org/show_bug.cgi?id=159880 |
42 | # JSC JIT can build on ARMv7 with -marm, but doesn't work on runtime. | 42 | # JSC JIT can build on ARMv7 with -marm, but doesn't work on runtime. |
43 | # Upstream only tests regularly the JSC JIT on ARMv7 with Thumb2 (-mthumb). | 43 | # Upstream only tests regularly the JSC JIT on ARMv7 with Thumb2 (-mthumb). |
44 | ARM_INSTRUCTION_SET_armv7a = "thumb" | 44 | ARM_INSTRUCTION_SET:armv7a = "thumb" |
45 | ARM_INSTRUCTION_SET_armv7r = "thumb" | 45 | ARM_INSTRUCTION_SET:armv7r = "thumb" |
46 | ARM_INSTRUCTION_SET_armv7ve = "thumb" | 46 | ARM_INSTRUCTION_SET:armv7ve = "thumb" |
47 | 47 | ||
48 | # http://errors.yoctoproject.org/Errors/Details/179245/ | 48 | # http://errors.yoctoproject.org/Errors/Details/179245/ |
49 | # just use -fpermissive in this case like fedora did: | 49 | # just use -fpermissive in this case like fedora did: |
@@ -59,20 +59,20 @@ EXTRA_OECMAKE += " \ | |||
59 | -DPYTHON_EXECUTABLE=`which python3` \ | 59 | -DPYTHON_EXECUTABLE=`which python3` \ |
60 | " | 60 | " |
61 | 61 | ||
62 | EXTRA_OECMAKE_append_toolchain-clang = " -DCMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES:PATH='${STAGING_INCDIR}'" | 62 | EXTRA_OECMAKE:append:toolchain-clang = " -DCMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES:PATH='${STAGING_INCDIR}'" |
63 | 63 | ||
64 | # JIT not supported on MIPS/PPC/RISCV | 64 | # JIT not supported on MIPS/PPC/RISCV |
65 | EXTRA_OECMAKE_append_mipsarch = " -DENABLE_JIT=OFF -DUSE_SYSTEM_MALLOC=ON -DENABLE_C_LOOP=ON " | 65 | EXTRA_OECMAKE:append:mipsarch = " -DENABLE_JIT=OFF -DUSE_SYSTEM_MALLOC=ON -DENABLE_C_LOOP=ON " |
66 | EXTRA_OECMAKE_append_powerpc = " -DENABLE_JIT=OFF -DUSE_SYSTEM_MALLOC=ON -DENABLE_C_LOOP=ON " | 66 | EXTRA_OECMAKE:append:powerpc = " -DENABLE_JIT=OFF -DUSE_SYSTEM_MALLOC=ON -DENABLE_C_LOOP=ON " |
67 | EXTRA_OECMAKE_append_powerpc64le = " -DENABLE_JIT=OFF -DUSE_SYSTEM_MALLOC=ON -DENABLE_C_LOOP=ON " | 67 | EXTRA_OECMAKE:append:powerpc64le = " -DENABLE_JIT=OFF -DUSE_SYSTEM_MALLOC=ON -DENABLE_C_LOOP=ON " |
68 | EXTRA_OECMAKE_append_riscv64 = " -DENABLE_JIT=OFF -DUSE_SYSTEM_MALLOC=ON -DENABLE_C_LOOP=ON " | 68 | EXTRA_OECMAKE:append:riscv64 = " -DENABLE_JIT=OFF -DUSE_SYSTEM_MALLOC=ON -DENABLE_C_LOOP=ON " |
69 | 69 | ||
70 | # Disable gold on mips64/clang | 70 | # Disable gold on mips64/clang |
71 | # mips64-yoe-linux-musl-ld.gold: internal error in get_got_page_offset, at ../../gold/mips.cc:6260 | 71 | # mips64-yoe-linux-musl-ld.gold: internal error in get_got_page_offset, at ../../gold/mips.cc:6260 |
72 | # mips-yoe-linux-musl-ld.gold: error: Can't find matching LO16 reloc | 72 | # mips-yoe-linux-musl-ld.gold: error: Can't find matching LO16 reloc |
73 | EXTRA_OECMAKE_append_mipsarch = " -DUSE_LD_GOLD=OFF " | 73 | EXTRA_OECMAKE:append:mipsarch = " -DUSE_LD_GOLD=OFF " |
74 | EXTRA_OECMAKE_append_powerpc = " -DUSE_LD_GOLD=OFF " | 74 | EXTRA_OECMAKE:append:powerpc = " -DUSE_LD_GOLD=OFF " |
75 | EXTRA_OECMAKE_append_riscv64 = " -DUSE_LD_GOLD=OFF " | 75 | EXTRA_OECMAKE:append:riscv64 = " -DUSE_LD_GOLD=OFF " |
76 | 76 | ||
77 | PACKAGECONFIG ??= "qtlocation qtmultimedia qtsensors qtwebchannel \ | 77 | PACKAGECONFIG ??= "qtlocation qtmultimedia qtsensors qtwebchannel \ |
78 | ${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)} \ | 78 | ${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)} \ |
@@ -92,7 +92,7 @@ PACKAGECONFIG[fontconfig] = "-DENABLE_TEST_SUPPORT=ON,-DENABLE_TEST_SUPPORT=OFF, | |||
92 | PACKAGECONFIG[hyphen] = "-DUSE_LIBHYPHEN=ON,-DUSE_LIBHYPHEN=OFF,hyphen" | 92 | PACKAGECONFIG[hyphen] = "-DUSE_LIBHYPHEN=ON,-DUSE_LIBHYPHEN=OFF,hyphen" |
93 | 93 | ||
94 | # remove default ${PN}-examples* set in qt5.inc, because they conflicts with ${PN} from separate webkit-examples recipe | 94 | # remove default ${PN}-examples* set in qt5.inc, because they conflicts with ${PN} from separate webkit-examples recipe |
95 | PACKAGES_remove = "${PN}-examples" | 95 | PACKAGES:remove = "${PN}-examples" |
96 | 96 | ||
97 | QT_MODULE_BRANCH = "5.212" | 97 | QT_MODULE_BRANCH = "5.212" |
98 | 98 | ||