Add libatomic to fix runtime error on tizen 6.5

This commit addes libatomic in chromium rpm for
tizen version 6.5.

Change-Id: Ief7a800fd077b914a2eb49b35271b378f5fa2962
Signed-off-by: Akshay Kanagali <a.kanagali@partner.samsung.com>

diff --git a/build/config/BUILD.gn b/build/config/BUILD.gn
index 7b488943aa1057fc58a9772dc09c4079873f32f3..43254c3acaf06fd52f262a7592acaff83e3c2ede 100644 (file)
--- a/build/config/BUILD.gn
+++ b/build/config/BUILD.gn
@@ -221,6 +221,10 @@ config("default_libs") {
       "rt",
     ]
 
+    if (is_clang && tizen_version == 65) {
+      libs += [ "atomic" ]
+      ldflags = [ "-Wl,-rpath=/usr/share/chromium-efl/lib/" ]
+    }
   }
 }
 

diff --git a/packaging/chromium-efl.spec b/packaging/chromium-efl.spec
index 2e71a077c43f0561575fa5685d3a95362f286d88..b9a27d15d5776eb9bac2e8ca4957a055fe68d155 100644 (file)
--- a/packaging/chromium-efl.spec
+++ b/packaging/chromium-efl.spec
@@ -170,7 +170,12 @@ Requires: /usr/bin/systemctl
 Requires(post): /sbin/ldconfig
 Requires(post): xkeyboard-config
 Requires(postun): /sbin/ldconfig
+
+%if %{tizen_version} == 65
+BuildRequires: libatomic
+%else
 Requires: libatomic
+%endif
 
 %ifnarch riscv64
 BuildRequires: binutils-gold
@@ -1110,6 +1115,10 @@ install -m 0755 "%{OUTPUT_FOLDER}"/ubrowser          "%{buildroot}"%{CHROMIUM_AP
   install -m 0644 "%{OUTPUT_FOLDER}"/libchromium-ewk.so  "%{buildroot}"%{CHROMIUM_LIB_DIR}/lib/
 %endif
 
+%if %{__use_clang} == 1 && %{tizen_version} == 65
+  install -m 0644 %{_libdir}/libatomic.so* "%{buildroot}"%{CHROMIUM_LIB_DIR}/lib/
+%endif
+
 install -m 0644 "%{OUTPUT_FOLDER}"/resources/*.edj "%{buildroot}"%{CHROMIUM_LIB_DIR}/res/themes/
 
 %if %{__build_chrome} != 1
@@ -1281,6 +1290,11 @@ install -m 0755 -p -D %{OUTPUT_FOLDER}/modules_unittests %{buildroot}%{TIZEN_RTC
 install -m 0755 -p -D %{OUTPUT_FOLDER}/peerconnection_unittests %{buildroot}%{TIZEN_RTC_UT_DIR}
 install -m 0755 -p -D %{OUTPUT_FOLDER}/rtc_pc_unittests %{buildroot}%{TIZEN_RTC_UT_DIR}
 install -m 0755 -p -D %{OUTPUT_FOLDER}/video_unittests %{buildroot}%{TIZEN_RTC_UT_DIR}
+%if %{__use_clang} == 1 && %{tizen_version} == 65
+  # FIXME: This will copy 3 identical files under different names.
+  #        Use symlink or add dependency to package provideing libatomic.
+  install -m 0644 %{_libdir}/libatomic.so* %{buildroot}%{TIZEN_RTC_UT_DIR}
+%endif
 %endif
 
 %if 0%{?build_tizen_ppapi_extension_unittests}
@@ -1608,6 +1622,10 @@ rm -rf %{TIZEN_V8_UT_DIR}/v8
   %{CHROMIUM_LIB_DIR}/lib/libchromium-ewk.so
 %endif
 
+%if %{__use_clang} == 1 && %{tizen_version} == 65
+  %{CHROMIUM_LIB_DIR}/lib/libatomic.so*
+%endif
+
 %if "%{?__use_system_icu}" != "1"
   %{CHROMIUM_LIB_DIR}/bin/icudtl.dat
 %endif
@@ -1735,6 +1753,9 @@ rm -rf %{TIZEN_V8_UT_DIR}/v8
 %{TIZEN_RTC_UT_DIR}/peerconnection_unittests
 %{TIZEN_RTC_UT_DIR}/rtc_pc_unittests
 %{TIZEN_RTC_UT_DIR}/video_unittests
+%if %{__use_clang} == 1 && %{tizen_version} == 65
+%{TIZEN_RTC_UT_DIR}/libatomic.so*
+%endif
 %{TIZEN_RTC_UT_DIR}
 %endif
 

diff --git a/tizen_src/ewk/efl_integration/BUILD.gn b/tizen_src/ewk/efl_integration/BUILD.gn
index 1848b350a667d37e16ada49134b91929bbbb8699..fbe1e9a666aa4f6d1a89d52fccf1aab0483ac495 100644 (file)
--- a/tizen_src/ewk/efl_integration/BUILD.gn
+++ b/tizen_src/ewk/efl_integration/BUILD.gn
@@ -210,11 +210,6 @@ shared_library("chromium-ewk") {
     deps += [ "//ui/ozone" ]
   }
 
-  if (is_clang) {
-    libs = [ "atomic" ]
-    ldflags += [ "-Wl,-rpath=/usr/local/lib:/usr/share/chromium-efl/local/lib" ]
-  }
-
   if (enable_wrt_js) {
     deps += [ "//wrt:wrt_lib" ]
   }