Skip to content
Snippets Groups Projects
Commit 363a6da2 authored by Thierry Escande's avatar Thierry Escande
Browse files

openharmony-standard-3.0: Update source repositories to v3.0.1


This updates the OpenHarmony source repositories to version 3.0.1.

Only the patch for third_party/icu needed some rework and the removal of
compiler option '-Wno-error=implicit-float-conversion' for gcc.

This also set OPENHARMONY_VERSION_FULL to 3.0.1 the openharmony-3.0
distro override.

Signed-off-by: default avatarThierry Escande <thierry.escande@huawei.com>
parent d55a0810
No related branches found
No related tags found
1 merge request!27Update source repositories to v3.0.1
Pipeline #5873 passed
......@@ -6,6 +6,7 @@
OPENHARMONY_VERSION ?= "3.1"
OPENHARMONY_OVERRIDES = "openharmony-${OPENHARMONY_VERSION}:openharmony"
OPENHARMONY_VERSION_FULL = "${OPENHARMONY_VERSION}"
OPENHARMONY_VERSION_FULL:openharmony-3.0 = "3.0.1"
OPENHARMONY_VERSION_FULL:openharmony-3.1 = "3.1.1"
PREFERRED_VERSION_openharmony-standard = "${OPENHARMONY_VERSION}"
......@@ -12,7 +12,7 @@ Signed-off-by: Esben Haabendal <esben.haabendal@huawei.com>
Upstream-Status: Inappropriate [configuration/integration]
diff --git a/third_party/icu/icu4c/BUILD.gn b/third_party/icu/icu4c/BUILD.gn
index 892733e53e2c..dbb9b4cddb3f 100755
index 86daba5..0c8d9d5 100755
--- a/third_party/icu/icu4c/BUILD.gn
+++ b/third_party/icu/icu4c/BUILD.gn
@@ -509,10 +509,12 @@ ohos_shared_library("shared_icuuc") {
......@@ -29,22 +29,26 @@ index 892733e53e2c..dbb9b4cddb3f 100755
ldflags = [
"-shared",
"-lm",
@@ -552,11 +554,13 @@ ohos_shared_library("shared_icui18n") {
@@ -552,12 +554,16 @@ ohos_shared_library("shared_icui18n") {
"-Wpointer-arith",
"-Wno-error=unused-parameter",
"-Wno-error=unused-const-variable",
- "-Wno-error=implicit-float-conversion",
- "-Wno-error=unneeded-internal-declaration",
"-Wwrite-strings",
"-std=c++11",
"-Wno-ignored-attributes",
]
+ if (is_clang) {
+ cflags_cc += [ "-Wno-error=unneeded-internal-declaration" ]
+ cflags_cc += [
+ "-Wno-error=unneeded-internal-declaration",
+ "-Wno-error=implicit-float-conversion",
+ ]
+ }
ldflags = [
"-shared",
"-ldl",
@@ -599,11 +603,13 @@ ohos_static_library("static_icuuc") {
@@ -600,11 +606,13 @@ ohos_static_library("static_icuuc") {
"-std=c++11",
"-Wno-error=unused-parameter",
"-Wno-error=unused-const-variable",
......@@ -59,10 +63,11 @@ index 892733e53e2c..dbb9b4cddb3f 100755
cflags = [
"-fvisibility=hidden",
@@ -649,12 +655,14 @@ ohos_static_library("static_icui18n") {
@@ -649,13 +657,17 @@ ohos_static_library("static_icui18n") {
"-Wwrite-strings",
"-Wno-error=unused-parameter",
"-Wno-error=unused-const-variable",
- "-Wno-error=implicit-float-conversion",
- "-Wno-error=unneeded-internal-declaration",
"-std=c++11",
"-fvisibility-inlines-hidden",
......@@ -70,11 +75,14 @@ index 892733e53e2c..dbb9b4cddb3f 100755
"-Wno-ignored-attributes",
]
+ if (is_clang) {
+ cflags_cc += [ "-Wno-error=unneeded-internal-declaration" ]
+ cflags_cc += [
+ "-Wno-error=unneeded-internal-declaration",
+ "-Wno-error=implicit-float-conversion",
+ ]
+ }
cflags = [
"-fvisibility=hidden",
if (is_mingw) {
cflags_cc += [ "-DWINVER=0x0601" ]
diff --git a/third_party/icu/icu4c/source/BUILD.gn b/third_party/icu/icu4c/source/BUILD.gn
index c93a43ef248e..de8af91f4a75 100644
--- a/third_party/icu/icu4c/source/BUILD.gn
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment