Pass exclude-libraries as env var to linuxdeploy plugins

dantti · DanielNicolettiKDAB · commit 67115ea0bffc · 2024-11-17T23:18:45.000-03:00
Excluding libraries doesn't properly work as of now
because plugins are not notified of such exclusions,
by passing the env var and automatically reading it
plugins just need to be recompiled.
diff --git a/include/linuxdeploy/util/misc.h b/include/linuxdeploy/util/misc.h
@@ -135,7 +135,23 @@ namespace linuxdeploy {
                 }
 
                 return {};
-            };
+            }
+
+            // sets strings vector with strings from envVar if exists
+            static bool stringVectorFromEnv(const char *envVar, char delimiter, std::vector<std::string> &strings) {
+                const auto ret = getenv(envVar);
+                if (ret) {
+                    strings = split(ret, delimiter);
+                    return true;
+                }
+                return false;
+            }
+
+            // set envVar with value from strings
+            static bool stringVectorToEnv(const char *envVar, char delimiter, const std::vector<std::string> &strings) {
+                const auto ret = join(strings, std::string{delimiter});
+                return setenv(envVar, ret.c_str(), 1) == 0;
+            }
         }
     }
 }
diff --git a/src/core/appdir.cpp b/src/core/appdir.cpp
@@ -125,7 +125,8 @@ namespace linuxdeploy {
                 public:
                 PrivateData() : copyOperationsStorage(), stripOperations(), setElfRPathOperations(), visitedFiles(), appDirPath(), excludeLibraryPatterns() {
                         copyrightFilesManager = copyright::ICopyrightFilesManager::getInstance();
-                    };
+                        util::misc::stringVectorFromEnv("LINUXDEPLOY_EXCLUDED_LIBRARIES", ';', excludeLibraryPatterns);
+                    }
 
                 public:
                     // calculate library directory name for given ELF file, taking system architecture into account
@@ -656,7 +657,8 @@ 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());
+                util::misc::stringVectorToEnv("LINUXDEPLOY_EXCLUDED_LIBRARIES", ';', d->excludeLibraryPatterns);
             }
 
             bool AppDir::createBasicStructure() const {

Original file line number	Diff line number	Diff line change
`@@ -135,7 +135,23 @@ namespace linuxdeploy {`
`135`	`135`	`}`
`136`	`136`
`137`	`137`	`return {};`
`138`		`- };`
	`138`	`+ }`
	`139`	`+`
	`140`	`+ // sets strings vector with strings from envVar if exists`
	`141`	`+ static bool stringVectorFromEnv(const char *envVar, char delimiter, std::vector<std::string> &strings) {`
	`142`	`+ const auto ret = getenv(envVar);`
	`143`	`+ if (ret) {`
	`144`	`+ strings = split(ret, delimiter);`
	`145`	`+ return true;`
	`146`	`+ }`
	`147`	`+ return false;`
	`148`	`+ }`
	`149`	`+`
	`150`	`+ // set envVar with value from strings`
	`151`	`+ static bool stringVectorToEnv(const char *envVar, char delimiter, const std::vector<std::string> &strings) {`
	`152`	`+ const auto ret = join(strings, std::string{delimiter});`
	`153`	`+ return setenv(envVar, ret.c_str(), 1) == 0;`
	`154`	`+ }`
`139`	`155`	`}`
`140`	`156`	`}`
`141`	`157`	`}`