[gitian] set correct PATH for wrappers #8194
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Member
|
utACK fa61756 |
Member
Author
|
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' |
laanwj
added a commit
that referenced
this pull request
Jun 14, 2016
fa61756 [gitian] set correct PATH for wrappers (MarcoFalke)
24 tasks
codablock
pushed a commit
to codablock/dash
that referenced
this pull request
Dec 28, 2017
fa61756 [gitian] set correct PATH for wrappers (MarcoFalke)
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
2 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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.