|
66 | 66 | distro=$(lsb_release --id --short)
|
67 | 67 | codename=$(lsb_release --codename --short)
|
68 | 68 | ubuntu_codenames="(precise|trusty|utopic|vivid|xenial)"
|
69 |
| -debian_codenames="(stretch)" |
| 69 | +debian_codenames="(stretch|rodete)" |
70 | 70 | if [ 0 -eq "${do_unsupported-0}" ] && [ 0 -eq "${do_quick_check-0}" ] ; then
|
71 | 71 | if [[ ! $codename =~ $ubuntu_codenames && ! $codename =~ $debian_codenames ]]; then
|
72 | 72 | echo "ERROR: Only Ubuntu 12.04 (precise), 14.04 (trusty), " \
|
73 |
| - "14.10 (utopic), 15.04 (vivid), and 16.04 (xenial), " \ |
74 |
| - "and Debian Testing (stretch) are currently supported" >&2 |
| 73 | + "14.10 (utopic), 15.04 (vivid), and 16.04 (xenial), Debian " \ |
| 74 | + "(rodete and stretch) are currently supported" >&2 |
75 | 75 | exit 1
|
76 | 76 | fi
|
77 | 77 |
|
@@ -105,10 +105,9 @@ dev_list="bison cdbs curl dpkg-dev elfutils devscripts fakeroot
|
105 | 105 | lib_list="libatk1.0-0 libc6 libasound2 libcairo2 libcap2 libcups2 libexpat1
|
106 | 106 | libexif12 libfontconfig1 libfreetype6 libglib2.0-0 libgnome-keyring0
|
107 | 107 | libgtk2.0-0 libpam0g libpango1.0-0 libpci3 libpcre3 libpixman-1-0
|
108 |
| - libpng12-0 libspeechd2 libstdc++6 libsqlite3-0 libx11-6 |
109 |
| - libxau6 libxcb1 libxcomposite1 libxcursor1 libxdamage1 libxdmcp6 |
110 |
| - libxext6 libxfixes3 libxi6 libxinerama1 libxrandr2 libxrender1 |
111 |
| - libxtst6 zlib1g" |
| 108 | + libspeechd2 libstdc++6 libsqlite3-0 libx11-6 libxau6 libxcb1 |
| 109 | + libxcomposite1 libxcursor1 libxdamage1 libxdmcp6 libxext6 libxfixes3 |
| 110 | + libxi6 libxinerama1 libxrandr2 libxrender1 libxtst6 zlib1g" |
112 | 111 |
|
113 | 112 | # Debugging symbols for all of the run-time libraries
|
114 | 113 | dbg_list="libatk1.0-dbg libc6-dbg libcairo2-dbg libfontconfig1-dbg
|
@@ -148,7 +147,7 @@ if [ "x$codename" = "xtrusty" ]; then
|
148 | 147 | fi
|
149 | 148 |
|
150 | 149 | # Find the proper version of libgbm-dev. We can't just install libgbm-dev as
|
151 |
| -# it depends on mesa, and only one version of mesa can exists on the system. |
| 150 | +# it depends on mesa, and only one version of mesa can exist on the system. |
152 | 151 | # Hence we must match the same version or this entire script will fail.
|
153 | 152 | mesa_variant=""
|
154 | 153 | for variant in "-lts-trusty" "-lts-utopic"; do
|
@@ -185,6 +184,11 @@ else
|
185 | 184 | dev_list="${dev_list} libbrlapi0.5"
|
186 | 185 | fi
|
187 | 186 |
|
| 187 | +if package_exists libpng16-16; then |
| 188 | + lib_list="$lib_list libpng16-16" |
| 189 | +else |
| 190 | + lib_list="$lib_list libpng12-0" |
| 191 | +fi |
188 | 192 |
|
189 | 193 | # Some packages are only needed if the distribution actually supports
|
190 | 194 | # installing them.
|
|
195 | 199 | # When cross building for arm/Android on 64-bit systems the host binaries
|
196 | 200 | # that are part of v8 need to be compiled with -m32 which means
|
197 | 201 | # that basic multilib support is needed.
|
198 |
| -if file /sbin/init | grep -q 'ELF 64-bit'; then |
| 202 | +if [[ "$(uname -m)" == "x86_64" ]]; then |
199 | 203 | # gcc-multilib conflicts with the arm cross compiler (at least in trusty) but
|
200 | 204 | # g++-X.Y-multilib gives us the 32-bit support that we need. Find out the
|
201 | 205 | # appropriate value of X and Y by seeing what version the current
|
|
0 commit comments