• Tom Anderson's avatar
    Reland "Revert "Add more unbundle packages to sysroots"" · 02ba7243
    Tom Anderson authored
    This is a reland of 961ea628
    Chromium r550608 has rolled clang to r329921, which includes the build fix.
    
    Original change's description:
    > Revert "Add more unbundle packages to sysroots"
    >
    > This reverts commit b828d53c.
    >
    > Reason for revert: Causing a build failure on Google Chrome Linux x64
    > https://ci.chromium.org/buildbot/chromium.chrome/Google%20Chrome%20Linux%20x64/29741
    >
    > /b/c/b/Google_Chrome_Linux_x64/src/out/Release/../../third_party/llvm-build/Release+Asserts/bin/ld.lld: error: duplicate symbol: exp2f@GLIBC_2.2.5
    > >>> defined in obj/third_party/swiftshader/src/OpenGL/compiler/swiftshader_opengl_compiler/Intermediate.o
    > >>> defined in obj/third_party/swiftshader/src/Renderer/swiftshader_renderer/Context.o
    > /b/c/b/Google_Chrome_Linux_x64/src/out/Release/../../third_party/llvm-build/Release+Asserts/bin/ld.lld: error: duplicate symbol: exp2f@GLIBC_2.2.5
    > >>> defined in obj/third_party/swiftshader/src/OpenGL/compiler/swiftshader_opengl_compiler/Intermediate.o
    > >>> defined in obj/third_party/swiftshader/src/Renderer/swiftshader_renderer/Sampler.o
    > /b/c/b/Google_Chrome_Linux_x64/src/out/Release/../../third_party/llvm-build/Release+Asserts/bin/ld.lld: error: duplicate symbol: powf@GLIBC_2.2.5
    > >>> defined in obj/third_party/swiftshader/src/Renderer/swiftshader_renderer/Surface.o
    > >>> defined in obj/third_party/swiftshader/src/Shader/swiftshader_shader/Constants.o
    > /b/c/b/Google_Chrome_Linux_x64/src/out/Release/../../third_party/llvm-build/Release+Asserts/bin/ld.lld: error: duplicate symbol: powf@GLIBC_2.2.5
    > >>> defined in obj/third_party/swiftshader/src/Renderer/swiftshader_renderer/Surface.o
    > >>> defined in obj/third_party/swiftshader/src/Common/swiftshader_common/Math.o
    >
    > Original change's description:
    > > Add more unbundle packages to sysroots
    > >
    > > The new packages are necessary to test unbundling of flac, libxslt, and zlib.
    > >
    > > BUG=800977
    > > R=​thestig
    > > TBR=mark
    > >
    > > Change-Id: I2c5f88b3819ce000e906cf303fdffa30bdde84cb
    > > Reviewed-on: https://chromium-review.googlesource.com/981451
    > > Commit-Queue: Thomas Anderson <thomasanderson@chromium.org>
    > > Reviewed-by: Lei Zhang <thestig@chromium.org>
    > > Reviewed-by: Nico Weber <thakis@chromium.org>
    > > Cr-Commit-Position: refs/heads/master@{#549303}
    >
    > TBR=thakis@chromium.org,thestig@chromium.org,thomasanderson@chromium.org,mark@chromium.org
    >
    > Change-Id: I90188d22140d7cdd60f8bbea5b0e88705e498988
    > No-Presubmit: true
    > No-Tree-Checks: true
    > No-Try: true
    > Bug: 800977
    > Reviewed-on: https://chromium-review.googlesource.com/1003532
    > Reviewed-by: Thomas Anderson <thomasanderson@chromium.org>
    > Commit-Queue: Thomas Anderson <thomasanderson@chromium.org>
    > Cr-Commit-Position: refs/heads/master@{#549314}
    
    Bug: 800977
    Change-Id: I6b5deb3cd3c2d6ab77dfd904eb641744b88d2231
    Reviewed-on: https://chromium-review.googlesource.com/1012903Reviewed-by: default avatarNico Weber <thakis@chromium.org>
    Reviewed-by: default avatarLei Zhang <thestig@chromium.org>
    Commit-Queue: Thomas Anderson <thomasanderson@chromium.org>
    Cr-Commit-Position: refs/heads/master@{#551339}
    02ba7243
sysroots.json 1.5 KB