marko10_000
/
flatpak-builder
forked from Mirrors/flatpak-builder
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix some issues with musl 

* Use realpath instead of canonicalize_file_name
* Add missing include
tingping/wmclass
André Klitzing 2017-03-10 23:58:15 +01:00 committed by Alexander Larsson
parent afc2dd3d75
commit 567802749c
4 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
builder/builder-module.c
View File

@ -903,7 +903,7 @@ setup_build_args (GFile *app_dir,
g_ptr_array_add (args, g_strdup ("flatpak"));
g_ptr_array_add (args, g_strdup ("build"));
source_dir_path_canonical = canonicalize_file_name (source_dir_path);
source_dir_path_canonical = realpath (source_dir_path, NULL);
if (builder_context_get_build_runtime (context))
builddir = "/run/build-runtime/";

2
builder/builder-source-shell.c
View File

@ -130,7 +130,7 @@ run_script (BuilderContext *context,
g_ptr_array_add (args, g_strdup ("flatpak"));
g_ptr_array_add (args, g_strdup ("build"));
source_dir_path_canonical = canonicalize_file_name (source_dir_path);
source_dir_path_canonical = realpath (source_dir_path, NULL);
g_ptr_array_add (args, g_strdup ("--nofilesystem=host"));
g_ptr_array_add (args, g_strdup_printf ("--filesystem=%s", source_dir_path_canonical));

2
common/flatpak-dir.c
View File

@ -2968,7 +2968,7 @@ flatpak_dir_run_triggers (FlatpakDir *self,
somewhere the bind mount will be on the target of that, not
at that exact path. */
g_autofree char *basedir_orig = g_file_get_path (self->basedir);
g_autofree char *basedir = canonicalize_file_name (basedir_orig);
g_autofree char *basedir = realpath (basedir_orig, NULL);
g_debug ("running trigger %s", name);

1
common/flatpak-utils.c
View File

@ -36,6 +36,7 @@
#include <fcntl.h>
#include <string.h>
#include <sys/stat.h>
#include <sys/file.h>
#include <sys/types.h>
#include <sys/utsname.h>