mirror of
https://github.com/loot/libloot.git
synced 2026-07-27 14:16:01 -07:00
Fixed loot_masterlist_update errors on Linux.
It was due to a lack of OpenSSL support in the libgit2 being built, which also needs the threading system to be initialised, even if threading support was not built...
This commit is contained in:
+2
-1
@@ -6,9 +6,10 @@ cache: apt
|
||||
|
||||
before_install:
|
||||
# Need Boost 1.54+, which isn't in the 12.04 repositories - install from a PPA.
|
||||
# Also need the OpenSSL dev package, for git clone from HTTPS URLs support.
|
||||
- sudo add-apt-repository ppa:boost-latest/ppa -y
|
||||
- sudo apt-get update -qq
|
||||
- sudo apt-get install libboost-log1.55-dev libboost-date-time1.55-dev libboost-thread1.55-dev libboost-filesystem1.55-dev libboost-locale1.55-dev libboost-iostreams1.55-dev
|
||||
- sudo apt-get install libboost-log1.55-dev libboost-date-time1.55-dev libboost-thread1.55-dev libboost-filesystem1.55-dev libboost-locale1.55-dev libboost-iostreams1.55-dev libssl-dev
|
||||
|
||||
install:
|
||||
# Currently inside the cloned repo path.
|
||||
|
||||
+6
-2
@@ -40,7 +40,6 @@ namespace fs = boost::filesystem;
|
||||
namespace lc = boost::locale;
|
||||
|
||||
namespace loot {
|
||||
|
||||
// Removes the read-only flag from some files in git repositories created by libgit2.
|
||||
void FixRepoPermissions(const fs::path& path) {
|
||||
BOOST_LOG_TRIVIAL(trace) << "Recursively setting write permission on directory: " << path;
|
||||
@@ -65,7 +64,10 @@ namespace loot {
|
||||
merge_head(nullptr),
|
||||
tree(nullptr),
|
||||
diff(nullptr),
|
||||
buf({0}) {}
|
||||
buf({0}) {
|
||||
// Init threading system and OpenSSL (for Linux builds).
|
||||
git_threads_init();
|
||||
}
|
||||
|
||||
~git_handler() {
|
||||
string path;
|
||||
@@ -80,6 +82,8 @@ namespace loot {
|
||||
}
|
||||
catch (exception&) {}
|
||||
}
|
||||
|
||||
git_threads_shutdown();
|
||||
}
|
||||
|
||||
void free() {
|
||||
|
||||
Reference in New Issue
Block a user