RanchiMall/flocore-node
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed patch for anoint (we don't build dylib's anymore).

Browse Source
This commit is contained in:
Chris Kleeschulte 2015-08-04 13:33:03 -04:00
parent 866c78b701
commit 19b96754d7
3 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
bin/build-libbitcoind
View File

@ -13,7 +13,7 @@ echo "Using BTC directory: ${btc_dir}"
cd "${root_dir}" cd "${root_dir}"
copy_header_files () { copy_files () {
if [[ -d "${artifacts_dir}" && -d "${h_and_a_dir}" && -d "${btc_dir}" ]]; then if [[ -d "${artifacts_dir}" && -d "${h_and_a_dir}" && -d "${btc_dir}" ]]; then
mkdir -p "${artifacts_dir}/include" > /dev/null 2>&1 mkdir -p "${artifacts_dir}/include" > /dev/null 2>&1
pushd "${root_dir}" pushd "${root_dir}"
@ -163,14 +163,12 @@ apply the current patch from "${root_dir}"/etc/bitcoin.patch? (y/N): "
echo 'make V=1' echo 'make V=1'
make V=1 make V=1
echo 'Copying libbitcoind.{so|dylib} to its appropriate location.' echo 'Copying files to their appropriate location.'
if test -e "${btc_dir}/src/.libs/libbitcoind.a"; then if test -e "${btc_dir}/src/.libs/libbitcoind.a"; then
mkdir -p "${artifacts_dir}" mkdir -p "${artifacts_dir}"
cp -R "${btc_dir}"/src/.libs/libbitcoind.a "${artifacts_dir}"
echo "Creating the sha marker for the patching in libbitcoind..." echo "Creating the sha marker for the patching in libbitcoind..."
echo -n `shasum -a 256 "${root_dir}"/etc/bitcoin.patch | awk '{print $1}'` > "${artifacts_dir}"/patch_sha.txt echo -n `shasum -a 256 "${root_dir}"/etc/bitcoin.patch | awk '{print $1}'` > "${artifacts_dir}"/patch_sha.txt
echo "Copying the header files in order to be cached..." copy_files
copy_header_files
else else
echo "Could not find the libraries after they should have been built, please run make clean inside the libbitcoind dir and run npm install again." echo "Could not find the libraries after they should have been built, please run make clean inside the libbitcoind dir and run npm install again."
exit 1 exit 1

8
etc/bitcoin.patch
View File

@ -139,14 +139,14 @@ index e7aa48d..df0f7ae 100644
endef endef
diff --git a/src/Makefile.am b/src/Makefile.am diff --git a/src/Makefile.am b/src/Makefile.am
index 1c2f770..d2eca15 100644 index 1c2f770..4c87b26 100644
--- a/src/Makefile.am --- a/src/Makefile.am
+++ b/src/Makefile.am +++ b/src/Makefile.am
@@ -1,6 +1,12 @@ @@ -1,6 +1,12 @@
DIST_SUBDIRS = secp256k1 DIST_SUBDIRS = secp256k1
AM_LDFLAGS = $(PTHREAD_CFLAGS) $(LIBTOOL_LDFLAGS) AM_LDFLAGS = $(PTHREAD_CFLAGS) $(LIBTOOL_LDFLAGS)
+lib_LTLIBRARIES = +noinst_LTLIBRARIES =
+libbitcoind_la_LIBADD = +libbitcoind_la_LIBADD =
+libbitcoind_la_LDFLAGS = -no-undefined +libbitcoind_la_LDFLAGS = -no-undefined
+STATIC_BOOST_LIBS = +STATIC_BOOST_LIBS =
@ -179,7 +179,7 @@ index 1c2f770..d2eca15 100644
TESTS = TESTS =
+if BUILD_BITCOIN_LIBS +if BUILD_BITCOIN_LIBS
+lib_LTLIBRARIES += libbitcoinconsensus.la +noinst_LTLIBRARIES += libbitcoinconsensus.la
+LIBBITCOIN_CONSENSUS += libbitcoinconsensus.la +LIBBITCOIN_CONSENSUS += libbitcoinconsensus.la
+endif +endif
+ +
@ -192,7 +192,7 @@ index 1c2f770..d2eca15 100644
bin_PROGRAMS += bitcoin-cli bitcoin-tx bin_PROGRAMS += bitcoin-cli bitcoin-tx
endif endif
+else +else
+lib_LTLIBRARIES += libbitcoind.la +noinst_LTLIBRARIES += libbitcoind.la
+endif +endif
.PHONY: FORCE .PHONY: FORCE

6
platform/os.sh
View File

@ -145,7 +145,7 @@ if test -z "$1" -o x"$1" = x'host'; then
fi fi
if test -z "$1" -o x"$1" = x'bdb'; then if test -z "$1" -o x"$1" = x'bdb'; then
if [ "${BITCOINDJS_ENV}" == "test" ]; then if [ "${BITCORENODE_ENV}" == "test" ]; then
echo -n "${artifacts_dir}/lib/libdb_cxx.a" echo -n "${artifacts_dir}/lib/libdb_cxx.a"
fi fi
fi fi
@ -154,7 +154,7 @@ if test -z "$1" -o x"$1" = x'load_archive'; then
if [ "${os}" == "osx" ]; then if [ "${os}" == "osx" ]; then
echo -n "-Wl,-all_load -Wl,--no-undefined" echo -n "-Wl,-all_load -Wl,--no-undefined"
else else
echo -n "-Wl,--whole-archive ${filesystem} ${thread} "${BITCOIN_DIR}"/src/.libs/libbitcoind.a -Wl,--no-whole-archive" echo -n "-Wl,--whole-archive ${filesystem} ${thread} "${artifacts_dir}"/lib/libbitcoind.a -Wl,--no-whole-archive"
fi fi
fi fi
@ -168,5 +168,5 @@ if test -z "$1" -o x"$1" = x'mac_dependencies'; then
fi fi
if test -z "$1" -o x"$1" = x'bitcoind'; then if test -z "$1" -o x"$1" = x'bitcoind'; then
echo -n "${BITCOIN_DIR}"/src/.libs/libbitcoind.a echo -n "${artifacts_dir}"/lib/libbitcoind.a
fi fi