July 2017 - tor-commits - lists.torproject.org

[tor-messenger-build/master] Add duplicated files to allowed-dupes.mn
by sukhbir＠torproject.org 31 Jul '17

31 Jul '17

commit ff744ca7a9067bb2f7c853cd6e5f27869d6f6cfa Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Wed Jun 28 16:55:14 2017 -0400 Add duplicated files to allowed-dupes.mn --- ...-Add-duplicated-files-to-allowed-dupes.mn.patch | 29 ++++++++++++++++++++++ projects/instantbird/config | 1 + 2 files changed, 30 insertions(+) diff --git a/projects/instantbird/0029-Add-duplicated-files-to-allowed-dupes.mn.patch b/projects/instantbird/0029-Add-duplicated-files-to-allowed-dupes.mn.patch new file mode 100644 index 0000000..98ea665 --- /dev/null +++ b/projects/instantbird/0029-Add-duplicated-files-to-allowed-dupes.mn.patch @@ -0,0 +1,29 @@ +From 788fb16fed2bb0910a2385b1b315312c42b9f369 Mon Sep 17 00:00:00 2001 +From: Sukhbir Singh <sukhbir(a)torproject.org> +Date: Wed, 28 Jun 2017 16:49:51 -0400 +Subject: [PATCH] Add duplicated files to allowed-dupes.mn + +--- + im/installer/allowed-dupes.mn | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/im/installer/allowed-dupes.mn b/im/installer/allowed-dupes.mn +index 988dc2d35a..ed26b72f97 100644 +--- a/im/installer/allowed-dupes.mn ++++ b/im/installer/allowed-dupes.mn +@@ -10,6 +10,12 @@ chrome/instantbird/skin/classic/instantbird/messages/simple/Variants/Normal.css + chrome/instantbird/skin/classic/instantbird/messages/simple/Incoming/Context.html + chrome/instantbird/skin/classic/instantbird/messages/simple/Incoming/NextContext.html + chrome/chat/content/chat/conv.html ++chrome/toolkit/skin/classic/global/icons/collapse.png ++chrome/instantbird/skin/classic/instantbird/collapse.png ++chrome/toolkit/skin/classic/global/icons/expand.png ++chrome/instantbird/skin/classic/instantbird/expand.png ++chrome/icons/default/default16.png ++icons/default16.png + + # Variants of paths in mozilla/browser/installer/allowed-dupes.mn + # and mail/installer/allowed-dupes.mn: +-- +2.11.0 + diff --git a/projects/instantbird/config b/projects/instantbird/config index 08c4402..0c55f0a 100644 --- a/projects/instantbird/config +++ b/projects/instantbird/config @@ -91,6 +91,7 @@ input_files: - filename: 0026-Bug-1321420-Add-a-pref-to-disable-JavaScript-in-brow.patch - filename: 0027-Trac-17517-Use-different-color-for-Add-Exception.patch - filename: 0028-Trac-21736-Hide-account-timestamp-from-message.patch + - filename: 0029-Add-duplicated-files-to-allowed-dupes.mn.patch - filename: mozconfig-common - filename: 'mozconfig-[% c("var/osname") %]' name: mozconfig

1 0

[tor-messenger-build/master] Update rbm.conf to use runc instead of docker
by sukhbir＠torproject.org 31 Jul '17

31 Jul '17

commit 1831f3ced2e3b767ef16244346945216e09cbc07 Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Mon Jul 17 14:31:53 2017 -0400 Update rbm.conf to use runc instead of docker --- rbm.conf | 222 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 198 insertions(+), 24 deletions(-) diff --git a/rbm.conf b/rbm.conf index 175844d..6c6645c 100644 --- a/rbm.conf +++ b/rbm.conf @@ -1,66 +1,175 @@ # vim: filetype=yaml sw=2 -debug: 1 +debug: '[% GET ! ENV.RBM_NO_DEBUG %]' compress_tar: gz output_dir: "out/[% project %]" +build_log: '[% GET ENV.RBM_LOGS_DIR ? ENV.RBM_LOGS_DIR : "logs" %]/[% project %]-[% c("var/osname") %].log' pkg_type: build var: tormessenger_version: '0.5.0b1' copyright_year: '2017' + project_name: tor-messenger + multi_lingual: 0 + build_mar: 1 + # By default, we sort the list of installed packages. This allows sharing + # containers with identical list of packages, even if they are not listed + # in the same order. In the cases where the installation order is + # important, sort_deps should be set to 0. + sort_deps: 1 build_id: '[% sha256(c("var/build_id_txt")).substr(0, 6) %]' build_id_txt: | [% c("version") %] [% IF c("git_hash") || c("hg_hash"); GET c("abbrev"); END; %] - [% IF c("remote_docker") -%] - [% c("distribution") %] + [% IF c("var/container/use_container") -%] + [% c("var/container/suite") %] + [% c("var/container/arch") %] [% END -%] input_files: [% c("input_files_id") %] build: [% c("build", { filename => 'f', output_dir => '/out' }) %] + container: + dir: '[% c("tmp_dir") %]/rbm-containers/[% sha256(c("build_id")) %]' + user: rbm input_files_list: | [% FOREACH file IN c("input_files_by_name").keys.sort -%] [% c("input_files_by_name/" _ file) %] [% END -%] + touch: "[% USE date %]touch -m -t [% date.format(c('timestamp'), format = '%Y%m%d%H%M') %]" + + sign_build: '[% ENV.RBM_SIGN_BUILD %]' + sign_build_gpg_opts: '[% ENV.RBM_GPG_OPTS %]' + + rezip: | + rezip_tmpdir=$(mktemp -d) + mkdir -p "$rezip_tmpdir/z" + unzip -d "$rezip_tmpdir/z" -- [% c("rezip_file") %] || [ $? -lt 3 ] + pushd "$rezip_tmpdir/z" + [% c("zip", { + zip_src => [ '.' ], + zip_args => '$rezip_tmpdir/new.zip', + }) %] + popd + mv -f -- "$rezip_tmpdir/new.zip" [% c("rezip_file") %] + rm -Rf "$rezip_tmpdir" + + set_default_env: | + set -e + [% FOREACH env = c('ENV') -%] + export [% env.key %]="[% env.value %]" + [% END -%] + rootdir=$(pwd) + export SHELL=/bin/bash + export HOME=$rootdir + umask 0022 + targets: notarget: linux-x86_64 noint: debug: 0 + + tormessenger-linux-x86_64: + - linux-x86_64 + - linux + - tor-messenger + tormessenger-linux-i686: + - linux-i686 + - linux + - tor-messenger linux-x86_64: - distribution: Debian-7.11 arch: x86_64 var: - linux: 1 + linux-x86_64: 1 osname: linux-x86_64 - compiler: gcc + container: + arch: amd64 linux-i686: - distribution: Debian-7.11 arch: i686 var: - linux: 1 + linux-i686: 1 osname: linux-i686 - configure_opt: '--host=i686-linux-gnu CFLAGS=-m32 CXXFLAGS=-m32 LDFLAGS=-m32' + container: + arch: i386 + setarch: | + if test -z "$RBM_SETARCH" + then + export RBM_SETARCH=1 + exec setarch i686 ./build + fi + linux: + var: + linux: 1 compiler: gcc - pre_pkginst: dpkg --add-architecture i386 + container: + suite: wheezy + deps: + - build-essential + - python + - bison + - hardening-wrapper + - automake + - libtool + - zip + - unzip + + tormessenger-windows-i686: + - windows-i686 + - tor-messenger windows-i686: - distribution: Ubuntu-14.10 arch: i686 var: windows: 1 osname: windows-i686 + container: + suite: precise + arch: i386 configure_opt: '--host=i686-w64-mingw32 CFLAGS="[% c("var/CFLAGS") %]" LDFLAGS="[% c("var/LDFLAGS") %]"' - CFLAGS: '-specs=/var/tmp/dist/mingw-w64/msvcr100.spec -mwindows -fstack-protector-all -Wstack-protector --param ssp-buffer-size=4 -fno-strict-overflow -Wno-missing-field-initializers -Wformat -Wformat-security' - LDFLAGS: '-specs=/var/tmp/dist/mingw-w64/msvcr100.spec -mwindows -Wl,--dynamicbase -Wl,--nxcompat -Wl,--enable-reloc-section -lssp -L$gcclibs' + CFLAGS: '[% c("var/flag_mwindows") %] -fstack-protector-all -Wstack-protector --param ssp-buffer-size=4 -fno-strict-overflow -Wno-missing-field-initializers -Wformat -Wformat-security' + LDFLAGS: '[% c("var/flag_mwindows") %] -Wl,--dynamicbase -Wl,--nxcompat -Wl,--enable-reloc-section -lssp -L$gcclibs' + flag_mwindows: '-mwindows' compiler: mingw-w64 + deps: + - build-essential + - python + - bison + - automake + - libtool + - zip + - unzip + faketime_path: /usr/lib/faketime/libfaketime.so.1 + setarch: | + if test -z "$RBM_SETARCH" + then + export RBM_SETARCH=1 + exec setarch i686 ./build + fi + + tormessenger-osx-x86_64: + - osx-x86_64 + - tor-messenger osx-x86_64: - distribution: Ubuntu-12.04 arch: x86_64 var: osx: 1 osname: osx-x86_64 + container: + suite: jessie + arch: amd64 compiler: 'macosx-toolchain' - configure_opt: '--host=x86_64-apple-darwin10 CC="x86_64-apple-darwin10-clang $CFLAGS" CXX="x86_64-apple-darwin10-clang++ $CXXFLAGS"' + configure_opt: '--host=x86_64-apple-darwin10 CC="x86_64-apple-darwin10-clang [% c("var/FLAGS") %]" CXX="x86_64-apple-darwin10-clang++ [% c("var/FLAGS") %]"' + FLAGS: "-target x86_64-apple-darwin10 -mlinker-version=136 -B $cctoolsdir -isysroot $sysrootdir" + LDFLAGS: "-Wl,-syslibroot,$sysrootdir -Wl,-dead_strip -Wl,-pie" + locale_ja: ja-JP-mac + deps: + - build-essential + - python + - bison + - automake + - libtool + - zip + - unzip + faketime_path: /usr/lib/x86_64-linux-gnu/faketime/libfaketime.so.1 tor-messenger: var: @@ -68,12 +177,6 @@ targets: tor_socks_port: 9152 tor_control_port: 9153 - tor-mail: - var: - tor-mail: 1 - tor_socks_port: 9154 - tor_control_port: 9155 - # The no_build_id target can be useful if you want to quickly display # a build template or other option but don't want to spend time to # compute the various build ids @@ -82,9 +185,6 @@ targets: build_id: 1 -docker_image: '[% pc("docker-image", "docker_save_image") %]' -hg_opt: '--config extensions.bundleclone=[% shell_quote(c("basedir") _ "/tools/version-control-tools/hgext/bundleclone/__init__.py") %]' - # change the default gpg_wrapper to allow git tag signed using an # expired key. # https://bugs.torproject.org/19737 @@ -104,3 +204,77 @@ gpg_wrapper: | else exec [% c('gpg_bin') %] [% c('gpg_args') %] --with-fingerprint [% gpg_kr %] "$@" fi + +remote_start: '[% IF c("var/container/use_container") %][% c("runc/remote_start") %][% END %]' +remote_exec: '[% IF c("var/container/use_container") %][% c("runc/remote_exec") %][% END %]' +remote_put: '[% IF c("var/container/use_container") %][% c("runc/remote_put") %][% END %]' +remote_get: '[% IF c("var/container/use_container") %][% c("runc/remote_get") %][% END %]' +remote_finish: '[% IF c("var/container/use_container") %][% c("runc/remote_finish") %][% END %]' + +runc: + remote_start: | + #!/bin/sh + set -e + if [ $(ls -1 '[% c("remote_srcdir", { error_if_undef => 1 }) %]/container-image_'* | wc -l) -ne 1 ] + then + echo "Can't find container image in input files" >&2 + ls -l '[% c("remote_srcdir") %]' >&2 + exit 1 + fi + mkdir -p '[% c("var/container/dir") %]'/rootfs/rbm + sudo tar -C '[% c("var/container/dir") %]'/rootfs -xf $(ls -1 '[% c("remote_srcdir", { error_if_undef => 1 }) %]/container-image_'*) + cat > '[% c("var/container/dir") %]'/config.json << EOF + [% INCLUDE 'runc-config.json' %] + EOF + [% SET user = c("var/container/user") -%] + [% c("remote_exec", { exec_as_root => 1, exec_cmd => 'id ' _ user + _ ' >/dev/null 2>&1 || adduser -m ' _ user _ ' || useradd -m ' _ user }) %] + + remote_exec: | + #!/bin/sh + set -e + mkdir -p '[% c("var/container/dir", { error_if_undef => 1 }) %]'/rootfs/rbm + echo '#!/bin/sh' > '[% c("var/container/dir") %]'/rootfs/rbm/cmd + echo [% shell_quote(c('exec_cmd')) %] >> '[% c("var/container/dir") %]'/rootfs/rbm/cmd + echo '#!/bin/sh' > '[% c("var/container/dir") %]'/rootfs/rbm/run + [% IF c('exec_as_root'); SET user = 'root'; ELSE; SET user = c("var/container/user", { error_if_undef => 1 }); END; %] + echo 'su - [% user %] -c /rbm/cmd' >> '[% c("var/container/dir") %]'/rootfs/rbm/run + chmod +x '[% c("var/container/dir") %]'/rootfs/rbm/cmd + chmod +x '[% c("var/container/dir") %]'/rootfs/rbm/run + sudo runc start -b '[% c("var/container/dir") %]' rbm-[% sha256(c("build_id", { error_if_undef => 1 })) %] + + remote_put: | + #!/bin/sh + set -e + [% + SET src = shell_quote(c('put_src', { error_if_undef => 1 })); + SET dst = shell_quote(c('put_dst', { error_if_undef => 1 })); + -%] + sudo mkdir -p '[% c("var/container/dir") %]'/rootfs/[% dst %] + sudo cp -aP [% src %] '[% c("var/container/dir") %]'/rootfs/[% dst %] + [% c("remote_exec", { exec_as_root => 1, exec_cmd => 'chown -R ' _ c("var/container/user") _ ' ' _ dst }) %] + + remote_get: | + #!/bin/sh + set -e + [% + SET src = shell_quote(c('get_src', { error_if_undef => 1 })); + SET dst = shell_quote(c('get_dst', { error_if_undef => 1 })); + -%] + mkdir -p [% dst %] + srcdir='[% c("var/container/dir", { error_if_undef => 1 }) %]'/rootfs/[% src %] + if [ $(ls -1 "$srcdir"/* 2> /dev/null | wc -l) -gt 0 ] + then + sudo chown $(whoami) "$srcdir"/* + sudo mv -f "$srcdir"/* [% dst %]/ + fi + + remote_finish: | + #!/bin/sh + set -e + sudo rm -Rf '[% c("var/container/dir", { error_if_undef => 1 }) %]'/rootfs '[% c("var/container/dir", { error_if_undef => 1 }) %]'/config.json + rmdir '[% c("var/container/dir") %]' + +ENV: + TZ: UTC + LC_ALL: C

1 0

[tor-messenger-build/master] Also symlink common/ and container-image/
by sukhbir＠torproject.org 31 Jul '17

31 Jul '17

commit b3a5baa367e09ee436e483df99d4e44029c7aeeb Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Mon Jul 17 16:43:03 2017 -0400 Also symlink common/ and container-image/ --- projects/common | 1 + projects/container-image | 1 + 2 files changed, 2 insertions(+) diff --git a/projects/common b/projects/common new file mode 120000 index 0000000..7d7c040 --- /dev/null +++ b/projects/common @@ -0,0 +1 @@ +../tor-browser-build/projects/common \ No newline at end of file diff --git a/projects/container-image b/projects/container-image new file mode 120000 index 0000000..8bd866b --- /dev/null +++ b/projects/container-image @@ -0,0 +1 @@ +../tor-browser-build/projects/container-image \ No newline at end of file

1 0

[tor-messenger-build/master] Update the submodules
by sukhbir＠torproject.org 31 Jul '17

31 Jul '17

commit bb0814d5053f40fca8178ab8d8eb315157fede5a Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Mon Jul 17 15:02:39 2017 -0400 Update the submodules --- rbm | 2 +- tools/version-control-tools | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/rbm b/rbm index 64cc0f0..106e9b0 160000 --- a/rbm +++ b/rbm @@ -1 +1 @@ -Subproject commit 64cc0f085badca40c74288d59698ea3b9e50ce9a +Subproject commit 106e9b05aeff6309e241a3c9bae1781e0d551e7a diff --git a/tools/version-control-tools b/tools/version-control-tools index fd2903b..e428e6f 160000 --- a/tools/version-control-tools +++ b/tools/version-control-tools @@ -1 +1 @@ -Subproject commit fd2903b7e3692a3915213390863768b2ae904e2f +Subproject commit e428e6f0e70b5c00f7117cda0e606da3b5459080

1 0

[tor-messenger-build/master] Link projects to Tor Browser build directory
by sukhbir＠torproject.org 31 Jul '17

31 Jul '17

commit de13b1c3daf7f0a90cf381ae3d6c326c7422caa9 Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Mon Jul 17 16:40:37 2017 -0400 Link projects to Tor Browser build directory --- projects/binutils | 1 + projects/binutils/build | 22 --- projects/binutils/config | 28 ---- projects/binutils/enable-reloc-section-ld.patch | 212 ------------------------ projects/binutils/specify-timestamp.patch | 123 -------------- projects/docker-image/build | 4 - projects/docker-image/config | 49 ------ projects/gcc | 1 + projects/gcc/build | 14 -- projects/gcc/config | 27 --- projects/mingw-w64 | 1 + projects/mingw-w64/build | 63 ------- projects/mingw-w64/config | 24 --- 13 files changed, 3 insertions(+), 566 deletions(-) diff --git a/projects/binutils b/projects/binutils new file mode 120000 index 0000000..a67ce46 --- /dev/null +++ b/projects/binutils @@ -0,0 +1 @@ +../tor-browser-build/projects/binutils \ No newline at end of file diff --git a/projects/binutils/build b/projects/binutils/build deleted file mode 100644 index 3531e89..0000000 --- a/projects/binutils/build +++ /dev/null @@ -1,22 +0,0 @@ -#!/bin/sh -set -e -distdir=/var/tmp/dist/binutils -tar xf [% project %]-[% c("version") %].tar.bz2 -cd [% project %]-[% c("version") %] -[% IF c('var/windows') -%] -# XXX: This is needed due to bug 10102. -sed 's/= extern_rt_rel_d;/= extern_rt_rel_d;\n memset (extern_rt_rel_d, 0, PE_IDATA5_SIZE);/' -i ld/pe-dll.c -# Needed for the hardening... -patch -p1 < ../enable-reloc-section-ld.patch -# specify-timestamp patch from Stephen Kitt <steve(a)sk2.org> -# https://anonscm.debian.org/cgit/collab-maint/binutils-mingw-w64.git/ -patch -p2 < ../specify-timestamp.patch -[% END -%] -./configure --prefix=$distdir [% c('var/configure_opt') %] -make -j4 -make install -cd /var/tmp/dist -[% c('tar', { - tar_src => [ project ], - tar_args => '-czf ' _ dest_dir _ '/' _ c('filename'), - }) %] diff --git a/projects/binutils/config b/projects/binutils/config deleted file mode 100644 index 019a6e3..0000000 --- a/projects/binutils/config +++ /dev/null @@ -1,28 +0,0 @@ -# vim: filetype=yaml sw=2 -version: 2.25 -filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' -remote_docker: 1 -var: - deps: - - build-essential - - bison - configure_opt: '--disable-multilib --enable-gold --enable-deterministic-archives' - -targets: - windows-i686: - var: - configure_opt: '--target=i686-w64-mingw32 --disable-multilib --enable-deterministic-archives' - -input_files: - - URL: https://ftp.gnu.org/gnu/binutils/binutils-[% c("version") %].tar.bz2 - sig_ext: sig - file_gpg_id: 1 - gpg_keyring: binutils.gpg - - project: docker-image - - filename: enable-reloc-section-ld.patch - enable: '[% c("var/windows") %]' - - # specify-timestamp patch from Stephen Kitt <steve(a)sk2.org> - # https://anonscm.debian.org/cgit/collab-maint/binutils-mingw-w64.git/ - - filename: specify-timestamp.patch - enable: '[% c("var/windows") %]' diff --git a/projects/binutils/enable-reloc-section-ld.patch b/projects/binutils/enable-reloc-section-ld.patch deleted file mode 100644 index 15ab4d8..0000000 --- a/projects/binutils/enable-reloc-section-ld.patch +++ /dev/null @@ -1,212 +0,0 @@ -From 6ef8bae3d2a4f4704c4a32f786c9574db3e70f25 Mon Sep 17 00:00:00 2001 -From: Erinn Clark <erinn(a)torproject.org> -Date: Fri, 8 Aug 2014 14:23:44 -0400 -Subject: [PATCH] add relocation section so Windows bundles can have ASLR - -Patch by skruffy. ---- - ld/emultempl/pe.em | 6 +++++ - ld/emultempl/pep.em | 8 ++++++- - ld/pe-dll.c | 63 ++++++++++++++++++++++++++++++----------------------- - ld/pe-dll.h | 1 + - 4 files changed, 50 insertions(+), 28 deletions(-) - -diff --git a/ld/emultempl/pe.em b/ld/emultempl/pe.em -index 979cc8b8e960..4a63863289c8 100644 ---- a/ld/emultempl/pe.em -+++ b/ld/emultempl/pe.em -@@ -274,6 +274,7 @@ fragment <<EOF - #define OPTION_INSERT_TIMESTAMP (OPTION_TERMINAL_SERVER_AWARE + 1) - #define OPTION_NO_INSERT_TIMESTAMP (OPTION_INSERT_TIMESTAMP + 1) - #define OPTION_BUILD_ID (OPTION_NO_INSERT_TIMESTAMP + 1) -+#define OPTION_ENABLE_RELOC_SECTION (OPTION_BUILD_ID + 1) - - static void - gld${EMULATION_NAME}_add_options -@@ -317,6 +318,7 @@ gld${EMULATION_NAME}_add_options - {"export-all-symbols", no_argument, NULL, OPTION_EXPORT_ALL}, - {"exclude-symbols", required_argument, NULL, OPTION_EXCLUDE_SYMBOLS}, - {"exclude-all-symbols", no_argument, NULL, OPTION_EXCLUDE_ALL_SYMBOLS}, -+ {"enable-reloc-section", no_argument, NULL, OPTION_ENABLE_RELOC_SECTION}, - {"exclude-libs", required_argument, NULL, OPTION_EXCLUDE_LIBS}, - {"exclude-modules-for-implib", required_argument, NULL, OPTION_EXCLUDE_MODULES_FOR_IMPLIB}, - {"kill-at", no_argument, NULL, OPTION_KILL_ATS}, -@@ -787,6 +789,9 @@ gld${EMULATION_NAME}_handle_option (int optc) - case OPTION_EXCLUDE_ALL_SYMBOLS: - pe_dll_exclude_all_symbols = 1; - break; -+ case OPTION_ENABLE_RELOC_SECTION: -+ pe_dll_enable_reloc_section = 1; -+ break; - case OPTION_EXCLUDE_LIBS: - pe_dll_add_excludes (optarg, EXCLUDELIBS); - break; -@@ -2059,6 +2064,7 @@ gld_${EMULATION_NAME}_finish (void) - if (link_info.shared - #if !defined(TARGET_IS_shpe) - || (!link_info.relocatable && pe_def_file->num_exports != 0) -+ || (!link_info.relocatable && pe_dll_enable_reloc_section) - #endif - ) - { -diff --git a/ld/emultempl/pep.em b/ld/emultempl/pep.em -index b24a60820237..caf294663a80 100644 ---- a/ld/emultempl/pep.em -+++ b/ld/emultempl/pep.em -@@ -248,7 +248,8 @@ enum options - OPTION_INSERT_TIMESTAMP, - OPTION_NO_INSERT_TIMESTAMP, - OPTION_TERMINAL_SERVER_AWARE, -- OPTION_BUILD_ID -+ OPTION_BUILD_ID, -+ OPTION_ENABLE_RELOC_SECTION - }; - - static void -@@ -290,6 +291,7 @@ gld${EMULATION_NAME}_add_options - {"export-all-symbols", no_argument, NULL, OPTION_EXPORT_ALL}, - {"exclude-symbols", required_argument, NULL, OPTION_EXCLUDE_SYMBOLS}, - {"exclude-all-symbols", no_argument, NULL, OPTION_EXCLUDE_ALL_SYMBOLS}, -+ {"enable-reloc-section", no_argument, NULL, OPTION_ENABLE_RELOC_SECTION}, - {"exclude-libs", required_argument, NULL, OPTION_EXCLUDE_LIBS}, - {"exclude-modules-for-implib", required_argument, NULL, OPTION_EXCLUDE_MODULES_FOR_IMPLIB}, - {"kill-at", no_argument, NULL, OPTION_KILL_ATS}, -@@ -743,6 +745,9 @@ gld${EMULATION_NAME}_handle_option (int optc) - case OPTION_EXCLUDE_ALL_SYMBOLS: - pep_dll_exclude_all_symbols = 1; - break; -+ case OPTION_ENABLE_RELOC_SECTION: -+ pe_dll_enable_reloc_section = 1; -+ break; - case OPTION_EXCLUDE_LIBS: - pep_dll_add_excludes (optarg, EXCLUDELIBS); - break; -@@ -1838,6 +1843,7 @@ gld_${EMULATION_NAME}_finish (void) - - #ifdef DLL_SUPPORT - if (link_info.shared -+ || (!link_info.relocatable && pe_dll_enable_reloc_section) - || (!link_info.relocatable && pep_def_file->num_exports != 0)) - { - pep_dll_fill_sections (link_info.output_bfd, &link_info); -diff --git a/ld/pe-dll.c b/ld/pe-dll.c -index 61d8fa5c7eea..24c0c72a6685 100644 ---- a/ld/pe-dll.c -+++ b/ld/pe-dll.c -@@ -151,6 +151,7 @@ def_file * pe_def_file = 0; - int pe_dll_export_everything = 0; - int pe_dll_exclude_all_symbols = 0; - int pe_dll_do_default_excludes = 1; -+int pe_dll_enable_reloc_section = 0; - int pe_dll_kill_ats = 0; - int pe_dll_stdcall_aliases = 0; - int pe_dll_warn_dup_exports = 0; -@@ -3370,8 +3371,15 @@ pe_dll_build_sections (bfd *abfd, struct bfd_link_info *info) - process_def_file_and_drectve (abfd, info); - - if (pe_def_file->num_exports == 0 && !info->shared) -- return; -- -+ { -+ if (pe_dll_enable_reloc_section) -+ { -+ build_filler_bfd (0); -+ pe_output_file_set_long_section_names (filler_bfd); -+ } -+ return; -+ } -+ - generate_edata (abfd, info); - build_filler_bfd (1); - pe_output_file_set_long_section_names (filler_bfd); -@@ -3386,13 +3394,9 @@ pe_exe_build_sections (bfd *abfd, struct bfd_link_info *info ATTRIBUTE_UNUSED) - pe_output_file_set_long_section_names (filler_bfd); - } - --void --pe_dll_fill_sections (bfd *abfd, struct bfd_link_info *info) -+static void -+pe_dll_create_reloc (bfd *abfd, struct bfd_link_info *info) - { -- pe_dll_id_target (bfd_get_target (abfd)); -- pe_output_file_set_long_section_names (abfd); -- image_base = pe_data (abfd)->pe_opthdr.ImageBase; -- - generate_reloc (abfd, info); - if (reloc_sz > 0) - { -@@ -3409,38 +3413,43 @@ pe_dll_fill_sections (bfd *abfd, struct bfd_link_info *info) - lang_do_assignments (lang_final_phase_enum); - } - -- fill_edata (abfd, info); -- -- if (info->shared && !info->pie) -- pe_data (abfd)->dll = 1; -- -- edata_s->contents = edata_d; - reloc_s->contents = reloc_d; - } - - void --pe_exe_fill_sections (bfd *abfd, struct bfd_link_info *info) -+pe_dll_fill_sections (bfd *abfd, struct bfd_link_info *info) - { -+ if (!reloc_s && !edata_s) -+ return; - pe_dll_id_target (bfd_get_target (abfd)); - pe_output_file_set_long_section_names (abfd); - image_base = pe_data (abfd)->pe_opthdr.ImageBase; - -- generate_reloc (abfd, info); -- if (reloc_sz > 0) -+ if (reloc_s) -+ pe_dll_create_reloc (abfd, info); -+ -+ if (edata_s) - { -- bfd_set_section_size (filler_bfd, reloc_s, reloc_sz); -+ fill_edata (abfd, info); -+ edata_s->contents = edata_d; -+ } - -- /* Resize the sections. */ -- lang_reset_memory_regions (); -- lang_size_sections (NULL, TRUE); -+ if (info->shared && !info->pie) -+ pe_data (abfd)->dll = 1; - -- /* Redo special stuff. */ -- ldemul_after_allocation (); - -- /* Do the assignments again. */ -- lang_do_assignments (lang_final_phase_enum); -- } -- reloc_s->contents = reloc_d; -+} -+ -+void -+pe_exe_fill_sections (bfd *abfd, struct bfd_link_info *info) -+{ -+ if (!reloc_s) -+ return; -+ pe_dll_id_target (bfd_get_target (abfd)); -+ pe_output_file_set_long_section_names (abfd); -+ image_base = pe_data (abfd)->pe_opthdr.ImageBase; -+ -+ pe_dll_create_reloc (abfd, info); - } - - bfd_boolean -diff --git a/ld/pe-dll.h b/ld/pe-dll.h -index 24ea30237aeb..6a0d6338646b 100644 ---- a/ld/pe-dll.h -+++ b/ld/pe-dll.h -@@ -30,6 +30,7 @@ extern def_file *pe_def_file; - extern int pe_dll_export_everything; - extern int pe_dll_exclude_all_symbols; - extern int pe_dll_do_default_excludes; -+extern int pe_dll_enable_reloc_section; - extern int pe_dll_kill_ats; - extern int pe_dll_stdcall_aliases; - extern int pe_dll_warn_dup_exports; diff --git a/projects/binutils/specify-timestamp.patch b/projects/binutils/specify-timestamp.patch deleted file mode 100644 index 37f4347..0000000 --- a/projects/binutils/specify-timestamp.patch +++ /dev/null @@ -1,123 +0,0 @@ ---- a/upstream/bfd/peXXigen.c -+++ b/upstream/bfd/peXXigen.c -@@ -66,6 +66,9 @@ - #include <wchar.h> - #endif - -+#include <errno.h> -+#include <limits.h> -+ - /* NOTE: it's strange to be including an architecture specific header - in what's supposed to be general (to PE/PEI) code. However, that's - where the definitions are, and they don't vary per architecture -@@ -873,8 +876,36 @@ - H_PUT_16 (abfd, filehdr_in->f_nscns, filehdr_out->f_nscns); - - /* Only use a real timestamp if the option was chosen. */ -- if ((pe_data (abfd)->insert_timestamp)) -- H_PUT_32 (abfd, time (0), filehdr_out->f_timdat); -+ if (pe_data (abfd)->insert_timestamp) { -+ time_t now; -+ char *source_date_epoch; -+ unsigned long long epoch; -+ char *endptr; -+ -+ now = time(NULL); -+ source_date_epoch = getenv("SOURCE_DATE_EPOCH"); -+ if (source_date_epoch) { -+ errno = 0; -+ epoch = strtoull(source_date_epoch, &endptr, 10); -+ if ((errno == ERANGE && (epoch == ULLONG_MAX || epoch == 0)) -+ || (errno != 0 && epoch == 0)) { -+ _bfd_error_handler("Environment variable $SOURCE_DATE_EPOCH: strtoull: %s\n", -+ strerror(errno)); -+ } else if (endptr == source_date_epoch) { -+ _bfd_error_handler("Environment variable $SOURCE_DATE_EPOCH: No digits were found: %s\n", -+ endptr); -+ } else if (*endptr != '\0') { -+ _bfd_error_handler("Environment variable $SOURCE_DATE_EPOCH: Trailing garbage: %s\n", -+ endptr); -+ } else if (epoch > ULONG_MAX) { -+ _bfd_error_handler("Environment variable $SOURCE_DATE_EPOCH: value must be smaller than or equal to: %lu but was found to be: %llu\n", -+ ULONG_MAX, epoch); -+ } else { -+ now = epoch; -+ } -+ } -+ H_PUT_32 (abfd, now, filehdr_out->f_timdat); -+ } - - PUT_FILEHDR_SYMPTR (abfd, filehdr_in->f_symptr, - filehdr_out->f_symptr); ---- a/upstream/ld/pe-dll.c -+++ b/upstream/ld/pe-dll.c -@@ -26,6 +26,8 @@ - #include "filenames.h" - #include "safe-ctype.h" - -+#include <errno.h> -+#include <limits.h> - #include <time.h> - - #include "ld.h" -@@ -1185,8 +1187,36 @@ - - memset (edata_d, 0, edata_sz); - -- if (pe_data (abfd)->insert_timestamp) -- H_PUT_32 (abfd, time (0), edata_d + 4); -+ if (pe_data (abfd)->insert_timestamp) { -+ time_t now; -+ char *source_date_epoch; -+ unsigned long long epoch; -+ char *endptr; -+ -+ now = time(NULL); -+ source_date_epoch = getenv("SOURCE_DATE_EPOCH"); -+ if (source_date_epoch) { -+ errno = 0; -+ epoch = strtoull(source_date_epoch, &endptr, 10); -+ if ((errno == ERANGE && (epoch == ULLONG_MAX || epoch == 0)) -+ || (errno != 0 && epoch == 0)) { -+ einfo("Environment variable $SOURCE_DATE_EPOCH: strtoull: %s\n", -+ strerror(errno)); -+ } else if (endptr == source_date_epoch) { -+ einfo("Environment variable $SOURCE_DATE_EPOCH: No digits were found: %s\n", -+ endptr); -+ } else if (*endptr != '\0') { -+ einfo("Environment variable $SOURCE_DATE_EPOCH: Trailing garbage: %s\n", -+ endptr); -+ } else if (epoch > ULONG_MAX) { -+ einfo("Environment variable $SOURCE_DATE_EPOCH: value must be smaller than or equal to: %lu but was found to be: %llu\n", -+ ULONG_MAX, epoch); -+ } else { -+ now = epoch; -+ } -+ } -+ H_PUT_32 (abfd, now, edata_d + 4); -+ } - - if (pe_def_file->version_major != -1) - { ---- a/upstream/ld/emultempl/pe.em -+++ b/upstream/ld/emultempl/pe.em -@@ -307,7 +307,7 @@ - OPTION_USE_NUL_PREFIXED_IMPORT_TABLES}, - {"no-leading-underscore", no_argument, NULL, OPTION_NO_LEADING_UNDERSCORE}, - {"leading-underscore", no_argument, NULL, OPTION_LEADING_UNDERSCORE}, -- {"insert-timestamp", no_argument, NULL, OPTION_INSERT_TIMESTAMP}, -+ {"insert-timestamp", optional_argument, NULL, OPTION_INSERT_TIMESTAMP}, - {"no-insert-timestamp", no_argument, NULL, OPTION_NO_INSERT_TIMESTAMP}, - #ifdef DLL_SUPPORT - /* getopt allows abbreviations, so we do this to stop it ---- a/upstream/ld/emultempl/pep.em -+++ b/upstream/ld/emultempl/pep.em -@@ -324,7 +324,7 @@ - {"no-bind", no_argument, NULL, OPTION_NO_BIND}, - {"wdmdriver", no_argument, NULL, OPTION_WDM_DRIVER}, - {"tsaware", no_argument, NULL, OPTION_TERMINAL_SERVER_AWARE}, -- {"insert-timestamp", no_argument, NULL, OPTION_INSERT_TIMESTAMP}, -+ {"insert-timestamp", optional_argument, NULL, OPTION_INSERT_TIMESTAMP}, - {"no-insert-timestamp", no_argument, NULL, OPTION_NO_INSERT_TIMESTAMP}, - {"build-id", optional_argument, NULL, OPTION_BUILD_ID}, - {NULL, no_argument, NULL, 0} diff --git a/projects/docker-image/build b/projects/docker-image/build deleted file mode 100644 index ced6ad3..0000000 --- a/projects/docker-image/build +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh -set -e -echo 1 > [% dest_dir %]/[% c('filename') %] -echo Creating [% dest_dir %]/[% c('filename') %] diff --git a/projects/docker-image/config b/projects/docker-image/config deleted file mode 100644 index 8ab70f5..0000000 --- a/projects/docker-image/config +++ /dev/null @@ -1,49 +0,0 @@ -# vim: filetype=yaml sw=2 -filename: '[% sha256(c("pre")).substr(0, 12) %]' -remote_docker: 1 -docker_image_prefix: 'tor-messenger_[% GET ENV.RBM_BUILDNAME ? ENV.RBM_BUILDNAME : ENV.USER ? ENV.USER : c("uid") %]' -docker_save_image: '[% c("docker_image_prefix") %]:[% c("filename") %]' -pkg_type: build - -docker_image: '[% c("lsb_release/id").lower %]:[% c("lsb_release/release") %]' - -lsb_release: - id: '[% pc(c("origin_project", { no_distro => 1 }), "lsb_release/id", { no_distro => 1 }) %]' - release: '[% pc(c("origin_project", { no_distro => 1 }), "lsb_release/release", { no_distro => 1 }) %]' - codename: '[% pc(c("origin_project", { no_distro => 1 }), "lsb_release/codename", { no_distro => 1 }) %]' - -pre: | - #!/bin/sh - # [% c('docker_image') %] - set -e - [% IF c('lsb_release/release') == '14.10' -%] - sed -i 's/archive\.ubuntu\.com/old-releases.ubuntu.com/' /etc/apt/sources.list - [% END -%] - [% IF pc(c('origin_project'), 'var/pre_pkginst') -%] - [% pc(c('origin_project'), 'var/pre_pkginst') %] - [% END -%] - [% IF c('lsb_release/id') == 'Ubuntu' || c('lsb_release/id') == 'Debian' %] - apt-get update -y - apt-get upgrade -y - [% END %] - [% - deps = []; - IF pc(c('origin_project'), 'var/deps'); - CALL deps.import(pc(c('origin_project'), 'var/deps').sort); - END; - IF pc(c('origin_project'), 'var/arch_deps'); - CALL deps.import(pc(c('origin_project'), 'var/arch_deps').sort); - END; - IF deps.size; - FOREACH pkg IN deps; - SET p = tmpl(pkg); - IF p; - GET c('install_package', { pkg_name => p }); - GET "\n"; - END; - END; - END; - -%] - [% IF pc(c('origin_project'), 'var/post_pkginst') -%] - [% pc(c('origin_project'), 'var/post_pkginst') %] - [% END -%] diff --git a/projects/gcc b/projects/gcc new file mode 120000 index 0000000..bfdb448 --- /dev/null +++ b/projects/gcc @@ -0,0 +1 @@ +../tor-browser-build/projects/gcc \ No newline at end of file diff --git a/projects/gcc/build b/projects/gcc/build deleted file mode 100644 index 03cfcbd..0000000 --- a/projects/gcc/build +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/sh -set -e -distdir=/var/tmp/dist/[% project %] -mkdir /var/tmp/build -tar -C /var/tmp/build -xf [% project %]-[% c("version") %].tar.bz2 -cd /var/tmp/build/[% project %]-[% c("version") %] -./configure --prefix=$distdir [% c("var/configure_opt") %] -make -j4 -make install -cd /var/tmp/dist -[% c('tar', { - tar_src => [ project ], - tar_args => '-czf ' _ dest_dir _ '/' _ c('filename'), - }) %] diff --git a/projects/gcc/config b/projects/gcc/config deleted file mode 100644 index c1e5fe1..0000000 --- a/projects/gcc/config +++ /dev/null @@ -1,27 +0,0 @@ -# vim: filetype=yaml sw=2 -filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' -version: 5.1.0 -remote_docker: 1 -var: - configure_opt: --enable-multilib --enable-languages=c,c++ --with-arch_32=i686 - deps: - - build-essential - - libmpc-dev - - libc6-dev-i386 - setup: | - mkdir -p /var/tmp/dist - tar -C /var/tmp/dist -xf [% c("compiler_tarfile") %] - export PATH="/var/tmp/dist/gcc/bin:$PATH" - [% IF c("var/osname") == "linux-i686" -%] - export LD_LIBRARY_PATH=/var/tmp/dist/gcc/lib32 - [% ELSE -%] - export LD_LIBRARY_PATH=/var/tmp/dist/gcc/lib64 - [% END -%] -targets: - osx-x86_64: - var: - configure_opt: --enable-multilib --enable-languages=c,c++ -input_files: - - URL: 'https://ftp.gnu.org/gnu/gcc/gcc-[% c("version") %]/gcc-[% c("version") %].tar.bz2' - sha256sum: b7dafdf89cbb0e20333dbf5b5349319ae06e3d1a30bf3515b5488f7e89dca5ad - - project: docker-image diff --git a/projects/mingw-w64 b/projects/mingw-w64 new file mode 120000 index 0000000..243c606 --- /dev/null +++ b/projects/mingw-w64 @@ -0,0 +1 @@ +../tor-browser-build/projects/mingw-w64 \ No newline at end of file diff --git a/projects/mingw-w64/build b/projects/mingw-w64/build deleted file mode 100644 index 869dea2..0000000 --- a/projects/mingw-w64/build +++ /dev/null @@ -1,63 +0,0 @@ -#!/bin/sh -set -e -rootdir=$(pwd) -distdir=/var/tmp/dist/[% project %] - -mkdir /var/tmp/build -mkdir /var/tmp/dist -cd /var/tmp/dist -tar xf $rootdir/[% c('input_files_by_name/binutils') %] -mv binutils $distdir -export PATH="$distdir/bin:$PATH" - -cd /var/tmp/build -tar xf $rootdir/[% project %]-[% c("version") %].tar.gz -mkdir -p builddir/mingw-w64/mingw-w64-headers32 -cd builddir/mingw-w64/mingw-w64-headers32 -/var/tmp/build/[% project %]-[% c("version") %]/mingw-w64-headers/configure \ - --prefix=$distdir/i686-w64-mingw32 --host=i686-w64-mingw32 \ - --enable-sdk=all --enable-secure-api --enable-idl -make install - -cd /var/tmp/build -mkdir gcc -cd gcc -tar xjf $rootdir/gcc-[% c("var/gcc_version") %].tar.bz2 -# We don't want to link against msvcrt.dll due to bug 9084. -i686-w64-mingw32-g++ -dumpspecs > $distdir/msvcr100.spec -sed 's/msvcrt/msvcr100/' -i $distdir/msvcr100.spec -# Linking libgcc against msvcrt is hard-coded... -sed 's/msvcrt/msvcr100/' -i gcc-[% c("var/gcc_version") %]/gcc/config/i386/t-mingw-w32 -# LDFLAGS_FOR_TARGET does not work for some reason. Thus, we take -# CFLAGS_FOR_TARGET. -export CFLAGS_FOR_TARGET="-specs=$distdir/msvcr100.spec -Wl,--nxcompat -Wl,--dynamicbase" -gcc-[% c("var/gcc_version") %]/configure --prefix=$distdir --target=i686-w64-mingw32 --disable-multilib --enable-languages=c,c++ -make -j4 all-gcc -make install-gcc - -mkdir -p /var/tmp/build/builddir/mingw-w64/mingw-w64-crt32 -cd /var/tmp/build/builddir/mingw-w64/mingw-w64-crt32 -/var/tmp/build/[% project %]-[% c("version") %]/mingw-w64-crt/configure \ - --host=i686-w64-mingw32 --prefix=$distdir/i686-w64-mingw32 -make -j4 -make install - -mkdir -p /var/tmp/build/builddir/mingw-w64/widl32 -cd /var/tmp/build/builddir/mingw-w64/widl32 -/var/tmp/build/[% project %]-[% c("version") %]/mingw-w64-tools/widl/configure \ - --prefix=$distdir --target=i686-w64-mingw32 -make -j4 -make install - -cd /var/tmp/build/gcc -make -j4 -make install -mkdir -p $distdir/gcclibs -cp i686-w64-mingw32/libssp/.libs/libssp-0.dll $distdir/gcclibs -cp i686-w64-mingw32/libgcc/shlib/libgcc_s_sjlj-1.dll $distdir/gcclibs - -cd /var/tmp/dist -[% c('tar', { - tar_src => [ project ], - tar_args => '-czf ' _ dest_dir _ '/' _ c('filename'), - }) %] diff --git a/projects/mingw-w64/config b/projects/mingw-w64/config deleted file mode 100644 index 5b260e2..0000000 --- a/projects/mingw-w64/config +++ /dev/null @@ -1,24 +0,0 @@ -# vim: filetype=yaml sw=2 -filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' -git_url: http://git.code.sf.net/p/mingw-w64/mingw-w64 -git_hash: 3deeda3a1db3dee8a8b6231be5b44f47d79ce1d7 -version: '[% c("abbrev") %]' -remote_docker: 1 -var: - gcc_version: 5.1.0 - deps: - - automake - - build-essential - - libmpc-dev - - g++-mingw-w64-i686 - setup: | - mkdir -p /var/tmp/dist - tar -C /var/tmp/dist -xf [% c("compiler_tarfile") %] - export PATH="/var/tmp/dist/mingw-w64/bin:$PATH" - gcclibs=/var/tmp/dist/mingw-w64/gcclibs -input_files: - - URL: 'https://ftp.gnu.org/gnu/gcc/gcc-[% c("var/gcc_version") %]/gcc-[% c("var/gcc_version") %].tar.bz2' - sha256sum: b7dafdf89cbb0e20333dbf5b5349319ae06e3d1a30bf3515b5488f7e89dca5ad - - name: binutils - project: binutils - - project: docker-image

1 0

[tor-messenger-build/master] Update mozconfig for OS X build
by sukhbir＠torproject.org 31 Jul '17

31 Jul '17

commit 343b3f8bf9f6407bdb5f98e246af25038251cc78 Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Thu Jul 20 16:30:28 2017 -0400 Update mozconfig for OS X build --- projects/instantbird/mozconfig-osx-x86_64 | 37 ++++++++++++++++++++++++------- 1 file changed, 29 insertions(+), 8 deletions(-) diff --git a/projects/instantbird/mozconfig-osx-x86_64 b/projects/instantbird/mozconfig-osx-x86_64 index d9c8364..21154f5 100644 --- a/projects/instantbird/mozconfig-osx-x86_64 +++ b/projects/instantbird/mozconfig-osx-x86_64 @@ -1,13 +1,34 @@ -export CROSS_COMPILE=1 +# ld needs libLTO.so from llvm +mk_add_options "export LD_LIBRARY_PATH=/var/tmp/dist/macosx-toolchain/clang/lib" -TOOLCHAIN_PREFIX="$ccbindir/x86_64-apple-darwin10-" -CROSS_PRIVATE_FRAMEWORKS="$sysrootdir/System/Library/PrivateFrameworks" +TOOLCHAIN_DIR=/var/tmp/dist/macosx-toolchain +CROSS_CCTOOLS_PATH=$TOOLCHAIN_DIR/cctools +CROSS_SYSROOT=$TOOLCHAIN_DIR/SDK +CROSS_PRIVATE_FRAMEWORKS=$CROSS_SYSROOT/System/Library/PrivateFrameworks +FLAGS="-target x86_64-apple-darwin10 -mlinker-version=136 -B $CROSS_CCTOOLS_PATH/bin -isysroot $CROSS_SYSROOT" -FLAGS="-arch x86_64 -isysroot $sysrootdir" -CC="$ccbindir/x86_64-apple-darwin10-clang $FLAGS" -CXX="$ccbindir/x86_64-apple-darwin10-clang++ $FLAGS" +export CC="$TOOLCHAIN_DIR/clang/bin/clang $FLAGS" +export CXX="$TOOLCHAIN_DIR/clang/bin/clang++ $FLAGS" +export CPP="$TOOLCHAIN_DIR/clang/bin/clang $FLAGS -E" +export LLVMCONFIG=$TOOLCHAIN_DIR/clang/bin/llvm-config +export LDFLAGS="-Wl,-syslibroot,$CROSS_SYSROOT -Wl,-dead_strip -Wl,-pie" +export TOOLCHAIN_PREFIX=$CROSS_CCTOOLS_PATH/bin/x86_64-apple-darwin10- +#TODO: bug 1184202 - would be nice if these could be detected with TOOLCHAIN_PREFIX automatically +export AR=${TOOLCHAIN_PREFIX}ar +export RANLIB=${TOOLCHAIN_PREFIX}ranlib +export STRIP=${TOOLCHAIN_PREFIX}strip +export OTOOL=${TOOLCHAIN_PREFIX}otool +export DSYMUTIL="$TOOLCHAIN_DIR/clang/bin/llvm-dsymutil" + +export HOST_CC="$TOOLCHAIN_DIR/clang/bin/clang" +export HOST_CXX="$TOOLCHAIN_DIR/clang/bin/clang++" +export HOST_CPP="$TOOLCHAIN_DIR/clang/bin/clang -E" +export HOST_CFLAGS="-g" +export HOST_CXXFLAGS="-g" +export HOST_LDFLAGS="-g" + +ac_add_options --target=x86_64-apple-darwin +ac_add_options --with-macos-private-frameworks=$CROSS_PRIVATE_FRAMEWORKS -ac_add_options --target=x86_64-apple-darwin10 -ac_add_options --with-macos-private-frameworks="$CROSS_PRIVATE_FRAMEWORKS" ac_add_options --enable-tor-browser-data-outside-app-dir ac_add_options --enable-strip

1 0

[tor-messenger-build/master] debootstrap-image as well...
by sukhbir＠torproject.org 31 Jul '17

31 Jul '17

commit ee4e3ac7060b183d7f80617306a99e38ba0763ef Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Mon Jul 17 16:44:05 2017 -0400 debootstrap-image as well... --- projects/debootstrap-image | 1 + 1 file changed, 1 insertion(+) diff --git a/projects/debootstrap-image b/projects/debootstrap-image new file mode 120000 index 0000000..3aa5dfe --- /dev/null +++ b/projects/debootstrap-image @@ -0,0 +1 @@ +../tor-browser-build/projects/debootstrap-image \ No newline at end of file

1 0

[tor-messenger-build/master] The Debian package is genisoimage and not mkisofs
by sukhbir＠torproject.org 31 Jul '17

31 Jul '17

commit 00917f1621f2fc0665d250fcfc93fa0aef528453 Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Mon Jul 24 10:29:09 2017 -0400 The Debian package is genisoimage and not mkisofs --- projects/tor-messenger/build.osx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/tor-messenger/build.osx b/projects/tor-messenger/build.osx index 06ad562..5764809 100755 --- a/projects/tor-messenger/build.osx +++ b/projects/tor-messenger/build.osx @@ -72,7 +72,7 @@ find . ! -executable -exec chmod 644 {} \; find . -type f | sed -e 's/^\.\///' | sort | xargs -i echo "{}={}" > ../filelist.txt find . -type l | sed -e 's/^\.\///' | sort | xargs -i echo "{}={}" >> ../filelist.txt -mkisofs -D -V "Tor Messenger" -no-pad -R -apple -o ../TorMessenger-uncompressed.dmg -path-list ../filelist.txt -graft-points -gid 20 -dir-mode 0755 -new-dir-mode 0755 +genisoimage -D -V "Tor Messenger" -no-pad -R -apple -o ../TorMessenger-uncompressed.dmg -path-list ../filelist.txt -graft-points -gid 20 -dir-mode 0755 -new-dir-mode 0755 cd .. OUTDIR='[% dest_dir _ "/" _ c("filename") %]' mkdir -p $OUTDIR

1 0

[tor-messenger-build/master] Remove redundant package from Linux 32bit builds
by sukhbir＠torproject.org 31 Jul '17

31 Jul '17

commit 16395cbd141f6d517227151c8d904446ff72b112 Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Wed Jul 19 17:03:02 2017 -0400 Remove redundant package from Linux 32bit builds --- projects/libgcrypt/config | 4 ---- projects/libgpg-error/config | 4 ---- projects/libotr/config | 4 ---- 3 files changed, 12 deletions(-) diff --git a/projects/libgcrypt/config b/projects/libgcrypt/config index 0a7208d..d9f08fe 100644 --- a/projects/libgcrypt/config +++ b/projects/libgcrypt/config @@ -13,10 +13,6 @@ targets: var: arch_deps: - gettext - linux-i686: - var: - arch_deps: - - libc6-dev-i386 input_files: - URL: 'ftp://ftp.gnupg.org/gcrypt/libgcrypt/libgcrypt-[% c("version") %].tar.bz2' sig_ext: sig diff --git a/projects/libgpg-error/config b/projects/libgpg-error/config index c667ca6..bd00a4f 100644 --- a/projects/libgpg-error/config +++ b/projects/libgpg-error/config @@ -13,10 +13,6 @@ targets: var: arch_deps: - gettext - linux-i686: - var: - arch_deps: - - libc6-dev-i386 input_files: - URL: 'ftp://ftp.gnupg.org/gcrypt/libgpg-error/libgpg-error-[% c("version") %].tar.bz2' sig_ext: sig diff --git a/projects/libotr/config b/projects/libotr/config index a915aa8..14a8ea4 100644 --- a/projects/libotr/config +++ b/projects/libotr/config @@ -17,10 +17,6 @@ targets: configure_opt: '--host=i686-w64-mingw32 CFLAGS="[% c("var/CFLAGS_otr") %]" LDFLAGS="[% c("var/LDFLAGS_otr") %]" CC="i686-w64-mingw32-gcc -static-libgcc"' CFLAGS_otr: '[% c("var/CFLAGS") %] -Wl,-Bstatic,-L/var/tmp/dist/libgcrypt/lib,-lgcrypt,-L/var/tmp/dist/libgpg-error/lib,-lgpg-error,-Bdynamic' LDFLAGS_otr: '[% c("var/LDFLAGS") %] -Wl,-Bstatic,-L/var/tmp/dist/libgcrypt/lib,-lgcrypt,-L/var/tmp/dist/libgpg-error/lib,-lgpg-error,-Bdynamic' - linux-i686: - var: - arch_deps: - - libc6-dev-i386 input_files: - filename: 'libotr-[% c("version") %].tar.gz' URL: 'https://otr.cypherpunks.ca/libotr-[% c("version") %].tar.gz'

1 0

[tor-messenger-build/master] Update tor-messenger/build
by sukhbir＠torproject.org 31 Jul '17

31 Jul '17

commit 13b55587b3e16f514b635318501faeed78b859cc Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Mon Jul 24 15:54:11 2017 -0400 Update tor-messenger/build Since we are using i386 containers to build Tor Messenger 32bit, update the library path. --- projects/tor-messenger/build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/tor-messenger/build b/projects/tor-messenger/build index 817af38..422da29 100755 --- a/projects/tor-messenger/build +++ b/projects/tor-messenger/build @@ -46,7 +46,7 @@ mv start-tor-messenger bundle/Browser/ mv execdesktop bundle/Browser/ mkdir -p bundle/Browser/lib -cp -L gcc/lib[% c('arch') == 'x86_64' ? '64' : '32' %]/libstdc++.so.6 bundle/Browser/lib/ +cp -L gcc/lib/libstdc++.so.6 bundle/Browser/lib/ [% END %] cp cert_override.txt bundle/Browser/TorBrowser/Data/Browser/profile.default/

1 0