[gitian] set correct PATH for wrappers #8194

pull MarcoFalke wants to merge 1 commits into bitcoin:master from MarcoFalke:Mf1606-gitianPath changing 3 files +12 −6
  1. MarcoFalke commented at 1:59 PM on June 12, 2016: member

    I was setting the PATH incorrectly for the wrappers (#7283). This didn't matter for linux and osx builds but the windows ones were trying to wrap the linker twice.

  2. [gitian] set correct PATH for wrappers fa61756842
  3. MarcoFalke added the label Build system on Jun 12, 2016
  5. MarcoFalke commented at 9:17 AM on June 13, 2016: member

    This is the diff I get in the build logs (windows is the relevant diff):

    linux:

    diff --git a/tmp/build_lin_old b/tmp/build_lin_new
index 01f3954..0a286df 100644
--- a/tmp/build_lin_old
+++ b/tmp/build_lin_new
@@ -44,8 +44,8 @@
 + export BASE_CACHE=/home/ubuntu/cache/bitcoin-linux-0.13
 + BASE_CACHE=/home/ubuntu/cache/bitcoin-linux-0.13
 + mkdir -p /home/ubuntu/cache/bitcoin-linux-0.13 /home/ubuntu/cache/common
-+ export PATH=/home/ubuntu/wrapped:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games
-+ PATH=/home/ubuntu/wrapped:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games
++ export PATH_orig=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games
++ PATH_orig=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games
 + create_global_faketime_wrappers '2000-01-01 12:00:00'
 + for prog in '${FAKETIME_PROGS}'
 + echo '#!/bin/bash'
@@ -92,6 +92,8 @@
 + create_per-host_faketime_wrappers '2000-01-01 12:00:00'
 + for i in '$HOSTS'
 + for i in '$HOSTS'
++ export PATH=/home/ubuntu/wrapped:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games
++ PATH=/home/ubuntu/wrapped:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games
 + cd bitcoin
 ++ pwd
 + BASEPREFIX=/home/ubuntu/build/bitcoin/depends
@@ -99,6 +101,8 @@
 + true
 + for i in '$HOSTS'
 + true
++ export PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games
++ PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games
 + create_global_faketime_wrappers '2016-06-10 13:40:12'
 + for prog in '${FAKETIME_PROGS}'
 + echo '#!/bin/bash'
@@ -145,6 +149,8 @@
 + create_per-host_faketime_wrappers '2016-06-10 13:40:12'
 + for i in '$HOSTS'
 + for i in '$HOSTS'
++ export PATH=/home/ubuntu/wrapped:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games
++ PATH=/home/ubuntu/wrapped:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games
 + ./autogen.sh
 libtoolize: putting auxiliary files in AC_CONFIG_AUX_DIR, `build-aux'.
 libtoolize: copying file `build-aux/ltmain.sh'

    osx:

    diff --git a/tmp/build_osx_old b/tmp/build_osx_new
index c559b20..c3e8e74 100644
--- a/tmp/build_osx_old
+++ b/tmp/build_osx_new
@@ -43,8 +43,8 @@
 + mkdir -p /home/ubuntu/cache/bitcoin-osx-0.13 /home/ubuntu/cache/common
 + export ZERO_AR_DATE=1
 + ZERO_AR_DATE=1
-+ export PATH=/home/ubuntu/wrapped:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games
-+ PATH=/home/ubuntu/wrapped:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games
++ export PATH_orig=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games
++ PATH_orig=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games
 + create_global_faketime_wrappers '2000-01-01 12:00:00'
 + for prog in '${FAKETIME_PROGS}'
 + echo '#!/bin/bash'
@@ -83,6 +83,8 @@
 + chmod +x /home/ubuntu/wrapped/genisoimage
 + create_per-host_faketime_wrappers '2000-01-01 12:00:00'
 + for i in '$HOSTS'
++ export PATH=/home/ubuntu/wrapped:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games
++ PATH=/home/ubuntu/wrapped:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games
 + cd bitcoin
 ++ pwd
 + BASEPREFIX=/home/ubuntu/build/bitcoin/depends
@@ -162,6 +164,8 @@ tar: Ignoring unknown extended header keyword 'SCHILY.ino'
 tar: Ignoring unknown extended header keyword 'SCHILY.nlink'
 + for i in '$HOSTS'
 + true
++ export PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games
++ PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games
 + create_global_faketime_wrappers '2016-06-10 13:40:12'
 + for prog in '${FAKETIME_PROGS}'
 + echo '#!/bin/bash'
@@ -200,6 +204,8 @@ tar: Ignoring unknown extended header keyword 'SCHILY.nlink'
 + chmod +x /home/ubuntu/wrapped/genisoimage
 + create_per-host_faketime_wrappers '2016-06-10 13:40:12'
 + for i in '$HOSTS'
++ export PATH=/home/ubuntu/wrapped:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games
++ PATH=/home/ubuntu/wrapped:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games
 + ./autogen.sh
 libtoolize: putting auxiliary files in AC_CONFIG_AUX_DIR, `build-aux'.
 libtoolize: copying file `build-aux/ltmain.sh'

    win:

    diff --git a/tmp/build_win_old b/tmp/build_win_new
index 67a4eb6..05ce5e7 100644
--- a/tmp/build_win_old
+++ b/tmp/build_win_new
@@ -43,8 +43,8 @@
 + export BASE_CACHE=/home/ubuntu/cache/bitcoin-win-0.13
 + BASE_CACHE=/home/ubuntu/cache/bitcoin-win-0.13
 + mkdir -p /home/ubuntu/cache/bitcoin-win-0.13 /home/ubuntu/cache/common
-+ export PATH=/home/ubuntu/wrapped:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games
-+ PATH=/home/ubuntu/wrapped:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games
++ export PATH_orig=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games
++ PATH_orig=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games
 + create_global_faketime_wrappers '2000-01-01 12:00:00'
 + for prog in '${FAKETIME_PROGS}'
 + echo '#!/bin/bash'
@@ -219,6 +219,8 @@
 + echo 'export COMPILER_PATH=/home/ubuntu/wrapped/i686-w64-mingw32'
 + echo '$REAL $@'
 + chmod +x /home/ubuntu/wrapped/i686-w64-mingw32-g++
++ export PATH=/home/ubuntu/wrapped:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games
++ PATH=/home/ubuntu/wrapped:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games
 + cd bitcoin
 ++ pwd
 + BASEPREFIX=/home/ubuntu/build/bitcoin/depends
@@ -226,6 +228,8 @@
 + true
 + for i in '$HOSTS'
 + true
++ export PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games
++ PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games
 + create_global_faketime_wrappers '2016-06-10 13:40:12'
 + for prog in '${FAKETIME_PROGS}'
 + echo '#!/bin/bash'
@@ -355,9 +359,9 @@
 + for prog in collect2
 + echo '#!/bin/bash'
 ++ x86_64-w64-mingw32-gcc -print-prog-name=collect2
-+ REAL=/home/ubuntu/wrapped/x86_64-w64-mingw32/collect2
++ REAL=/usr/lib/gcc/x86_64-w64-mingw32/4.8/collect2
 + echo 'export MALLOC_PERTURB_=255'
-+ echo '/home/ubuntu/wrapped/x86_64-w64-mingw32/collect2 $@'
++ echo '/usr/lib/gcc/x86_64-w64-mingw32/4.8/collect2 $@'
 + chmod +x /home/ubuntu/wrapped/x86_64-w64-mingw32/collect2
 + for prog in gcc g++
 + echo '#!/bin/bash'
@@ -380,9 +384,9 @@
 + for prog in collect2
 + echo '#!/bin/bash'
 ++ i686-w64-mingw32-gcc -print-prog-name=collect2
-+ REAL=/home/ubuntu/wrapped/i686-w64-mingw32/collect2
++ REAL=/usr/lib/gcc/i686-w64-mingw32/4.8/collect2
 + echo 'export MALLOC_PERTURB_=255'
-+ echo '/home/ubuntu/wrapped/i686-w64-mingw32/collect2 $@'
++ echo '/usr/lib/gcc/i686-w64-mingw32/4.8/collect2 $@'
 + chmod +x /home/ubuntu/wrapped/i686-w64-mingw32/collect2
 + for prog in gcc g++
 + echo '#!/bin/bash'
@@ -400,6 +404,8 @@
 + echo 'export COMPILER_PATH=/home/ubuntu/wrapped/i686-w64-mingw32'
 + echo '$REAL $@'
 + chmod +x /home/ubuntu/wrapped/i686-w64-mingw32-g++
++ export PATH=/home/ubuntu/wrapped:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games
++ PATH=/home/ubuntu/wrapped:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games
 + ./autogen.sh
 libtoolize: putting auxiliary files in AC_CONFIG_AUX_DIR, `build-aux'.
 libtoolize: copying file `build-aux/ltmain.sh'
  6. laanwj merged this on Jun 14, 2016
  7. laanwj closed this on Jun 14, 2016
  8. laanwj referenced this in commit cca1c8cff0 on Jun 14, 2016
  9. MarcoFalke deleted the branch on Jun 14, 2016
  10. codablock referenced this in commit e474acfbc3 on Sep 16, 2017
  11. codablock referenced this in commit f38aed4afc on Sep 19, 2017
  12. codablock referenced this in commit 91d4da51d8 on Dec 27, 2017
  13. codablock referenced this in commit 61a667fc49 on Dec 28, 2017
  14. MarcoFalke locked this on Sep 8, 2021
Contributors
MarcoFalkelaanwj
Labels
Build system
Linked (view graph)
#7283 [gitian] Default reference_datetime to commit author date
github-metadata-mirror

This is a metadata mirror of the GitHub repository bitcoin/bitcoin. This site is not affiliated with GitHub. Content is generated from a GitHub metadata backup.
generated: 2026-04-17 06:15 UTC
This site is hosted by @0xB10C
More mirrored repositories can be found on mirror.b10c.me