Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion ci/docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
git \
autoconf \
automake \
libfuse2 \
cimg-dev \
cmake \
googletest \
Expand Down
12 changes: 11 additions & 1 deletion include/linuxdeploy/util/misc.h
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,17 @@ namespace linuxdeploy {
}

return {};
};
}

// returns a string vector splitted from envVar
static std::vector<std::string> splitEnv(const char *envVar, char delimiter) {
std::vector<std::string> result;
const auto ret = getenv(envVar);
if (ret) {
result = split(ret, delimiter);
}
return result;
}
}
}
}
8 changes: 5 additions & 3 deletions src/core/appdir.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -123,9 +123,11 @@ namespace linuxdeploy {
bool disableCopyrightFilesDeployment = false;

public:
PrivateData() : copyOperationsStorage(), stripOperations(), setElfRPathOperations(), visitedFiles(), appDirPath(), excludeLibraryPatterns() {
PrivateData() : copyOperationsStorage(), stripOperations(), setElfRPathOperations(), visitedFiles(), appDirPath() {
copyrightFilesManager = copyright::ICopyrightFilesManager::getInstance();
};

excludeLibraryPatterns = util::misc::splitEnv("LINUXDEPLOY_EXCLUDED_LIBRARIES", ';');
Comment thread
TheAssassin marked this conversation as resolved.
}

public:
// calculate library directory name for given ELF file, taking system architecture into account
Expand Down Expand Up @@ -656,7 +658,7 @@ namespace linuxdeploy {
AppDir::AppDir(const std::string& path) : AppDir(fs::path(path)) {}

void AppDir::setExcludeLibraryPatterns(const std::vector<std::string> &excludeLibraryPatterns) {
d->excludeLibraryPatterns = excludeLibraryPatterns;
d->excludeLibraryPatterns.insert(d->excludeLibraryPatterns.end(), excludeLibraryPatterns.begin(), excludeLibraryPatterns.end());
}

bool AppDir::createBasicStructure() const {
Expand Down