Skip to content

Commit a574189

Browse files
committed
Merge pull request #4727
246659a gitian: make tarballs deterministic and nuke .la files from build output (Cory Fields) c54d647 travis: let travis use shared libs for tests (Cory Fields) 4bbbdf3 gitian: quick docs update (Cory Fields) 1aead42 gitian: descriptors overhaul (Cory Fields) 5f93ec2 depends: Add a package for qt4.6. Linux uses it by default. (Cory Fields) 4302fa6 depends: Use pic for all linux dependencies (Cory Fields)
2 parents 1b2600a + 246659a commit a574189

34 files changed

+435
-1593
lines changed

.travis.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@ script:
5959
- cd bitcoin-$HOST
6060
- ./configure --cache-file=../config.cache $BITCOIN_CONFIG_ALL $BITCOIN_CONFIG || ( cat config.log && false)
6161
- make $MAKEJOBS $GOAL || ( echo "Build failure. Verbose build follows." && make $GOAL V=1 ; false )
62+
- export LD_LIBRARY_PATH=$TRAVIS_BUILD_DIR/depends/$HOST/lib
6263
- if [ "$RUN_TESTS" = "true" ]; then make check; fi
6364
- if [ "$RUN_TESTS" = "true" ]; then qa/pull-tester/rpc-tests.sh; fi
6465
after_script:

contrib/gitian-descriptors/README.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ Once you've got the right hardware and software:
2727

2828
# Create base images
2929
cd gitian-builder
30-
bin/make-base-vm --suite precise --arch i386
3130
bin/make-base-vm --suite precise --arch amd64
3231
cd ..
3332

contrib/gitian-descriptors/boost-linux.yml

Lines changed: 0 additions & 55 deletions
This file was deleted.

contrib/gitian-descriptors/boost-win.yml

Lines changed: 0 additions & 86 deletions
This file was deleted.

contrib/gitian-descriptors/deps-linux.yml

Lines changed: 0 additions & 98 deletions
This file was deleted.

contrib/gitian-descriptors/deps-win.yml

Lines changed: 0 additions & 128 deletions
This file was deleted.

0 commit comments

Comments
 (0)