GitLab is used only for code review, issue tracking and project management. Canonical locations for source code are still https://gitweb.torproject.org/ https://git.torproject.org/ and git-rw.torproject.org.

Commit 41cfbfda authored by Georg Koppen's avatar Georg Koppen
Browse files

Merge branch 'bug_26238_v6' into master

parents 1d426e5c 6c9cf92f
...@@ -4,32 +4,6 @@ This file lists some common build errors and their solutions. ...@@ -4,32 +4,6 @@ This file lists some common build errors and their solutions.
Error starting remote Error starting remote
--------------------- ---------------------
If you have an error like this:
----
Error: Error starting remote:
/bin/sh: 1: adduser: not found
Segmentation fault (core dumped)
----
You might be having this issue:
https://github.com/docker/docker/issues/28705
When the kernel is configured with CONFIG_LEGACY_VSYSCALL_NONE, running
Debian Wheezy containers fails with a segfault. This should be fixed by
adding "vsyscall=emulate"to the kernel cmdline.
If you are building inside Qubes, you can change the kernel cmdline for
the VM you are using with something like this in dom0:
----
$ qvm-pref --get [vmname] kernelopts
nopat
$ qvm-pref --set [vmname] kernelopts 'nopat vsyscall=emulate'
----
If you have an error like this: If you have an error like this:
---- ----
......
...@@ -8,11 +8,6 @@ distdir=/var/tmp/dist/binutils ...@@ -8,11 +8,6 @@ distdir=/var/tmp/dist/binutils
export DEB_BUILD_HARDENING_FORTIFY=1 export DEB_BUILD_HARDENING_FORTIFY=1
export DEB_BUILD_HARDENING_FORMAT=1 export DEB_BUILD_HARDENING_FORMAT=1
export DEB_BUILD_HARDENING_PIE=1 export DEB_BUILD_HARDENING_PIE=1
# The libstdc++ shipped by default is non-PIC which breaks the binutils build
# if we build with DEB_BUILD_HARDENING_PIE=1. We need to install a PIC one AND
# make sure it gets used before the non-PIC one would.
ln -s /usr/lib/gcc/x86_64-linux-gnu/4.7/libstdc++_pic.a libstdc++.a
export LDFLAGS="-L$rootdir -lstdc++"
[% END %] [% END %]
tar xf [% project %]-[% c("version") %].tar.xz tar xf [% project %]-[% c("version") %].tar.xz
cd [% project %]-[% c("version") %] cd [% project %]-[% c("version") %]
......
...@@ -22,7 +22,6 @@ mkdir build ...@@ -22,7 +22,6 @@ mkdir build
cd build cd build
cmake .. -G "Unix Makefiles" -DCMAKE_INSTALL_PREFIX=$distdir \ cmake .. -G "Unix Makefiles" -DCMAKE_INSTALL_PREFIX=$distdir \
-DCMAKE_BUILD_TYPE:STRING=Release \ -DCMAKE_BUILD_TYPE:STRING=Release \
[% IF c("var/linux") -%]-DCOMPILER_RT_BUILD_CRT=OFF \[% END -%]
[% IF c("var/rlbox") -%]-DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD=WebAssembly \[% END -%] [% IF c("var/rlbox") -%]-DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD=WebAssembly \[% END -%]
$LLVM_HOME $LLVM_HOME
make -j[% c("buildconf/num_procs") %] make -j[% c("buildconf/num_procs") %]
......
...@@ -10,8 +10,8 @@ var: ...@@ -10,8 +10,8 @@ var:
lsb_release: lsb_release:
id: Debian id: Debian
codename: wheezy codename: jessie
release: 7.11 release: 8.11
targets: targets:
no_containers: no_containers:
......
...@@ -37,24 +37,23 @@ pre: | ...@@ -37,24 +37,23 @@ pre: |
tar -C ./base-image -czf [% dest_dir %]/[% c("filename") %] . tar -C ./base-image -czf [% dest_dir %]/[% c("filename") %] .
targets: targets:
wheezy-amd64: jessie-amd64:
var: var:
minimal_apt_version: '0.9.7.9+deb7u9' minimal_apt_version: 1.0.9.8.6
# https://deb.freexian.com/extended-lts/updates/ela-76-1-apt/ # https://lists.debian.org/debian-lts-announce/2020/05/msg00013.html
apt_packages_baseurl: http://deb.freexian.com/extended-lts/pool/main/a/apt apt_packages_baseurl: https://deb.freexian.com/extended-lts/pool/main/a/apt
apt_package_filename: apt_0.9.7.9+deb7u9_amd64.deb apt_package_filename: apt_1.0.9.8.6_amd64.deb
apt_package_sha256sum: b8a218da2ae21979323dd02551d983938d94308ac56930a2d238e822f062dc61 apt_package_sha256sum: f82ba7ad03a33bed6644777260d28156a0ed0119aeafe657ef1f849330455f5b
apt_utils_package_filename: apt-utils_0.9.7.9+deb7u9_amd64.deb apt_utils_package_filename: apt-utils_1.0.9.8.6_amd64.deb
apt_utils_package_sha256sum: d635a166aae03b24cdabe277bb46d584156836637c0b9bef2220fb0bc0928e40 apt_utils_package_sha256sum: 14cb23047ef9d83b0d026c4d5b0eb5e7b06cca36067d19155e9ea14982b09d61
libapt_inst_package_filename: libapt-inst1.5_0.9.7.9+deb7u9_amd64.deb libapt_inst_package_filename: libapt-inst1.5_1.0.9.8.6_amd64.deb
libapt_inst_package_sha256sum: 332083172e00d39e55dec4c7078c3522989e45e12b0a1306889e90b8e2c0a0db libapt_inst_package_sha256sum: 332b7453774ad3d141ce459d0c7a8438f16588c0df987e13c388b45740142c76
libapt_pkg_package_filename: libapt-pkg4.12_0.9.7.9+deb7u9_amd64.deb libapt_pkg_package_filename: libapt-pkg4.12_1.0.9.8.6_amd64.deb
libapt_pkg_package_sha256sum: c3ae83c4ea691074250bf6fb175e71042c4bb7418bf19779ceda0a53eea0a257 libapt_pkg_package_sha256sum: c2e17b87284e8c7e162a390d8bba08870729040c2ec0e73eb6631b846dd013c0
container: container:
suite: wheezy suite: jessie
arch: amd64 arch: amd64
debootstrap_mirror: "http://archive.debian.org/debian/"
buster-amd64: buster-amd64:
var: var:
......
...@@ -22,7 +22,6 @@ mkdir build ...@@ -22,7 +22,6 @@ mkdir build
cd build cd build
cmake .. -G "Unix Makefiles" -DCMAKE_INSTALL_PREFIX=$distdir \ cmake .. -G "Unix Makefiles" -DCMAKE_INSTALL_PREFIX=$distdir \
-DCMAKE_BUILD_TYPE:STRING=Release \ -DCMAKE_BUILD_TYPE:STRING=Release \
[% IF c("var/linux") -%]-DCOMPILER_RT_BUILD_CRT=OFF \[% END -%]
[% IF c("var/rlbox") -%]-DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD=WebAssembly \[% END -%] [% IF c("var/rlbox") -%]-DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD=WebAssembly \[% END -%]
$LLVM_HOME $LLVM_HOME
make -j[% c("buildconf/num_procs") %] make -j[% c("buildconf/num_procs") %]
......
...@@ -46,7 +46,7 @@ targets: ...@@ -46,7 +46,7 @@ targets:
# #
# `--enable-extended` to build not only rustc but cargo as well # `--enable-extended` to build not only rustc but cargo as well
# #
# `--enable-llvm-static-stdccp` to take a libstdc++ on Wheezy into account # `--enable-llvm-static-stdccp` to take a libstdc++ on Jessie into account
# which is too old and if used gives undefined reference errors # which is too old and if used gives undefined reference errors
# #
# `--release-channel=stable` to just include stable features in the # `--release-channel=stable` to just include stable features in the
...@@ -63,9 +63,7 @@ targets: ...@@ -63,9 +63,7 @@ targets:
# `--set=` to explicitly specify the C compiler. We need to compile the # `--set=` to explicitly specify the C compiler. We need to compile the
# bundled LLVM and it wants to use `cc`. However, we don't have that in # bundled LLVM and it wants to use `cc`. However, we don't have that in
# our compiled GCC resulting in weird errors due to C and C++ compiler # our compiled GCC resulting in weird errors due to C and C++ compiler
# version mismatch. We avoid that with this configure option. We need to # version mismatch. We avoid that with this configure option.
# build our own GCC in the first place as 4.7.2 is too old to get all the
# Rust pieces compiled.
configure_opt: --enable-local-rust --enable-vendor --enable-extended --enable-llvm-static-stdcpp --release-channel=stable --sysconfdir=etc --target=x86_64-unknown-linux-gnu,i686-unknown-linux-gnu --set=target.x86_64-unknown-linux-gnu.cc=gcc --set=target.i686-unknown-linux-gnu.cc=gcc configure_opt: --enable-local-rust --enable-vendor --enable-extended --enable-llvm-static-stdcpp --release-channel=stable --sysconfdir=etc --target=x86_64-unknown-linux-gnu,i686-unknown-linux-gnu --set=target.x86_64-unknown-linux-gnu.cc=gcc --set=target.i686-unknown-linux-gnu.cc=gcc
osx-x86_64: osx-x86_64:
......
...@@ -54,15 +54,6 @@ targets: ...@@ -54,15 +54,6 @@ targets:
var: var:
branding_directory: 'browser/branding/nightly' branding_directory: 'browser/branding/nightly'
linux:
var:
post_pkginst: |
# Firefox ESR68 needs Yasm >= 1.2.0 which Debian Wheezy ships in backports.
echo 'deb http://archive.debian.org/debian/ wheezy-backports main' >> /etc/apt/sources.list
export DEBIAN_FRONTEND=noninteractive
apt-get update
apt-get install -t wheezy-backports -y yasm
linux-x86_64: linux-x86_64:
var: var:
martools_filename: mar-tools-linux64.zip martools_filename: mar-tools-linux64.zip
......
...@@ -56,7 +56,7 @@ targets: ...@@ -56,7 +56,7 @@ targets:
# #
# `--enable-extended` to build not only rustc but cargo as well # `--enable-extended` to build not only rustc but cargo as well
# #
# `--enable-llvm-static-stdccp` to take a libstdc++ on Wheezy into account # `--enable-llvm-static-stdcpp` to take a libstdc++ on Jessie into account
# which is too old and if used gives undefined reference errors # which is too old and if used gives undefined reference errors
# #
# `--release-channel=stable` to just include stable features in the # `--release-channel=stable` to just include stable features in the
...@@ -73,9 +73,7 @@ targets: ...@@ -73,9 +73,7 @@ targets:
# `--set=` to explicitly specify the C compiler. We need to compile the # `--set=` to explicitly specify the C compiler. We need to compile the
# bundled LLVM and it wants to use `cc`. However, we don't have that in # bundled LLVM and it wants to use `cc`. However, we don't have that in
# our compiled GCC resulting in weird errors due to C and C++ compiler # our compiled GCC resulting in weird errors due to C and C++ compiler
# version mismatch. We avoid that with this configure option. We need to # version mismatch. We avoid that with this configure option.
# build our own GCC in the first place as 4.7.2 is too old to get all the
# Rust pieces compiled.
configure_opt: --enable-local-rust --enable-vendor --enable-extended --enable-llvm-static-stdcpp --release-channel=stable --sysconfdir=etc --target=x86_64-unknown-linux-gnu,i686-unknown-linux-gnu --set=target.x86_64-unknown-linux-gnu.cc=gcc --set=target.i686-unknown-linux-gnu.cc=gcc configure_opt: --enable-local-rust --enable-vendor --enable-extended --enable-llvm-static-stdcpp --release-channel=stable --sysconfdir=etc --target=x86_64-unknown-linux-gnu,i686-unknown-linux-gnu --set=target.x86_64-unknown-linux-gnu.cc=gcc --set=target.i686-unknown-linux-gnu.cc=gcc
osx-x86_64: osx-x86_64:
......
...@@ -326,7 +326,7 @@ targets: ...@@ -326,7 +326,7 @@ targets:
# Only build Namecoin for linux on nightly # Only build Namecoin for linux on nightly
namecoin: '[% c("var/nightly") %]' namecoin: '[% c("var/nightly") %]'
container: container:
suite: wheezy suite: jessie
arch: amd64 arch: amd64
pre_pkginst: dpkg --add-architecture i386 pre_pkginst: dpkg --add-architecture i386
deps: deps:
......
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