commit 2e659c634527a8cd970eba670b4079d0fd91d345 Author: Nicolas Vigier boklm@torproject.org Date: Tue Oct 10 01:37:51 2017 +0200

Bug 23806: link statically libgcrypt and libgpg-error on Linux

Link statically libgcrypt and libgpg-error in libotr to avoid RPATH issue. --- projects/ctypes-otr/build | 5 ----- projects/ctypes-otr/config | 4 ---- projects/libgcrypt/build | 2 +- projects/libgpg-error/build | 2 +- 4 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/projects/ctypes-otr/build b/projects/ctypes-otr/build index fa60e7f..9ccb0c4 100644 --- a/projects/ctypes-otr/build +++ b/projects/ctypes-otr/build @@ -7,11 +7,6 @@ mv libotr/[% c('var/lib_glob') %] [% project %]-[% c('version') %]/chrome/conten [% IF c('var/windows') -%] mv -f [% project %]-[% c('version') %]/chrome/content/libotr-*.dll \ [% project %]-[% c('version') %]/chrome/content/otr.dll -[% ELSIF c('var/linux') -%] -tar xf [% c('input_files_by_name/libgcrypt') %] -mv libgcrypt/[% c('var/lib_glob') %] [% project %]-[% c('version') %]/chrome/content/ -tar xf [% c('input_files_by_name/libgpg-error') %] -mv libgpg-error/[% c('var/lib_glob') %] [% project %]-[% c('version') %]/chrome/content/ [% END -%] [% SET src_dir=project _ '-' _ c('version'); c('tar', { diff --git a/projects/ctypes-otr/config b/projects/ctypes-otr/config index 9c4482d..a3feb2a 100644 --- a/projects/ctypes-otr/config +++ b/projects/ctypes-otr/config @@ -19,7 +19,3 @@ targets: input_files: - name: libotr project: libotr - - name: libgcrypt - project: libgcrypt - - name: libgpg-error - project: libgpg-error diff --git a/projects/libgcrypt/build b/projects/libgcrypt/build index d5e1848..2dacc26 100644 --- a/projects/libgcrypt/build +++ b/projects/libgcrypt/build @@ -13,7 +13,7 @@ tar -C /var/tmp/build -xf $rootdir/[% project %]-[% c('version') %].tar.bz2 cd /var/tmp/build/[% project %]-[% c('version') %] sed -i 's/^BUILD_TIMESTAMP=.*/BUILD_TIMESTAMP=2000-01-01T00:00+0000/' configure export SOURCE_DATE_EPOCH=$(stat -c %Y ChangeLog) -./configure --prefix=$distdir [% c("var/configure_opt") %][% IF c('var/windows') or c('var/osx') %] --enable-static --disable-shared[% END %] +./configure --prefix=$distdir [% c("var/configure_opt") %] --enable-static --disable-shared [% IF c("var/osx") -%] export LD_PRELOAD=[% c("var/faketime_path") %] export FAKETIME="[% USE date; GET date.format(c('timestamp'), format = '%Y-%m-%d %H:%M:%S') %]" diff --git a/projects/libgpg-error/build b/projects/libgpg-error/build index e2680eb..ca07a05 100644 --- a/projects/libgpg-error/build +++ b/projects/libgpg-error/build @@ -12,7 +12,7 @@ cp $rootdir/lock-obj-pub.x86_64-apple-darwin14.0.0.h src/syscfg/lock-obj-pub.dar echo 'int main() {}' > src/gen-posix-lock-obj.c [% END -%] export SOURCE_DATE_EPOCH=$(stat -c %Y ChangeLog) -./configure --prefix="$distdir" [% c("var/configure_opt") %][% IF c('var/windows') or c('var/osx') %] --enable-static --disable-shared[% END %] +./configure --prefix="$distdir" [% c("var/configure_opt") %] --enable-static --disable-shared [% IF c("var/osx") -%] export LD_PRELOAD=[% c("var/faketime_path") %] export FAKETIME="[% USE date; GET date.format(c('timestamp'), format = '%Y-%m-%d %H:%M:%S') %]"