[tor-commits] [tor-messenger-build/master] Use /var/tmp rather than /tmp

boklm at torproject.org boklm at torproject.org
Fri Jun 12 15:49:21 UTC 2015 

commit 1a81812ebd654ba95a92fad39aed290e7cde5b59
Author: Nicolas Vigier <boklm at torproject.org>
Date:   Fri Jun 12 14:19:47 2015 +0200

    Use /var/tmp rather than /tmp
---
 projects/binutils/build     |    4 ++--
 projects/gcc/build          |    4 ++--
 projects/gcc/config         |   10 +++++-----
 projects/instantbird/build  |   14 +++++++-------
 projects/libgcrypt/build    |   10 +++++-----
 projects/libgpg-error/build |    4 ++--
 projects/libotr/build       |   12 ++++++------
 projects/libotr/config      |    4 ++--
 projects/mingw-w64/build    |    8 ++++----
 projects/mingw-w64/config   |    8 ++++----
 projects/python/build       |    4 ++--
 rbm.conf                    |    4 ++--
 12 files changed, 43 insertions(+), 43 deletions(-)

diff --git a/projects/binutils/build b/projects/binutils/build
index d4b9969..765c4c9 100644
--- a/projects/binutils/build
+++ b/projects/binutils/build
@@ -1,6 +1,6 @@
 #!/bin/sh
 set -e
-distdir=/tmp/dist/binutils
+distdir=/var/tmp/dist/binutils
 tar xf [% project %]-[% c("version") %].tar.bz2
 cd [% project %]-[% c("version") %]
 [% IF c('var/windows') -%]
@@ -14,7 +14,7 @@ patch -p1 < ../peXXigen.patch
 ./configure --prefix=$distdir [% c('var/configure_opt') %]
 make -j4
 make install
-cd /tmp/dist
+cd /var/tmp/dist
 [% c('tar', {
         tar_src => [ project ],
         tar_args => '-czf ' _ dest_dir _ '/' _ c('filename'),
diff --git a/projects/gcc/build b/projects/gcc/build
index 5b2e687..82ed5f1 100644
--- a/projects/gcc/build
+++ b/projects/gcc/build
@@ -1,13 +1,13 @@
 #!/bin/sh
 set -e
-distdir=/tmp/dist/[% project %]
+distdir=/var/tmp/dist/[% project %]
 tar xf [% project %]-[% c("version") %].tar.bz2
 cd [% project %]-[% c("version") %]
 ./configure --prefix=$distdir --enable-multilib --enable-languages=c,c++ \
             --with-arch_32=i686
 make -j4
 make install
-cd /tmp/dist
+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
index 4de95f0..81cf982 100644
--- a/projects/gcc/config
+++ b/projects/gcc/config
@@ -12,13 +12,13 @@ var:
     - libmpc-dev
     - libc6-dev-i386
   setup: |
-    mkdir -p /tmp/dist
-    tar -C /tmp/dist -xf [% c("compiler_tarfile") %]
-    export PATH="/tmp/dist/gcc/bin:$PATH"
+    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=/tmp/dist/gcc/lib32
+    export LD_LIBRARY_PATH=/var/tmp/dist/gcc/lib32
     [% ELSE -%]
-    export LD_LIBRARY_PATH=/tmp/dist/gcc/lib64
+    export LD_LIBRARY_PATH=/var/tmp/dist/gcc/lib64
     [% END -%]
 input_files:
   - URL: 'https://ftp.gnu.org/gnu/gcc/gcc-[% c("version") %]/gcc-[% c("version") %].tar.bz2'
diff --git a/projects/instantbird/build b/projects/instantbird/build
index d8b0aa2..22232cc 100644
--- a/projects/instantbird/build
+++ b/projects/instantbird/build
@@ -4,13 +4,13 @@ rootdir=$(pwd)
 export SHELL=/bin/sh
 export HOME=$rootdir
 [% pc(c('var/compiler'), 'var/setup', { compiler_tarfile => c('input_files_by_name/' _ c('var/compiler')) }) %]
-mkdir -p /tmp/dist
-cd /tmp/dist
+mkdir -p /var/tmp/dist
+cd /var/tmp/dist
 [% IF c("var/linux") -%]
 tar xf $rootdir/[% c('input_files_by_name/python') %]
-export PATH="/tmp/dist/python/bin:$PATH"
+export PATH="/var/tmp/dist/python/bin:$PATH"
 tar xf $rootdir/[% c('input_files_by_name/binutils') %]
-export PATH="/tmp/dist/binutils/bin:$PATH"
+export PATH="/var/tmp/dist/binutils/bin:$PATH"
 [% END -%]
 # LD_BIND_NOW needed to avoid this error:
 # undefined symbol: _ZNSt14error_categoryD2Ev
@@ -21,9 +21,9 @@ export CFLAGS=-m32
 export CC='gcc -m32'
 [% END -%]
 [% IF c("var/linux") -%]
-mkdir -p /tmp/dist/yasm/bin
-ln -s /usr/bin/yasm-1 /tmp/dist/yasm/bin/yasm
-export PATH="/tmp/dist/yasm/bin:$PATH"
+mkdir -p /var/tmp/dist/yasm/bin
+ln -s /usr/bin/yasm-1 /var/tmp/dist/yasm/bin/yasm
+export PATH="/var/tmp/dist/yasm/bin:$PATH"
 [% END -%]
 cd $rootdir
 tar xf [% project %]-[% c('version') %].tar.[% c('compress_tar') %]
diff --git a/projects/libgcrypt/build b/projects/libgcrypt/build
index f47bc62..f6afc0f 100644
--- a/projects/libgcrypt/build
+++ b/projects/libgcrypt/build
@@ -2,19 +2,19 @@
 set -e
 rootdir=$(pwd)
 [% pc(c('var/compiler'), 'var/setup', { compiler_tarfile => c('input_files_by_name/' _ c('var/compiler')) }) %]
-mkdir -p /tmp/dist
-cd /tmp/dist
+mkdir -p /var/tmp/dist
+cd /var/tmp/dist
 tar xf $rootdir/[% c('input_files_by_name/libgpg-error') %]
-export PATH="/tmp/dist/libgpg-error/bin:$PATH"
+export PATH="/var/tmp/dist/libgpg-error/bin:$PATH"
 cd $rootdir
-distdir=/tmp/dist/[% project %]
+distdir=/var/tmp/dist/[% project %]
 mkdir -p $distdir
 tar xf [% project %]-[% c('version') %].tar.bz2
 cd [% project %]-[% c('version') %]
 ./configure --prefix=$distdir [% c("var/configure_opt") %][% IF c('var/windows') %] --enable-static --disable-shared[% END %]
 make -j4
 make prefix=$distdir install
-cd /tmp/dist
+cd /var/tmp/dist
 [% c('tar', {
         tar_src => [ project ],
         tar_args => '-czf ' _ dest_dir _ '/' _ c('filename'),
diff --git a/projects/libgpg-error/build b/projects/libgpg-error/build
index baf59de..de4ae5b 100644
--- a/projects/libgpg-error/build
+++ b/projects/libgpg-error/build
@@ -1,6 +1,6 @@
 #!/bin/sh
 set -e
-distdir="/tmp/dist/[% project %]"
+distdir="/var/tmp/dist/[% project %]"
 mkdir -p "$distdir"
 [% pc(c('var/compiler'), 'var/setup', { compiler_tarfile => c('input_files_by_name/' _ c('var/compiler')) }) %]
 tar xf [% project %]-[% c('version') %].tar.bz2
@@ -8,7 +8,7 @@ cd [% project %]-[% c('version') %]
 ./configure --prefix="$distdir" [% c("var/configure_opt") %][% IF c('var/windows') %] --enable-static --disable-shared[% END %]
 make -j4
 make prefix="$distdir" install
-cd /tmp/dist
+cd /var/tmp/dist
 [% c('tar', {
         tar_src => [ project ],
         tar_args => '-czf ' _ dest_dir _ '/' _ c('filename'),
diff --git a/projects/libotr/build b/projects/libotr/build
index cababa2..c0753d6 100644
--- a/projects/libotr/build
+++ b/projects/libotr/build
@@ -2,20 +2,20 @@
 set -e
 rootdir=$(pwd)
 [% pc(c('var/compiler'), 'var/setup', { compiler_tarfile => c('input_files_by_name/' _ c('var/compiler')) }) %]
-mkdir -p /tmp/dist
-cd /tmp/dist
+mkdir -p /var/tmp/dist
+cd /var/tmp/dist
 tar xf $rootdir/[% c('input_files_by_name/libgpg-error') %]
-export PATH="/tmp/dist/libgpg-error/bin:$PATH"
+export PATH="/var/tmp/dist/libgpg-error/bin:$PATH"
 tar xf $rootdir/[% c('input_files_by_name/libgcrypt') %]
-export PATH="/tmp/dist/libgcrypt/bin:$PATH"
+export PATH="/var/tmp/dist/libgcrypt/bin:$PATH"
 cd $rootdir
-distdir=/tmp/dist/[% project %]
+distdir=/var/tmp/dist/[% project %]
 tar xf libotr-[% c('version') %].tar.gz
 cd libotr-[% c('version') %]
 ./configure --prefix=$distdir [% c("var/configure_opt") %]
 make -j4 [% IF c("var/windows") %]LDFLAGS='-no-undefined -lssp'[% END %]
 make prefix=$distdir install
-cd /tmp/dist
+cd /var/tmp/dist
 [% c('tar', {
         tar_src => [ project ],
         tar_args => '-czf ' _ dest_dir _ '/' _ c('filename'),
diff --git a/projects/libotr/config b/projects/libotr/config
index bad9713..ddc3726 100644
--- a/projects/libotr/config
+++ b/projects/libotr/config
@@ -21,8 +21,8 @@ targets:
       arch_deps:
         - gettext
       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/tmp/dist/libgcrypt/lib,-lgcrypt,-L/tmp/dist/libgpg-error/lib,-lgpg-error,-Bdynamic'
-      LDFLAGS_otr: '[% c("var/LDFLAGS") %] -Wl,-Bstatic,-L/tmp/dist/libgcrypt/lib,-lgcrypt,-L/tmp/dist/libgpg-error/lib,-lgpg-error,-Bdynamic'
+      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:
diff --git a/projects/mingw-w64/build b/projects/mingw-w64/build
index 131204c..88f61c2 100644
--- a/projects/mingw-w64/build
+++ b/projects/mingw-w64/build
@@ -1,10 +1,10 @@
 #!/bin/sh
 set -e
 rootdir=$(pwd)
-distdir=/tmp/dist/[% project %]
+distdir=/var/tmp/dist/[% project %]
 
-mkdir /tmp/dist
-cd /tmp/dist
+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"
@@ -56,7 +56,7 @@ 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 /tmp/dist
+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
index c01bf8f..1d44213 100644
--- a/projects/mingw-w64/config
+++ b/projects/mingw-w64/config
@@ -16,10 +16,10 @@ var:
     - libmpc-dev
     - g++-mingw-w64-i686
   setup: |
-    mkdir -p /tmp/dist
-    tar -C /tmp/dist -xf [% c("compiler_tarfile") %]
-    export PATH="/tmp/dist/mingw-w64/bin:$PATH"
-    gcclibs=/tmp/dist/mingw-w64/gcclibs
+    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: d334781a124ada6f38e63b545e2a3b8c2183049515a1abab6d513f109f1d717e
diff --git a/projects/python/build b/projects/python/build
index 6e1711c..e27d06a 100644
--- a/projects/python/build
+++ b/projects/python/build
@@ -1,14 +1,14 @@
 #!/bin/bash
 set -e
 rootdir=$(pwd)
-distdir=/tmp/dist/python
+distdir=/var/tmp/dist/python
 mkdir -p $distdir
 tar xf [% c('input_files_by_name/python') %]
 cd Python-[% c('version') %]
 ./configure --prefix=$distdir
 make -j4
 make prefix=$distdir install
-cd /tmp/dist
+cd /var/tmp/dist
 [% c('tar', {
 	tar_src => 'python',
 	tar_args => '-czf ' _ dest_dir _ '/' _ c('filename'),
diff --git a/rbm.conf b/rbm.conf
index d25c248..c5334fb 100644
--- a/rbm.conf
+++ b/rbm.conf
@@ -60,8 +60,8 @@ targets:
       windows: 1
       osname: windows-i686
       configure_opt: '--host=i686-w64-mingw32 CFLAGS="[% c("var/CFLAGS") %]" LDFLAGS="[% c("var/LDFLAGS") %]"'
-      CFLAGS: '-specs=/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=/tmp/dist/mingw-w64/msvcr100.spec -mwindows -Wl,--dynamicbase -Wl,--nxcompat -Wl,--enable-reloc-section -lssp -L$gcclibs'
+      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'
       compiler: mingw-w64
   osx-x86_64:
     arch: x86_64

More information about the tor-commits mailing list