Skip to content

Commit 442a9c6

Browse files
committed
Merge #16691: doc: improve depends prefix documentation
2483266 packages.md: document depends build targets (Russell Yanofsky) be27161 Clarify need to specify --prefix with depends (Russell Yanofsky) Pull request description: There seems to be some confusion about exactly how to use depends, when to pass a prefix to `./configure` etc (see #16367, #16654). I've cherry-picked two of russ's commits out of #16367, as they are clear stand-alone improvements and we don't have to wait for #16367 to improve the depends documentation. ACKs for top commit: Sjors: utACK 2483266 hebasto: ACK 2483266, I have reviewed the code and it looks OK, I agree it can be merged. jonasschnelli: ACK 2483266 Tree-SHA512: a198c288248f573519a3b0ef384626b61cc803803280af9a448c28466e3d9949bed0332af6618dac19e81c5a6e9694afa83d976b176fd13c32a6c2c3fea3fc1f
2 parents d72758c + 2483266 commit 442a9c6

File tree

2 files changed

+21
-2
lines changed

2 files changed

+21
-2
lines changed

depends/README.md

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,18 @@ For example:
1212

1313
make HOST=x86_64-w64-mingw32 -j4
1414

15-
A prefix will be generated that's suitable for plugging into Bitcoin's
16-
configure. In the above example, a dir named x86_64-w64-mingw32 will be
15+
**Bitcoin's configure script by default will ignore the depends output.** In
16+
order for it to pick up libraries, tools, and settings from the depends build,
17+
you must point it at the appropriate `--prefix` directory generated by the
18+
build. In the above example, a prefix dir named x86_64-w64-mingw32 will be
1719
created. To use it for Bitcoin:
1820

1921
./configure --prefix=`pwd`/depends/x86_64-w64-mingw32
2022

2123
Common `host-platform-triplets` for cross compilation are:
2224

25+
- `i686-pc-linux-gnu` for Linux 32 bit
26+
- `x86_64-pc-linux-gnu` for x86 Linux
2327
- `x86_64-w64-mingw32` for Win64
2428
- `x86_64-apple-darwin14` for macOS
2529
- `arm-linux-gnueabihf` for Linux ARM 32 bit

depends/packages.md

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -181,3 +181,18 @@ For us, it's much easier to just link a static `libsecondary` into a shared
181181
static or dynamic `libseconday`, that's not our concern. With a static
182182
`libseconday`, when we need to link `libprimary` into our executable, there's no
183183
dependency chain to worry about as `libprimary` has all the symbols.
184+
185+
## Build targets:
186+
187+
To build an individual package (useful for debugging), following build targets are available.
188+
189+
make ${package}
190+
make ${package}_fetched
191+
make ${package}_extracted
192+
make ${package}_preprocessed
193+
make ${package}_configured
194+
make ${package}_built
195+
make ${package}_staged
196+
make ${package}_postprocessed
197+
make ${package}_cached
198+
make ${package}_cached_checksum

0 commit comments

Comments
 (0)