Commit b828d53c authored by Tom Anderson's avatar Tom Anderson Committed by Commit Bot

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: default avatarLei Zhang <thestig@chromium.org>
Reviewed-by: default avatarNico Weber <thakis@chromium.org>
Cr-Commit-Position: refs/heads/master@{#549303}
parent 6141310e
...@@ -100,6 +100,7 @@ DEBIAN_PACKAGES="\ ...@@ -100,6 +100,7 @@ DEBIAN_PACKAGES="\
libfontconfig1-dev libfontconfig1-dev
libfreetype6 libfreetype6
libfreetype6-dev libfreetype6-dev
libfribidi0
libgbm-dev libgbm-dev
libgbm1 libgbm1
libgcc-6-dev libgcc-6-dev
...@@ -168,6 +169,8 @@ DEBIAN_PACKAGES="\ ...@@ -168,6 +169,8 @@ DEBIAN_PACKAGES="\
liblz4-1 liblz4-1
liblzma5 liblzma5
liblzo2-2 liblzo2-2
libminizip-dev
libminizip1
libmount1 libmount1
libnettle6 libnettle6
libnspr4 libnspr4
...@@ -175,6 +178,7 @@ DEBIAN_PACKAGES="\ ...@@ -175,6 +178,7 @@ DEBIAN_PACKAGES="\
libnss-db libnss-db
libnss3 libnss3
libnss3-dev libnss3-dev
libogg-dev
libogg0 libogg0
libopengl0 libopengl0
libopus-dev libopus-dev
...@@ -206,7 +210,7 @@ DEBIAN_PACKAGES="\ ...@@ -206,7 +210,7 @@ DEBIAN_PACKAGES="\
libpulse-dev libpulse-dev
libpulse-mainloop-glib0 libpulse-mainloop-glib0
libpulse0 libpulse0
libre2-3 libre2-4
libre2-dev libre2-dev
librest-0.7-0 librest-0.7-0
libselinux1 libselinux1
...@@ -291,6 +295,7 @@ DEBIAN_PACKAGES="\ ...@@ -291,6 +295,7 @@ DEBIAN_PACKAGES="\
libxkbcommon-dev libxkbcommon-dev
libxkbcommon0 libxkbcommon0
libxml2 libxml2
libxml2-dev
libxrandr-dev libxrandr-dev
libxrandr2 libxrandr2
libxrender-dev libxrender-dev
...@@ -311,8 +316,8 @@ DEBIAN_PACKAGES="\ ...@@ -311,8 +316,8 @@ DEBIAN_PACKAGES="\
uuid-dev uuid-dev
wayland-protocols wayland-protocols
x11proto-composite-dev x11proto-composite-dev
x11proto-core-dev
x11proto-damage-dev x11proto-damage-dev
x11proto-dev
x11proto-fixes-dev x11proto-fixes-dev
x11proto-input-dev x11proto-input-dev
x11proto-kb-dev x11proto-kb-dev
......
...@@ -315,6 +315,13 @@ HacksAndPatchesCommon() { ...@@ -315,6 +315,13 @@ HacksAndPatchesCommon() {
nm -D --defined-only --with-symbol-versions "${libm_so}" | \ nm -D --defined-only --with-symbol-versions "${libm_so}" | \
"${SCRIPT_DIR}/find_incompatible_glibc_symbols.py" >> "${math_h}" "${SCRIPT_DIR}/find_incompatible_glibc_symbols.py" >> "${math_h}"
# glob64() was also optimized in glibc 2.27. Make sure to choose the older
# version.
local glob_h="${INSTALL_ROOT}/usr/include/glob.h"
local libc_so="${INSTALL_ROOT}/lib/${arch}-${os}/libc.so.6"
nm -D --defined-only --with-symbol-versions "${libc_so}" | \
"${SCRIPT_DIR}/find_incompatible_glibc_symbols.py" >> "${glob_h}"
# This is for chrome's ./build/linux/pkg-config-wrapper # This is for chrome's ./build/linux/pkg-config-wrapper
# which overwrites PKG_CONFIG_LIBDIR internally # which overwrites PKG_CONFIG_LIBDIR internally
SubBanner "Move pkgconfig scripts" SubBanner "Move pkgconfig scripts"
......
{ {
"sid_amd64": { "sid_amd64": {
"Revision": "15b7efb900d75f7316c6e713e80f87b9904791b1", "Revision": "1015a998c2adf188813cca60b558b0ea1a0b6ced",
"Sha1Sum": "85ac8d5e0f6cff99fc323fd3d29cb73e2aa970e2", "Sha1Sum": "4e7db513b0faeea8fb410f70c9909e8736f5c0ab",
"SysrootDir": "debian_sid_amd64-sysroot", "SysrootDir": "debian_sid_amd64-sysroot",
"Tarball": "debian_sid_amd64_sysroot.tar.xz" "Tarball": "debian_sid_amd64_sysroot.tar.xz"
}, },
"sid_arm": { "sid_arm": {
"Revision": "15b7efb900d75f7316c6e713e80f87b9904791b1", "Revision": "1015a998c2adf188813cca60b558b0ea1a0b6ced",
"Sha1Sum": "ed31924757f11885a21793dc4b928d07ab25740c", "Sha1Sum": "b2165ab47ab9c4cc780db53ace1b08607d68ae31",
"SysrootDir": "debian_sid_arm-sysroot", "SysrootDir": "debian_sid_arm-sysroot",
"Tarball": "debian_sid_arm_sysroot.tar.xz" "Tarball": "debian_sid_arm_sysroot.tar.xz"
}, },
"sid_arm64": { "sid_arm64": {
"Revision": "15b7efb900d75f7316c6e713e80f87b9904791b1", "Revision": "1015a998c2adf188813cca60b558b0ea1a0b6ced",
"Sha1Sum": "b9447285e58c5260bd9fa2737d1f0d1f82156738", "Sha1Sum": "37dfa5f22e2c0e847cee34f9848eb31230c33d35",
"SysrootDir": "debian_sid_arm64-sysroot", "SysrootDir": "debian_sid_arm64-sysroot",
"Tarball": "debian_sid_arm64_sysroot.tar.xz" "Tarball": "debian_sid_arm64_sysroot.tar.xz"
}, },
"sid_i386": { "sid_i386": {
"Revision": "15b7efb900d75f7316c6e713e80f87b9904791b1", "Revision": "1015a998c2adf188813cca60b558b0ea1a0b6ced",
"Sha1Sum": "f09856d93f39e8df84ffd9c04881f44e6cbc0508", "Sha1Sum": "b8639749e2b561a7462d7e7978ca74ee4044bdab",
"SysrootDir": "debian_sid_i386-sysroot", "SysrootDir": "debian_sid_i386-sysroot",
"Tarball": "debian_sid_i386_sysroot.tar.xz" "Tarball": "debian_sid_i386_sysroot.tar.xz"
}, },
"sid_mips": { "sid_mips": {
"Revision": "15b7efb900d75f7316c6e713e80f87b9904791b1", "Revision": "1015a998c2adf188813cca60b558b0ea1a0b6ced",
"Sha1Sum": "90586b566b567b2bcf49e7fd112f0c8189bbd07b", "Sha1Sum": "baaf37cdcbcf251fb9a4ccaf8b479722ae61fe49",
"SysrootDir": "debian_sid_mips-sysroot", "SysrootDir": "debian_sid_mips-sysroot",
"Tarball": "debian_sid_mips_sysroot.tar.xz" "Tarball": "debian_sid_mips_sysroot.tar.xz"
}, },
"sid_mips64el": { "sid_mips64el": {
"Revision": "15b7efb900d75f7316c6e713e80f87b9904791b1", "Revision": "1015a998c2adf188813cca60b558b0ea1a0b6ced",
"Sha1Sum": "f90c3b81485ffebb283afddb1a72bc61e14c593d", "Sha1Sum": "bbfe1a513b849921cfcf78865faec8fc03f93b3d",
"SysrootDir": "debian_sid_mips64el-sysroot", "SysrootDir": "debian_sid_mips64el-sysroot",
"Tarball": "debian_sid_mips64el_sysroot.tar.xz" "Tarball": "debian_sid_mips64el_sysroot.tar.xz"
} }
......
...@@ -20,7 +20,8 @@ ...@@ -20,7 +20,8 @@
#include <sys/cdefs.h> #include <sys/cdefs.h>
// https://sourceware.org/bugzilla/show_bug.cgi?id=22433 // https://sourceware.org/bugzilla/show_bug.cgi?id=22433
#if !defined(PTRACE_GET_THREAD_AREA) && defined(__GLIBC__) #if !defined(PTRACE_GET_THREAD_AREA) && !defined(PT_GET_THREAD_AREA) && \
defined(__GLIBC__)
#if defined(__i386__) || defined(__x86_64__) #if defined(__i386__) || defined(__x86_64__)
static constexpr __ptrace_request PTRACE_GET_THREAD_AREA = static constexpr __ptrace_request PTRACE_GET_THREAD_AREA =
static_cast<__ptrace_request>(25); static_cast<__ptrace_request>(25);
...@@ -30,7 +31,7 @@ static constexpr __ptrace_request PTRACE_GET_THREAD_AREA = ...@@ -30,7 +31,7 @@ static constexpr __ptrace_request PTRACE_GET_THREAD_AREA =
static_cast<__ptrace_request>(22); static_cast<__ptrace_request>(22);
#define PTRACE_GET_THREAD_AREA PTRACE_GET_THREAD_AREA #define PTRACE_GET_THREAD_AREA PTRACE_GET_THREAD_AREA
#endif #endif
#endif // !PTRACE_GET_THREAD_AREA && defined(__GLIBC__) #endif // !PTRACE_GET_THREAD_AREA && !PT_GET_THREAD_AREA && defined(__GLIBC__)
// https://sourceware.org/bugzilla/show_bug.cgi?id=22433 // https://sourceware.org/bugzilla/show_bug.cgi?id=22433
#if !defined(PTRACE_GETVFPREGS) && \ #if !defined(PTRACE_GETVFPREGS) && \
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment