From d2a950c8d6090c5f298dbb6af878b714a3177308 Mon Sep 17 00:00:00 2001 From: Andrey Lushnikov Date: Thu, 18 Aug 2022 10:48:49 -0700 Subject: [PATCH] devops: bundle libstdc++ from gcc-9 for Ubuntu 18.04 webkit builds (#16643) References #16633 --- browser_patches/webkit/BUILD_NUMBER | 4 ++-- browser_patches/webkit/archive.sh | 6 ++++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/browser_patches/webkit/BUILD_NUMBER b/browser_patches/webkit/BUILD_NUMBER index 68336ba232..97ddd81da3 100644 --- a/browser_patches/webkit/BUILD_NUMBER +++ b/browser_patches/webkit/BUILD_NUMBER @@ -1,2 +1,2 @@ -1704 -Changed: yurys@chromium.org Wed Aug 17 12:16:53 PDT 2022 +1705 +Changed: aslushnikov@gmail.com Thu Aug 18 20:47:20 MSK 2022 diff --git a/browser_patches/webkit/archive.sh b/browser_patches/webkit/archive.sh index 89f95f76b9..b1648256c9 100755 --- a/browser_patches/webkit/archive.sh +++ b/browser_patches/webkit/archive.sh @@ -71,6 +71,12 @@ createZipForLinux() { rm -f "${tmpdir}"/MiniBrowser_${port}_release.zip done + # Bundle libstdc++ version that comes from gcc-9. gcc-9 is not default on Ubuntu 18.04 + if is_linux ubuntu 18.04; then + cp /usr/lib/x86_64-linux-gnu/libstdc++.so.6 "${tmpdir}/minibrowser-wpe/lib/libstdc++.so.6" + cp /usr/lib/x86_64-linux-gnu/libstdc++.so.6 "${tmpdir}/minibrowser-gtk/lib/libstdc++.so.6" + fi + cd "$tmpdir" # zip resulting directory and cleanup TMP.