diff options
Diffstat (limited to 'chromium/build/linux')
15 files changed, 63 insertions, 97 deletions
diff --git a/chromium/build/linux/libbrlapi/BUILD.gn b/chromium/build/linux/libbrlapi/BUILD.gn deleted file mode 100644 index 4ee39504552..00000000000 --- a/chromium/build/linux/libbrlapi/BUILD.gn +++ /dev/null @@ -1,26 +0,0 @@ -# Copyright 2016 The Chromium Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -import("//tools/generate_library_loader/generate_library_loader.gni") - -generate_library_loader("libbrlapi") { - name = "LibBrlapiLoader" - output_h = "libbrlapi.h" - output_cc = "libbrlapi_loader.cc" - header = "<brlapi.h>" - - functions = [ - "brlapi_getHandleSize", - "brlapi_error_location", - "brlapi_strerror", - "brlapi__acceptKeys", - "brlapi__openConnection", - "brlapi__closeConnection", - "brlapi__getDisplaySize", - "brlapi__enterTtyModeWithPath", - "brlapi__leaveTtyMode", - "brlapi__writeDots", - "brlapi__readKey", - ] -} diff --git a/chromium/build/linux/libncursesw/OWNERS b/chromium/build/linux/libncursesw/OWNERS new file mode 100644 index 00000000000..697dba28c57 --- /dev/null +++ b/chromium/build/linux/libncursesw/OWNERS @@ -0,0 +1,4 @@ +file://ui/accessibility/OWNERS + +# TEAM: chromium-accessibility@chromium.org +# COMPONENT: Internals>Accessibility diff --git a/chromium/build/linux/libudev/BUILD.gn b/chromium/build/linux/libudev/BUILD.gn index 9486a03292d..dcd9f234dbe 100644 --- a/chromium/build/linux/libudev/BUILD.gn +++ b/chromium/build/linux/libudev/BUILD.gn @@ -7,6 +7,7 @@ import("//tools/generate_library_loader/generate_library_loader.gni") libudev_functions = [ "udev_device_get_action", "udev_device_get_devnode", + "udev_device_get_devtype", "udev_device_get_parent", "udev_device_get_parent_with_subsystem_devtype", "udev_device_get_property_value", diff --git a/chromium/build/linux/pkg-config-wrapper b/chromium/build/linux/pkg-config-wrapper deleted file mode 100755 index c4935d7b597..00000000000 --- a/chromium/build/linux/pkg-config-wrapper +++ /dev/null @@ -1,46 +0,0 @@ -#!/bin/bash -# Copyright (c) 2012 The Chromium Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -# This program wraps around pkg-config to generate the correct include and -# library paths when cross-compiling using a sysroot. -# The assumption is that the sysroot contains the .pc files in usr/lib/pkgconfig -# and usr/share/pkgconfig (relative to the sysroot) and that they output paths -# relative to some parent path of the sysroot. -# This assumption is valid for a range of sysroots, in particular: a -# LSB-compliant root filesystem mounted at the sysroot, and a board build -# directory of a Chromium OS chroot. - -set -o nounset -set -o errexit - -root="$1" -shift -target_arch="$1" -shift -libpath="$1" -shift - -if [ -z "$root" -o -z "$target_arch" ] -then - echo "usage: $0 /path/to/sysroot target_arch libdir [pkg-config-arguments] package" >&2 - exit 1 -fi - -rewrite=`dirname $0`/rewrite_dirs.py -package=${!#} - -libdir=$root/usr/$libpath/pkgconfig:$root/usr/share/pkgconfig - -set -e -# Some sysroots, like the Chromium OS ones, may generate paths that are not -# relative to the sysroot. For example, -# /path/to/chroot/build/x86-generic/usr/lib/pkgconfig/pkg.pc may have all paths -# relative to /path/to/chroot (i.e. prefix=/build/x86-generic/usr) instead of -# relative to /path/to/chroot/build/x86-generic (i.e prefix=/usr). -# To support this correctly, it's necessary to extract the prefix to strip from -# pkg-config's |prefix| variable. -prefix=`PKG_CONFIG_LIBDIR=$libdir pkg-config --variable=prefix "$package" | sed -e 's|/usr$||'` -result=`PKG_CONFIG_LIBDIR=$libdir pkg-config "$@"` -echo "$result"| $rewrite --sysroot "$root" --strip-prefix "$prefix" diff --git a/chromium/build/linux/sysroot_scripts/generated_package_lists/sid.amd64 b/chromium/build/linux/sysroot_scripts/generated_package_lists/sid.amd64 index 6e45afd689a..12ae2454059 100644 --- a/chromium/build/linux/sysroot_scripts/generated_package_lists/sid.amd64 +++ b/chromium/build/linux/sysroot_scripts/generated_package_lists/sid.amd64 @@ -12,8 +12,6 @@ https://snapshot.debian.org/archive/debian/20191212T145612Z/pool/main/a/avahi/li https://snapshot.debian.org/archive/debian/20191212T145612Z/pool/main/a/avahi/libavahi-common3_0.7-4+b1_amd64.deb https://snapshot.debian.org/archive/debian/20191212T145612Z/pool/main/b/bluez/libbluetooth3_5.50-1+b1_amd64.deb https://snapshot.debian.org/archive/debian/20191212T145612Z/pool/main/b/bluez/libbluetooth-dev_5.50-1+b1_amd64.deb -https://snapshot.debian.org/archive/debian/20191212T145612Z/pool/main/b/brltty/libbrlapi0.7_6.0+dfsg-4+b1_amd64.deb -https://snapshot.debian.org/archive/debian/20191212T145612Z/pool/main/b/brltty/libbrlapi-dev_6.0+dfsg-4+b1_amd64.deb https://snapshot.debian.org/archive/debian/20191212T145612Z/pool/main/b/brotli/libbrotli1_1.0.7-5+b1_amd64.deb https://snapshot.debian.org/archive/debian/20191212T145612Z/pool/main/c/cairo/libcairo2_1.16.0-4_amd64.deb https://snapshot.debian.org/archive/debian/20191212T145612Z/pool/main/c/cairo/libcairo2-dev_1.16.0-4_amd64.deb @@ -261,6 +259,10 @@ https://snapshot.debian.org/archive/debian/20191212T145612Z/pool/main/m/mesa/mes https://snapshot.debian.org/archive/debian/20191212T145612Z/pool/main/m/minizip/libminizip1_1.1-8+b1_amd64.deb https://snapshot.debian.org/archive/debian/20191212T145612Z/pool/main/m/minizip/libminizip-dev_1.1-8+b1_amd64.deb https://snapshot.debian.org/archive/debian/20191212T145612Z/pool/main/m/mtdev/libmtdev1_1.1.5-1.1_amd64.deb +https://snapshot.debian.org/archive/debian/20191212T145612Z/pool/main/n/ncurses/libncurses6_6.1+20191019-1_amd64.deb +https://snapshot.debian.org/archive/debian/20191212T145612Z/pool/main/n/ncurses/libncurses-dev_6.1+20191019-1_amd64.deb +https://snapshot.debian.org/archive/debian/20191212T145612Z/pool/main/n/ncurses/libncursesw6_6.1+20191019-1_amd64.deb +https://snapshot.debian.org/archive/debian/20191212T145612Z/pool/main/n/ncurses/libtinfo6_6.1+20191019-1_amd64.deb https://snapshot.debian.org/archive/debian/20191212T145612Z/pool/main/n/nettle/libhogweed5_3.5.1+really3.5.1-2_amd64.deb https://snapshot.debian.org/archive/debian/20191212T145612Z/pool/main/n/nettle/libnettle7_3.5.1+really3.5.1-2_amd64.deb https://snapshot.debian.org/archive/debian/20191212T145612Z/pool/main/n/nspr/libnspr4_4.23-1_amd64.deb diff --git a/chromium/build/linux/sysroot_scripts/generated_package_lists/sid.arm b/chromium/build/linux/sysroot_scripts/generated_package_lists/sid.arm index 0ed5f778cb1..5cb6c68bb42 100644 --- a/chromium/build/linux/sysroot_scripts/generated_package_lists/sid.arm +++ b/chromium/build/linux/sysroot_scripts/generated_package_lists/sid.arm @@ -12,8 +12,6 @@ https://snapshot.debian.org/archive/debian/20191212T145612Z/pool/main/a/avahi/li https://snapshot.debian.org/archive/debian/20191212T145612Z/pool/main/a/avahi/libavahi-common3_0.7-4+b1_armhf.deb https://snapshot.debian.org/archive/debian/20191212T145612Z/pool/main/b/bluez/libbluetooth3_5.50-1+b1_armhf.deb https://snapshot.debian.org/archive/debian/20191212T145612Z/pool/main/b/bluez/libbluetooth-dev_5.50-1+b1_armhf.deb -https://snapshot.debian.org/archive/debian/20191212T145612Z/pool/main/b/brltty/libbrlapi0.7_6.0+dfsg-4+b1_armhf.deb -https://snapshot.debian.org/archive/debian/20191212T145612Z/pool/main/b/brltty/libbrlapi-dev_6.0+dfsg-4+b1_armhf.deb https://snapshot.debian.org/archive/debian/20191212T145612Z/pool/main/b/brotli/libbrotli1_1.0.7-5+b1_armhf.deb https://snapshot.debian.org/archive/debian/20191212T145612Z/pool/main/c/cairo/libcairo2_1.16.0-4_armhf.deb https://snapshot.debian.org/archive/debian/20191212T145612Z/pool/main/c/cairo/libcairo2-dev_1.16.0-4_armhf.deb @@ -260,6 +258,10 @@ https://snapshot.debian.org/archive/debian/20191212T145612Z/pool/main/m/mesa/mes https://snapshot.debian.org/archive/debian/20191212T145612Z/pool/main/m/minizip/libminizip1_1.1-8+b1_armhf.deb https://snapshot.debian.org/archive/debian/20191212T145612Z/pool/main/m/minizip/libminizip-dev_1.1-8+b1_armhf.deb https://snapshot.debian.org/archive/debian/20191212T145612Z/pool/main/m/mtdev/libmtdev1_1.1.5-1.1_armhf.deb +https://snapshot.debian.org/archive/debian/20191212T145612Z/pool/main/n/ncurses/libncurses6_6.1+20191019-1_armhf.deb +https://snapshot.debian.org/archive/debian/20191212T145612Z/pool/main/n/ncurses/libncurses-dev_6.1+20191019-1_armhf.deb +https://snapshot.debian.org/archive/debian/20191212T145612Z/pool/main/n/ncurses/libncursesw6_6.1+20191019-1_armhf.deb +https://snapshot.debian.org/archive/debian/20191212T145612Z/pool/main/n/ncurses/libtinfo6_6.1+20191019-1_armhf.deb https://snapshot.debian.org/archive/debian/20191212T145612Z/pool/main/n/nettle/libhogweed5_3.5.1+really3.5.1-2_armhf.deb https://snapshot.debian.org/archive/debian/20191212T145612Z/pool/main/n/nettle/libnettle7_3.5.1+really3.5.1-2_armhf.deb https://snapshot.debian.org/archive/debian/20191212T145612Z/pool/main/n/nspr/libnspr4_4.23-1_armhf.deb diff --git a/chromium/build/linux/sysroot_scripts/generated_package_lists/sid.arm64 b/chromium/build/linux/sysroot_scripts/generated_package_lists/sid.arm64 index 6d2a0af3ed3..248bbff003f 100644 --- a/chromium/build/linux/sysroot_scripts/generated_package_lists/sid.arm64 +++ b/chromium/build/linux/sysroot_scripts/generated_package_lists/sid.arm64 @@ -12,8 +12,6 @@ https://snapshot.debian.org/archive/debian/20191212T145612Z/pool/main/a/avahi/li https://snapshot.debian.org/archive/debian/20191212T145612Z/pool/main/a/avahi/libavahi-common3_0.7-4+b1_arm64.deb https://snapshot.debian.org/archive/debian/20191212T145612Z/pool/main/b/bluez/libbluetooth3_5.50-1+b1_arm64.deb https://snapshot.debian.org/archive/debian/20191212T145612Z/pool/main/b/bluez/libbluetooth-dev_5.50-1+b1_arm64.deb -https://snapshot.debian.org/archive/debian/20191212T145612Z/pool/main/b/brltty/libbrlapi0.7_6.0+dfsg-4+b1_arm64.deb -https://snapshot.debian.org/archive/debian/20191212T145612Z/pool/main/b/brltty/libbrlapi-dev_6.0+dfsg-4+b1_arm64.deb https://snapshot.debian.org/archive/debian/20191212T145612Z/pool/main/b/brotli/libbrotli1_1.0.7-5+b1_arm64.deb https://snapshot.debian.org/archive/debian/20191212T145612Z/pool/main/c/cairo/libcairo2_1.16.0-4_arm64.deb https://snapshot.debian.org/archive/debian/20191212T145612Z/pool/main/c/cairo/libcairo2-dev_1.16.0-4_arm64.deb @@ -262,6 +260,10 @@ https://snapshot.debian.org/archive/debian/20191212T145612Z/pool/main/m/mesa/mes https://snapshot.debian.org/archive/debian/20191212T145612Z/pool/main/m/minizip/libminizip1_1.1-8+b1_arm64.deb https://snapshot.debian.org/archive/debian/20191212T145612Z/pool/main/m/minizip/libminizip-dev_1.1-8+b1_arm64.deb https://snapshot.debian.org/archive/debian/20191212T145612Z/pool/main/m/mtdev/libmtdev1_1.1.5-1.1_arm64.deb +https://snapshot.debian.org/archive/debian/20191212T145612Z/pool/main/n/ncurses/libncurses6_6.1+20191019-1_arm64.deb +https://snapshot.debian.org/archive/debian/20191212T145612Z/pool/main/n/ncurses/libncurses-dev_6.1+20191019-1_arm64.deb +https://snapshot.debian.org/archive/debian/20191212T145612Z/pool/main/n/ncurses/libncursesw6_6.1+20191019-1_arm64.deb +https://snapshot.debian.org/archive/debian/20191212T145612Z/pool/main/n/ncurses/libtinfo6_6.1+20191019-1_arm64.deb https://snapshot.debian.org/archive/debian/20191212T145612Z/pool/main/n/nettle/libhogweed5_3.5.1+really3.5.1-2_arm64.deb https://snapshot.debian.org/archive/debian/20191212T145612Z/pool/main/n/nettle/libnettle7_3.5.1+really3.5.1-2_arm64.deb https://snapshot.debian.org/archive/debian/20191212T145612Z/pool/main/n/nspr/libnspr4_4.23-1_arm64.deb diff --git a/chromium/build/linux/sysroot_scripts/generated_package_lists/sid.armel b/chromium/build/linux/sysroot_scripts/generated_package_lists/sid.armel index 4adb37878a1..edcd7236dd8 100644 --- a/chromium/build/linux/sysroot_scripts/generated_package_lists/sid.armel +++ b/chromium/build/linux/sysroot_scripts/generated_package_lists/sid.armel @@ -12,8 +12,6 @@ https://snapshot.debian.org/archive/debian/20191212T145612Z/pool/main/a/avahi/li https://snapshot.debian.org/archive/debian/20191212T145612Z/pool/main/a/avahi/libavahi-common3_0.7-4+b1_armel.deb https://snapshot.debian.org/archive/debian/20191212T145612Z/pool/main/b/bluez/libbluetooth3_5.50-1+b1_armel.deb https://snapshot.debian.org/archive/debian/20191212T145612Z/pool/main/b/bluez/libbluetooth-dev_5.50-1+b1_armel.deb -https://snapshot.debian.org/archive/debian/20191212T145612Z/pool/main/b/brltty/libbrlapi0.7_6.0+dfsg-4+b1_armel.deb -https://snapshot.debian.org/archive/debian/20191212T145612Z/pool/main/b/brltty/libbrlapi-dev_6.0+dfsg-4+b1_armel.deb https://snapshot.debian.org/archive/debian/20191212T145612Z/pool/main/b/brotli/libbrotli1_1.0.7-5+b1_armel.deb https://snapshot.debian.org/archive/debian/20191212T145612Z/pool/main/c/cairo/libcairo2_1.16.0-4_armel.deb https://snapshot.debian.org/archive/debian/20191212T145612Z/pool/main/c/cairo/libcairo2-dev_1.16.0-4_armel.deb @@ -259,6 +257,10 @@ https://snapshot.debian.org/archive/debian/20191212T145612Z/pool/main/m/mesa/mes https://snapshot.debian.org/archive/debian/20191212T145612Z/pool/main/m/minizip/libminizip1_1.1-8+b1_armel.deb https://snapshot.debian.org/archive/debian/20191212T145612Z/pool/main/m/minizip/libminizip-dev_1.1-8+b1_armel.deb https://snapshot.debian.org/archive/debian/20191212T145612Z/pool/main/m/mtdev/libmtdev1_1.1.5-1.1_armel.deb +https://snapshot.debian.org/archive/debian/20191212T145612Z/pool/main/n/ncurses/libncurses6_6.1+20191019-1_armel.deb +https://snapshot.debian.org/archive/debian/20191212T145612Z/pool/main/n/ncurses/libncurses-dev_6.1+20191019-1_armel.deb +https://snapshot.debian.org/archive/debian/20191212T145612Z/pool/main/n/ncurses/libncursesw6_6.1+20191019-1_armel.deb +https://snapshot.debian.org/archive/debian/20191212T145612Z/pool/main/n/ncurses/libtinfo6_6.1+20191019-1_armel.deb https://snapshot.debian.org/archive/debian/20191212T145612Z/pool/main/n/nettle/libhogweed5_3.5.1+really3.5.1-2_armel.deb https://snapshot.debian.org/archive/debian/20191212T145612Z/pool/main/n/nettle/libnettle7_3.5.1+really3.5.1-2_armel.deb https://snapshot.debian.org/archive/debian/20191212T145612Z/pool/main/n/nspr/libnspr4_4.23-1_armel.deb diff --git a/chromium/build/linux/sysroot_scripts/generated_package_lists/sid.i386 b/chromium/build/linux/sysroot_scripts/generated_package_lists/sid.i386 index cdb037820a0..79c537dc58d 100644 --- a/chromium/build/linux/sysroot_scripts/generated_package_lists/sid.i386 +++ b/chromium/build/linux/sysroot_scripts/generated_package_lists/sid.i386 @@ -12,8 +12,6 @@ https://snapshot.debian.org/archive/debian/20191212T145612Z/pool/main/a/avahi/li https://snapshot.debian.org/archive/debian/20191212T145612Z/pool/main/a/avahi/libavahi-common3_0.7-4+b1_i386.deb https://snapshot.debian.org/archive/debian/20191212T145612Z/pool/main/b/bluez/libbluetooth3_5.50-1+b1_i386.deb https://snapshot.debian.org/archive/debian/20191212T145612Z/pool/main/b/bluez/libbluetooth-dev_5.50-1+b1_i386.deb -https://snapshot.debian.org/archive/debian/20191212T145612Z/pool/main/b/brltty/libbrlapi0.7_6.0+dfsg-4+b1_i386.deb -https://snapshot.debian.org/archive/debian/20191212T145612Z/pool/main/b/brltty/libbrlapi-dev_6.0+dfsg-4+b1_i386.deb https://snapshot.debian.org/archive/debian/20191212T145612Z/pool/main/b/brotli/libbrotli1_1.0.7-5+b1_i386.deb https://snapshot.debian.org/archive/debian/20191212T145612Z/pool/main/c/cairo/libcairo2_1.16.0-4_i386.deb https://snapshot.debian.org/archive/debian/20191212T145612Z/pool/main/c/cairo/libcairo2-dev_1.16.0-4_i386.deb @@ -259,6 +257,10 @@ https://snapshot.debian.org/archive/debian/20191212T145612Z/pool/main/m/mesa/mes https://snapshot.debian.org/archive/debian/20191212T145612Z/pool/main/m/minizip/libminizip1_1.1-8+b1_i386.deb https://snapshot.debian.org/archive/debian/20191212T145612Z/pool/main/m/minizip/libminizip-dev_1.1-8+b1_i386.deb https://snapshot.debian.org/archive/debian/20191212T145612Z/pool/main/m/mtdev/libmtdev1_1.1.5-1.1_i386.deb +https://snapshot.debian.org/archive/debian/20191212T145612Z/pool/main/n/ncurses/libncurses6_6.1+20191019-1_i386.deb +https://snapshot.debian.org/archive/debian/20191212T145612Z/pool/main/n/ncurses/libncurses-dev_6.1+20191019-1_i386.deb +https://snapshot.debian.org/archive/debian/20191212T145612Z/pool/main/n/ncurses/libncursesw6_6.1+20191019-1_i386.deb +https://snapshot.debian.org/archive/debian/20191212T145612Z/pool/main/n/ncurses/libtinfo6_6.1+20191019-1_i386.deb https://snapshot.debian.org/archive/debian/20191212T145612Z/pool/main/n/nettle/libhogweed5_3.5.1+really3.5.1-2_i386.deb https://snapshot.debian.org/archive/debian/20191212T145612Z/pool/main/n/nettle/libnettle7_3.5.1+really3.5.1-2_i386.deb https://snapshot.debian.org/archive/debian/20191212T145612Z/pool/main/n/nspr/libnspr4_4.23-1_i386.deb diff --git a/chromium/build/linux/sysroot_scripts/generated_package_lists/sid.mips64el b/chromium/build/linux/sysroot_scripts/generated_package_lists/sid.mips64el index 49022c434f2..fbefbf2361a 100644 --- a/chromium/build/linux/sysroot_scripts/generated_package_lists/sid.mips64el +++ b/chromium/build/linux/sysroot_scripts/generated_package_lists/sid.mips64el @@ -12,8 +12,6 @@ https://snapshot.debian.org/archive/debian/20191212T145612Z/pool/main/a/avahi/li https://snapshot.debian.org/archive/debian/20191212T145612Z/pool/main/a/avahi/libavahi-common3_0.7-4+b1_mips64el.deb https://snapshot.debian.org/archive/debian/20191212T145612Z/pool/main/b/bluez/libbluetooth3_5.50-1+b1_mips64el.deb https://snapshot.debian.org/archive/debian/20191212T145612Z/pool/main/b/bluez/libbluetooth-dev_5.50-1+b1_mips64el.deb -https://snapshot.debian.org/archive/debian/20191212T145612Z/pool/main/b/brltty/libbrlapi0.7_6.0+dfsg-4+b1_mips64el.deb -https://snapshot.debian.org/archive/debian/20191212T145612Z/pool/main/b/brltty/libbrlapi-dev_6.0+dfsg-4+b1_mips64el.deb https://snapshot.debian.org/archive/debian/20191212T145612Z/pool/main/b/brotli/libbrotli1_1.0.7-5+b1_mips64el.deb https://snapshot.debian.org/archive/debian/20191212T145612Z/pool/main/c/cairo/libcairo2_1.16.0-4_mips64el.deb https://snapshot.debian.org/archive/debian/20191212T145612Z/pool/main/c/cairo/libcairo2-dev_1.16.0-4_mips64el.deb @@ -252,6 +250,10 @@ https://snapshot.debian.org/archive/debian/20191212T145612Z/pool/main/m/mesa/mes https://snapshot.debian.org/archive/debian/20191212T145612Z/pool/main/m/minizip/libminizip1_1.1-8+b1_mips64el.deb https://snapshot.debian.org/archive/debian/20191212T145612Z/pool/main/m/minizip/libminizip-dev_1.1-8+b1_mips64el.deb https://snapshot.debian.org/archive/debian/20191212T145612Z/pool/main/m/mtdev/libmtdev1_1.1.5-1.1_mips64el.deb +https://snapshot.debian.org/archive/debian/20191212T145612Z/pool/main/n/ncurses/libncurses6_6.1+20191019-1_mips64el.deb +https://snapshot.debian.org/archive/debian/20191212T145612Z/pool/main/n/ncurses/libncurses-dev_6.1+20191019-1_mips64el.deb +https://snapshot.debian.org/archive/debian/20191212T145612Z/pool/main/n/ncurses/libncursesw6_6.1+20191019-1_mips64el.deb +https://snapshot.debian.org/archive/debian/20191212T145612Z/pool/main/n/ncurses/libtinfo6_6.1+20191019-1_mips64el.deb https://snapshot.debian.org/archive/debian/20191212T145612Z/pool/main/n/nettle/libhogweed5_3.5.1+really3.5.1-2_mips64el.deb https://snapshot.debian.org/archive/debian/20191212T145612Z/pool/main/n/nettle/libnettle7_3.5.1+really3.5.1-2_mips64el.deb https://snapshot.debian.org/archive/debian/20191212T145612Z/pool/main/n/nspr/libnspr4_4.23-1_mips64el.deb diff --git a/chromium/build/linux/sysroot_scripts/generated_package_lists/sid.mipsel b/chromium/build/linux/sysroot_scripts/generated_package_lists/sid.mipsel index bf3495f8885..3fedde4decb 100644 --- a/chromium/build/linux/sysroot_scripts/generated_package_lists/sid.mipsel +++ b/chromium/build/linux/sysroot_scripts/generated_package_lists/sid.mipsel @@ -12,8 +12,6 @@ https://snapshot.debian.org/archive/debian/20191212T145612Z/pool/main/a/avahi/li https://snapshot.debian.org/archive/debian/20191212T145612Z/pool/main/a/avahi/libavahi-common3_0.7-4+b1_mipsel.deb https://snapshot.debian.org/archive/debian/20191212T145612Z/pool/main/b/bluez/libbluetooth3_5.50-1+b1_mipsel.deb https://snapshot.debian.org/archive/debian/20191212T145612Z/pool/main/b/bluez/libbluetooth-dev_5.50-1+b1_mipsel.deb -https://snapshot.debian.org/archive/debian/20191212T145612Z/pool/main/b/brltty/libbrlapi0.7_6.0+dfsg-4+b1_mipsel.deb -https://snapshot.debian.org/archive/debian/20191212T145612Z/pool/main/b/brltty/libbrlapi-dev_6.0+dfsg-4+b1_mipsel.deb https://snapshot.debian.org/archive/debian/20191212T145612Z/pool/main/b/brotli/libbrotli1_1.0.7-5+b1_mipsel.deb https://snapshot.debian.org/archive/debian/20191212T145612Z/pool/main/c/cairo/libcairo2_1.16.0-4_mipsel.deb https://snapshot.debian.org/archive/debian/20191212T145612Z/pool/main/c/cairo/libcairo2-dev_1.16.0-4_mipsel.deb @@ -252,6 +250,10 @@ https://snapshot.debian.org/archive/debian/20191212T145612Z/pool/main/m/mesa/mes https://snapshot.debian.org/archive/debian/20191212T145612Z/pool/main/m/minizip/libminizip1_1.1-8+b1_mipsel.deb https://snapshot.debian.org/archive/debian/20191212T145612Z/pool/main/m/minizip/libminizip-dev_1.1-8+b1_mipsel.deb https://snapshot.debian.org/archive/debian/20191212T145612Z/pool/main/m/mtdev/libmtdev1_1.1.5-1.1_mipsel.deb +https://snapshot.debian.org/archive/debian/20191212T145612Z/pool/main/n/ncurses/libncurses6_6.1+20191019-1_mipsel.deb +https://snapshot.debian.org/archive/debian/20191212T145612Z/pool/main/n/ncurses/libncurses-dev_6.1+20191019-1_mipsel.deb +https://snapshot.debian.org/archive/debian/20191212T145612Z/pool/main/n/ncurses/libncursesw6_6.1+20191019-1_mipsel.deb +https://snapshot.debian.org/archive/debian/20191212T145612Z/pool/main/n/ncurses/libtinfo6_6.1+20191019-1_mipsel.deb https://snapshot.debian.org/archive/debian/20191212T145612Z/pool/main/n/nettle/libhogweed5_3.5.1+really3.5.1-2_mipsel.deb https://snapshot.debian.org/archive/debian/20191212T145612Z/pool/main/n/nettle/libnettle7_3.5.1+really3.5.1-2_mipsel.deb https://snapshot.debian.org/archive/debian/20191212T145612Z/pool/main/n/nspr/libnspr4_4.23-1_mipsel.deb diff --git a/chromium/build/linux/sysroot_scripts/install-sysroot.py b/chromium/build/linux/sysroot_scripts/install-sysroot.py index 165551a2948..f8b7906cc55 100755 --- a/chromium/build/linux/sysroot_scripts/install-sysroot.py +++ b/chromium/build/linux/sysroot_scripts/install-sysroot.py @@ -78,8 +78,6 @@ def main(args): parser.add_option('--print-hash', help='Print the hash of the sysroot for the given arch.') options, _ = parser.parse_args(args) - if not sys.platform.startswith('linux'): - return 0 if options.print_hash: arch = options.print_hash diff --git a/chromium/build/linux/sysroot_scripts/sysroot-creator-sid.sh b/chromium/build/linux/sysroot_scripts/sysroot-creator-sid.sh index ebe40f20c6b..7c50db3e347 100755 --- a/chromium/build/linux/sysroot_scripts/sysroot-creator-sid.sh +++ b/chromium/build/linux/sysroot_scripts/sysroot-creator-sid.sh @@ -63,8 +63,6 @@ DEBIAN_PACKAGES="\ libblkid1 libbluetooth-dev libbluetooth3 - libbrlapi-dev - libbrlapi0.7 libbrotli1 libbsd0 libc6 @@ -206,6 +204,9 @@ DEBIAN_PACKAGES="\ libnss-db libnss3 libnss3-dev + libncurses-dev + libncurses6 + libncursesw6 libogg-dev libogg0 libopengl0 @@ -270,6 +271,7 @@ DEBIAN_PACKAGES="\ libtasn1-6 libthai0 libtiff5 + libtinfo6 libudev-dev libudev1 libunbound8 diff --git a/chromium/build/linux/sysroot_scripts/sysroot-creator.sh b/chromium/build/linux/sysroot_scripts/sysroot-creator.sh index f03b46042a3..8626cded112 100644 --- a/chromium/build/linux/sysroot_scripts/sysroot-creator.sh +++ b/chromium/build/linux/sysroot_scripts/sysroot-creator.sh @@ -336,6 +336,23 @@ HacksAndPatchesCommon() { cp "${SCRIPT_DIR}/libdbus-1-3-symbols" \ "${INSTALL_ROOT}/debian/libdbus-1-3/DEBIAN/symbols" + # Shared objects depending on libdbus-1.so.3 have unsatisfied undefined + # versioned symbols. To avoid LLD --no-allow-shlib-undefined errors, rewrite + # DT_NEEDED entries from libdbus-1.so.3 to a different string. LLD will + # suppress --no-allow-shlib-undefined diagnostics for such shared objects. + set +e + for f in "${INSTALL_ROOT}/lib/${arch}-${os}"/*.so \ + "${INSTALL_ROOT}/usr/lib/${arch}-${os}"/*.so; do + echo "$f" | grep -q 'libdbus-1.so$' && continue + # In a dependent shared object, the only occurrence of "libdbus-1.so.3" is + # the string referenced by the DT_NEEDED entry. + offset=$(LANG=C grep -abo libdbus-1.so.3 "$f") + [ -n "$offset" ] || continue + echo -n 'libdbus-1.so.0' | dd of="$f" conv=notrunc bs=1 \ + seek="$(echo -n "$offset" | cut -d : -f 1)" status=none + done + set -e + # Glibc 2.27 introduced some new optimizations to several math functions, but # it will be a while before it makes it into all supported distros. Luckily, # glibc maintains ABI compatibility with previous versions, so the old symbols @@ -498,6 +515,8 @@ VerifyLibraryDepsCommon() { grep ': ELF' | sed 's/^\(.*\): .*$/\1/' | xargs readelf -d | \ grep NEEDED | sort | uniq | sed 's/^.*Shared library: \[\(.*\)\]$/\1/g')" local all_libs="$(find ${find_dirs[*]} -printf '%f\n')" + # Ignore missing libdbus-1.so.0 + all_libs+="$(echo -e '\nlibdbus-1.so.0')" local missing_libs="$(grep -vFxf <(echo "${all_libs}") \ <(echo "${needed_libs}"))" if [ ! -z "${missing_libs}" ]; then diff --git a/chromium/build/linux/sysroot_scripts/sysroots.json b/chromium/build/linux/sysroot_scripts/sysroots.json index 366ce23e675..60ae1cf90ed 100644 --- a/chromium/build/linux/sysroot_scripts/sysroots.json +++ b/chromium/build/linux/sysroot_scripts/sysroots.json @@ -1,36 +1,36 @@ { "sid_amd64": { - "Sha1Sum": "52cf2961a3cddc0d46e1a2f7d9bf376fc16a61de", + "Sha1Sum": "d6879d611f3dcf3da8dd92e080029394aa30bc42", "SysrootDir": "debian_sid_amd64-sysroot", "Tarball": "debian_sid_amd64_sysroot.tar.xz" }, "sid_arm": { - "Sha1Sum": "0a1444c9e8e5a9a461a4c2e168cc040e443b201d", + "Sha1Sum": "b7688b64ce3a5b93db21678d1c88cf35da340a39", "SysrootDir": "debian_sid_arm-sysroot", "Tarball": "debian_sid_arm_sysroot.tar.xz" }, "sid_arm64": { - "Sha1Sum": "39c8af09836079013052d813eb3faa84eacc1023", + "Sha1Sum": "96072272c5c3dc906fdce0517368b8a298af7abd", "SysrootDir": "debian_sid_arm64-sysroot", "Tarball": "debian_sid_arm64_sysroot.tar.xz" }, "sid_armel": { - "Sha1Sum": "d737c7ea6d35a1d059dbb4572367717b6aa01ea4", + "Sha1Sum": "220a382df2a9af90328e70cdef598b298781ad27", "SysrootDir": "debian_sid_armel-sysroot", "Tarball": "debian_sid_armel_sysroot.tar.xz" }, "sid_i386": { - "Sha1Sum": "36ed2ee83109acdd44af2e522a5e9e0082b074a6", + "Sha1Sum": "9c31dbb40e1af6ce03336a095ba6ad6e0c961e77", "SysrootDir": "debian_sid_i386-sysroot", "Tarball": "debian_sid_i386_sysroot.tar.xz" }, "sid_mips": { - "Sha1Sum": "5c1c223a5bfc9bfe66b95025abe17153149e5ffb", + "Sha1Sum": "728755d2fb5455d1d3293b6b10704fca859d97dd", "SysrootDir": "debian_sid_mips-sysroot", "Tarball": "debian_sid_mips_sysroot.tar.xz" }, "sid_mips64el": { - "Sha1Sum": "2351c79f5af6eab1f68141049a3929d8f7319e09", + "Sha1Sum": "e9e309d7887cb9baacb3aac603fd50f476891ead", "SysrootDir": "debian_sid_mips64el-sysroot", "Tarball": "debian_sid_mips64el_sysroot.tar.xz" } |