Skip to content

FreeBSD compilation fixes. #327

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
TheAssassin merged 2 commits into from
Apr 12, 2026
Merged

FreeBSD compilation fixes. #327

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d6e7384
Cleanup CMakeLists.txt
arrowd Apr 12, 2026
26681d8
Compile fixes for FreeBSD
arrowd Apr 12, 2026
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
3 changes: 0 additions & 3 deletions src/plugin/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,4 @@ add_library(linuxdeploy_plugin STATIC
)
target_link_libraries(linuxdeploy_plugin PUBLIC linuxdeploy_core linuxdeploy_subprocess)

unset(headers)
unset(headers_dir)

install(TARGETS linuxdeploy_plugin)
4 changes: 4 additions & 0 deletions src/plugin/plugin.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,11 @@ namespace linuxdeploy {

// also, look for plugins in current working directory
// could be useful in a "use linuxdeploy centrally, but download plugins into project directory" scenario
#ifdef _GNU_SOURCE
std::shared_ptr<char> cwd(get_current_dir_name(), free);
#else
std::shared_ptr<char> cwd(getcwd(nullptr, 0), free);
#endif
paths.emplace_back(cwd.get());

for (const auto& dir : paths) {
Expand Down
2 changes: 1 addition & 1 deletion src/subprocess/process.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#include <utility>
#include <unistd.h>
#include <memory.h>
#include <wait.h>
#include <sys/wait.h>
#include <sstream>

// local headers
Expand Down
7 changes: 7 additions & 0 deletions src/subprocess/util.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,13 @@
#include "linuxdeploy/subprocess/util.h"
#include "linuxdeploy/util/misc.h"

#ifdef __FreeBSD__
// On FreeBSD environ has to be declared in the consumer code
extern "C" {
extern char** environ;
}
#endif

namespace linuxdeploy::subprocess {
subprocess_env_map_t get_environment() {
subprocess_env_map_t result;
Expand Down
Loading