From b36c0f755edb95bb5eaeda530003c2dfad7f6071 Mon Sep 17 00:00:00 2001 From: Thomas Guyot-Sionnest Date: Thu, 3 Aug 2017 00:55:55 -0400 Subject: [PATCH 1/3] Fix parallel build (at least first stage) --- dpkgfiles/make_deb_package.py | 2 +- dpkgfiles/rules | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dpkgfiles/make_deb_package.py b/dpkgfiles/make_deb_package.py index cdb98a313..b9b94fc0c 100755 --- a/dpkgfiles/make_deb_package.py +++ b/dpkgfiles/make_deb_package.py @@ -83,4 +83,4 @@ def pwd(): shutil.copy('dpkgfiles/%s' % f, 'debian/%s' % f) # Finally, all the magic happens here -execAndWait('dpkg-buildpackage -rfakeroot -uc -us -j8') +execAndWait('dpkg-buildpackage -rfakeroot -uc -us -jauto') diff --git a/dpkgfiles/rules b/dpkgfiles/rules index 5624b7860..ff17b1993 100755 --- a/dpkgfiles/rules +++ b/dpkgfiles/rules @@ -10,7 +10,7 @@ #export DH_VERBOSE=1 %: - dh $@ + dh $@ --parallel override_dh_auto_test: From 76757cfa0272ce2f2fc16bdbf2daf9e9479bb2de Mon Sep 17 00:00:00 2001 From: Thomas Guyot-Sionnest Date: Tue, 13 Feb 2018 07:39:26 -0500 Subject: [PATCH 2/3] cppForSwig/Makefile.am: Fix typo in header file name DerviationScheme.h -> DerivationScheme.h --- cppForSwig/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cppForSwig/Makefile.am b/cppForSwig/Makefile.am index 63080921a..2ad284937 100644 --- a/cppForSwig/Makefile.am +++ b/cppForSwig/Makefile.am @@ -33,7 +33,7 @@ INCLUDE_FILES = UniversalTimer.h BinaryData.h lmdb_wrapper.h \ ReentrantLock.h StringSockets.h log.h OS_TranslatePath.h \ TransactionBatch.h BlockchainScanner_Super.h SigHashEnum.h TxEvalState.h \ Accounts.h Addresses.h AssetEncryption.h Assets.h \ - DecryptedDataContainer.h DerviationScheme.h \ + DecryptedDataContainer.h DerivationScheme.h \ bech32/ref/c++/bech32.h bech32/ref/c++/segwit_addr.h \ SshParser.h From 8c7cb1f350c4671dd815b84b5ddc29f9819c6491 Mon Sep 17 00:00:00 2001 From: Thomas Guyot-Sionnest Date: Thu, 3 Aug 2017 02:43:46 -0400 Subject: [PATCH 3/3] Use proper deps for CppBlockUtils_wrap.cxx --- cppForSwig/Makefile.am | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/cppForSwig/Makefile.am b/cppForSwig/Makefile.am index 2ad284937..53cf9617f 100644 --- a/cppForSwig/Makefile.am +++ b/cppForSwig/Makefile.am @@ -106,11 +106,9 @@ libCppBlockUtils_la_LDFLAGS += -Wl,-rpath,@executable_path/ -Wl,-rpath,@loader_p endif #custom rules -CppBlockUtils_wrap.cxx: CppBlockUtils.i +CppBlockUtils_wrap.cxx: CppBlockUtils.i $(INCLUDE_FILES) swig $(SWIG_FLAGS) CppBlockUtils.i -.PHONY: CppBlockUtils_wrap.cxx - clean-local: rm -f CppBlockUtils.py rm -f CppBlockUtils_wrap.cxx