aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--configure.ac2
-rw-r--r--contrib/gitian-descriptors/gitian-win32.yml4
-rw-r--r--contrib/gitian-descriptors/protobuf-win32.yml5
-rw-r--r--doc/build-osx.md2
-rw-r--r--doc/build-unix.md3
-rw-r--r--src/leveldb/db/filename.cc9
-rw-r--r--src/main.cpp16
-rw-r--r--src/main.h10
-rw-r--r--src/qt/bitcoin.cpp6
9 files changed, 30 insertions, 27 deletions
diff --git a/configure.ac b/configure.ac
index 9e5b83f2dd..9737b884b4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -420,7 +420,7 @@ CPPFLAGS="$TEMP_CPPFLAGS"
fi
if test x$boost_sleep != xyes; then
- AC_MSG_ERROR(No working boost sleep implementation found)
+ AC_MSG_ERROR(No working boost sleep implementation found. If on ubuntu 13.10 with libboost1.54-all-dev remove libboost.1.54-all-dev and use libboost1.53-all-dev)
fi
BITCOIN_QT_INIT
diff --git a/contrib/gitian-descriptors/gitian-win32.yml b/contrib/gitian-descriptors/gitian-win32.yml
index 794fa27f1f..eac74272c5 100644
--- a/contrib/gitian-descriptors/gitian-win32.yml
+++ b/contrib/gitian-descriptors/gitian-win32.yml
@@ -25,7 +25,7 @@ files:
- "qt-win32-5.2.0-gitian-r1.zip"
- "boost-win32-1.55.0-gitian-r6.zip"
- "bitcoin-deps-win32-gitian-r10.zip"
-- "protobuf-win32-2.5.0-gitian-r3.zip"
+- "protobuf-win32-2.5.0-gitian-r4.zip"
script: |
#
STAGING=$HOME/staging
@@ -37,7 +37,7 @@ script: |
unzip ../build/qt-win32-5.2.0-gitian-r1.zip
unzip ../build/boost-win32-1.55.0-gitian-r6.zip
unzip ../build/bitcoin-deps-win32-gitian-r10.zip
- unzip ../build/protobuf-win32-2.5.0-gitian-r3.zip
+ unzip ../build/protobuf-win32-2.5.0-gitian-r4.zip
cd $HOME/build/
#
cd bitcoin
diff --git a/contrib/gitian-descriptors/protobuf-win32.yml b/contrib/gitian-descriptors/protobuf-win32.yml
index b2e3d0b465..e93f92bbfe 100644
--- a/contrib/gitian-descriptors/protobuf-win32.yml
+++ b/contrib/gitian-descriptors/protobuf-win32.yml
@@ -18,6 +18,7 @@ script: |
export TZ=UTC
export INSTALLPREFIX=$OUTDIR/staging/deps
export HOST=i686-w64-mingw32
+ OPTFLAGS="-O2"
# Integrity Check
echo "13bfc5ae543cf3aa180ac2485c0bc89495e3ae711fc6fab4f8ffe90dfb4bb677 protobuf-2.5.0.tar.bz2" | sha256sum -c
@@ -33,12 +34,12 @@ script: |
cp src/protoc $INSTALLPREFIX/host/bin
# Now recompile with the mingw cross-compiler:
make distclean
- ./configure --prefix=$INSTALLPREFIX --enable-shared=no --disable-dependency-tracking --with-protoc=$INSTALLPREFIX/host/bin/protoc --host=$HOST CXXFLAGS=-frandom-seed=11
+ ./configure --prefix=$INSTALLPREFIX --enable-shared=no --disable-dependency-tracking --with-protoc=$INSTALLPREFIX/host/bin/protoc --host=$HOST CXXFLAGS="-frandom-seed=11 ${OPTFLAGS}"
make
make install
cd $INSTALLPREFIX
export LD_PRELOAD=/usr/lib/faketime/libfaketime.so.1
export FAKETIME=$REFERENCE_DATETIME
- zip -r $OUTDIR/protobuf-win32-2.5.0-gitian-r3.zip include lib host
+ zip -r $OUTDIR/protobuf-win32-2.5.0-gitian-r4.zip include lib host
unset LD_PRELOAD
unset FAKETIME
diff --git a/doc/build-osx.md b/doc/build-osx.md
index a9a78b374b..381e8b6f0a 100644
--- a/doc/build-osx.md
+++ b/doc/build-osx.md
@@ -45,7 +45,7 @@ Instructions: MacPorts
Installing the dependencies using MacPorts is very straightforward.
- sudo port install boost db48@+no_java openssl miniupnpc autoconf pkgconfig
+ sudo port install boost db48@+no_java openssl miniupnpc autoconf pkgconfig automake
### Building `bitcoind`
diff --git a/doc/build-unix.md b/doc/build-unix.md
index b88186a70e..5124205a34 100644
--- a/doc/build-unix.md
+++ b/doc/build-unix.md
@@ -68,6 +68,9 @@ for Ubuntu 12.04 and later:
Ubuntu 12.04 and later have packages for libdb5.1-dev and libdb5.1++-dev,
but using these will break binary wallet compatibility, and is not recommended.
+
+for Ubuntu 13.10:
+ libboost1.54-all-dev will not work. Remove libboost1.54-all-dev and install libboost1.53-all-dev
for other Ubuntu & Debian:
diff --git a/src/leveldb/db/filename.cc b/src/leveldb/db/filename.cc
index da32946d99..27d750697b 100644
--- a/src/leveldb/db/filename.cc
+++ b/src/leveldb/db/filename.cc
@@ -29,14 +29,19 @@ std::string LogFileName(const std::string& name, uint64_t number) {
return MakeFileName(name, number, "log");
}
+// TableFileName returns the filenames we usually write to, while
+// SSTTableFileName returns the alternative filenames we also try to read from
+// for backward compatibility. For now, swap them around.
+// TODO: when compatibility is no longer necessary, swap them back
+// (TableFileName to use "ldb" and SSTTableFileName to use "sst").
std::string TableFileName(const std::string& name, uint64_t number) {
assert(number > 0);
- return MakeFileName(name, number, "ldb");
+ return MakeFileName(name, number, "sst");
}
std::string SSTTableFileName(const std::string& name, uint64_t number) {
assert(number > 0);
- return MakeFileName(name, number, "sst");
+ return MakeFileName(name, number, "ldb");
}
std::string DescriptorFileName(const std::string& dbname, uint64_t number) {
diff --git a/src/main.cpp b/src/main.cpp
index 9c6c1ba0c3..3ff1fd3a91 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -883,11 +883,11 @@ bool GetTransaction(const uint256 &hash, CTransaction &txOut, uint256 &hashBlock
fseek(file, postx.nTxOffset, SEEK_CUR);
file >> txOut;
} catch (std::exception &e) {
- return error("%s() : deserialize or I/O error", __PRETTY_FUNCTION__);
+ return error("%s : Deserialize or I/O error - %s", __PRETTY_FUNCTION__, e.what());
}
hashBlock = header.GetHash();
if (txOut.GetHash() != hash)
- return error("%s() : txid mismatch", __PRETTY_FUNCTION__);
+ return error("%s : txid mismatch", __PRETTY_FUNCTION__);
return true;
}
}
@@ -936,7 +936,7 @@ bool WriteBlockToDisk(CBlock& block, CDiskBlockPos& pos)
// Open history file to append
CAutoFile fileout = CAutoFile(OpenBlockFile(pos), SER_DISK, CLIENT_VERSION);
if (!fileout)
- return error("WriteBlockToDisk() : OpenBlockFile failed");
+ return error("WriteBlockToDisk : OpenBlockFile failed");
// Write index header
unsigned int nSize = fileout.GetSerializeSize(block);
@@ -945,7 +945,7 @@ bool WriteBlockToDisk(CBlock& block, CDiskBlockPos& pos)
// Write block
long fileOutPos = ftell(fileout);
if (fileOutPos < 0)
- return error("WriteBlockToDisk() : ftell failed");
+ return error("WriteBlockToDisk : ftell failed");
pos.nPos = (unsigned int)fileOutPos;
fileout << block;
@@ -964,19 +964,19 @@ bool ReadBlockFromDisk(CBlock& block, const CDiskBlockPos& pos)
// Open history file to read
CAutoFile filein = CAutoFile(OpenBlockFile(pos, true), SER_DISK, CLIENT_VERSION);
if (!filein)
- return error("ReadBlockFromDisk(CBlock&, CDiskBlockPos&) : OpenBlockFile failed");
+ return error("ReadBlockFromDisk : OpenBlockFile failed");
// Read block
try {
filein >> block;
}
catch (std::exception &e) {
- return error("%s() : deserialize or I/O error", __PRETTY_FUNCTION__);
+ return error("%s : Deserialize or I/O error - %s", __PRETTY_FUNCTION__, e.what());
}
// Check the header
if (!CheckProofOfWork(block.GetHash(), block.nBits))
- return error("ReadBlockFromDisk(CBlock&, CDiskBlockPos&) : errors in block header");
+ return error("ReadBlockFromDisk : Errors in block header");
return true;
}
@@ -2876,7 +2876,7 @@ bool LoadExternalBlockFile(FILE* fileIn, CDiskBlockPos *dbp)
break;
}
} catch (std::exception &e) {
- LogPrintf("%s() : Deserialize or I/O error caught during load\n", __PRETTY_FUNCTION__);
+ LogPrintf("%s : Deserialize or I/O error - %s", __PRETTY_FUNCTION__, e.what());
}
}
fclose(fileIn);
diff --git a/src/main.h b/src/main.h
index f3f9acb639..60e733b23a 100644
--- a/src/main.h
+++ b/src/main.h
@@ -336,7 +336,7 @@ public:
// Open history file to append
CAutoFile fileout = CAutoFile(OpenUndoFile(pos), SER_DISK, CLIENT_VERSION);
if (!fileout)
- return error("CBlockUndo::WriteToDisk() : OpenUndoFile failed");
+ return error("CBlockUndo::WriteToDisk : OpenUndoFile failed");
// Write index header
unsigned int nSize = fileout.GetSerializeSize(*this);
@@ -345,7 +345,7 @@ public:
// Write undo data
long fileOutPos = ftell(fileout);
if (fileOutPos < 0)
- return error("CBlockUndo::WriteToDisk() : ftell failed");
+ return error("CBlockUndo::WriteToDisk : ftell failed");
pos.nPos = (unsigned int)fileOutPos;
fileout << *this;
@@ -368,7 +368,7 @@ public:
// Open history file to read
CAutoFile filein = CAutoFile(OpenUndoFile(pos, true), SER_DISK, CLIENT_VERSION);
if (!filein)
- return error("CBlockUndo::ReadFromDisk() : OpenBlockFile failed");
+ return error("CBlockUndo::ReadFromDisk : OpenBlockFile failed");
// Read block
uint256 hashChecksum;
@@ -377,7 +377,7 @@ public:
filein >> hashChecksum;
}
catch (std::exception &e) {
- return error("%s() : deserialize or I/O error", __PRETTY_FUNCTION__);
+ return error("%s : Deserialize or I/O error - %s", __PRETTY_FUNCTION__, e.what());
}
// Verify checksum
@@ -385,7 +385,7 @@ public:
hasher << hashBlock;
hasher << *this;
if (hashChecksum != hasher.GetHash())
- return error("CBlockUndo::ReadFromDisk() : checksum mismatch");
+ return error("CBlockUndo::ReadFromDisk : Checksum mismatch");
return true;
}
diff --git a/src/qt/bitcoin.cpp b/src/qt/bitcoin.cpp
index c215df5db2..3cf7e53c02 100644
--- a/src/qt/bitcoin.cpp
+++ b/src/qt/bitcoin.cpp
@@ -561,12 +561,6 @@ int main(int argc, char *argv[])
try
{
-#ifndef Q_OS_MAC
- // Regenerate startup link, to fix links to old versions
- // OSX: makes no sense on mac and might also scan/mount external (and sleeping) volumes (can take up some secs)
- if (GUIUtil::GetStartOnSystemStartup())
- GUIUtil::SetStartOnSystemStartup(true);
-#endif
app.createWindow(isaTestNet);
app.requestInitialize();
app.exec();
generated by cgit v1.2.3 (git 2.26.2) at 2024-07-20 01:59:29 +0000