HomePhabricator

fix gitian-win build

Description

fix gitian-win build

Summary:
Move the quotes to the correct block of code. In D10584, I didn't put them in the same place as they were put in the original commit https://github.com/bitcoin/bitcoin/pull/19077/commits/e87df8258090138d5c22ac46b8602b618620e8a1

Without the quotes, the build fails when building sqlite:

Building sqlite...
make[1]: Entering directory '/home/debian/build/bitcoin/depends/work/build/x86_64-w64-mingw32/sqlite/3320100-143af3b03b1'
make[1]: warning: -j13 forced in submake: resetting jobserver mode.
/bin/bash ./libtool  --tag=CC   --mode=compile x86_64-w64-mingw32-gcc -DPACKAGE_NAME=\"sqlite\" -DPACKAGE_TARNAME=\"sqlite\" -DPACKAGE_VERSION=\"3.32.1\" -DPACKAGE_STRING=\"sqlite\ 3.32.1\" -DPACKAGE_BUGREPORT=\"http://www.sqlite.org\" -DPACKAGE_URL=\"\" -DPACKAGE=\"sqlite\" -DVERSION=\"3.32.1\" -D_FILE_OFFSET_BITS=64 -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DLT_OBJDIR=\".libs/\" -DHAVE_USLEEP=1 -DHAVE_DECL_STRERROR_R=0 -I.   -I/home/debian/build/bitcoin/depends/x86_64-w64-mingw32/include     -D_REENTRANT=1 -DSQLITE_THREADSAFE=1 -DSQLITE_OMIT_LOAD_EXTENSION=1 -DSQLITE_ENABLE_FTS4 -DSQLITE_ENABLE_FTS5 -DSQLITE_ENABLE_JSON1 -DSQLITE_ENABLE_RTREE -DSQLITE_ENABLE_GEOPOLY  -pipe -O2     -MT sqlite3.lo -MD -MP -MF .deps/sqlite3.Tpo -c -o sqlite3.lo sqlite3.c
/bin/bash: warning: setlocale: LC_ALL: cannot change locale (en_US.UTF-8)
/bin/bash: warning: setlocale: LC_ALL: cannot change locale (en_US.UTF-8)
libtool: compile:  x86_64-w64-mingw32-gcc -DPACKAGE_NAME=\"sqlite\" -DPACKAGE_TARNAME=\"sqlite\" -DPACKAGE_VERSION=\"3.32.1\" "-DPACKAGE_STRING=\"sqlite 3.32.1\"" -DPACKAGE_BUGREPORT=\"http://www.sqlite.org\" -DPACKAGE_URL=\"\" -DPACKAGE=\"sqlite\" -DVERSION=\"3.32.1\" -D_FILE_OFFSET_BITS=64 -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DLT_OBJDIR=\".libs/\" -DHAVE_USLEEP=1 -DHAVE_DECL_STRERROR_R=0 -I. -I/home/debian/build/bitcoin/depends/x86_64-w64-mingw32/include -D_REENTRANT=1 -DSQLITE_THREADSAFE=1 -DSQLITE_OMIT_LOAD_EXTENSION=1 -DSQLITE_ENABLE_FTS4 -DSQLITE_ENABLE_FTS5 -DSQLITE_ENABLE_JSON1 -DSQLITE_ENABLE_RTREE -DSQLITE_ENABLE_GEOPOLY -pipe -O2 -MT sqlite3.lo -MD -MP -MF .deps/sqlite3.Tpo -c sqlite3.c -o sqlite3.o
./libtool: line 1760: warning: setlocale: LC_ALL: cannot change locale (en_US.UTF-8)
bash: warning: setlocale: LC_ALL: cannot change locale (en_US.UTF-8)
x86_64-w64-mingw32-gcc-posix: error: 3.32.1": No such file or directory
make[1]: Leaving directory '/home/debian/build/bitcoin/depends/work/build/x86_64-w64-mingw32/sqlite/3320100-143af3b03b1'
make[1]: *** [Makefile:533: sqlite3.lo] Error 1
make: Leaving directory '/home/debian/build/bitcoin/depends'
make: *** [funcs.mk:253: /home/debian/build/bitcoin/depends/work/build/x86_64-w64-mingw32/sqlite/3320100-143af3b03b1/./.stamp_built] Error 2

Note that there is a missing backport (core#16667) that explains the difference in gitian-win.yml. I will sort this in a different commit, after the build is unbroken.

Test Plan: @bot gitian-win gitian-linux

Reviewers: #bitcoin_abc, Fabien

Reviewed By: #bitcoin_abc, Fabien

Differential Revision: https://reviews.bitcoinabc.org/D10584

Details

Provenance
PiRKAuthored on Nov 29 2021, 14:32
PiRKPushed on Nov 29 2021, 14:33
Reviewer
Restricted Project
Differential Revision
D10584: fix gitian-win build
Parents
rABCd87a16fbc2d0: test: Move (dis)?connect_nodes globals into TestFramework
Branches
Unknown
Tags
Unknown