Skip to content

Commit

Permalink
Add patch to fix cmake path
Browse files Browse the repository at this point in the history
  • Loading branch information
bbhtt committed Jul 4, 2024
1 parent 189bd9b commit 5d5bd1a
Show file tree
Hide file tree
Showing 2 changed files with 27 additions and 1 deletion.
3 changes: 2 additions & 1 deletion org.flatpak.Builder.json
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,8 @@
"paths": [
"patches/flatpak-builder-lfs.patch",
"patches/flatpak-builder-appstream-cli-urls.patch",
"patches/flatpak-builder-builder-module-dont-set-libdir-for-autotools.patch"
"patches/flatpak-builder-builder-module-dont-set-libdir-for-autotools.patch",
"patches/flatpak-builder-CMAKE_INSTALL_LIBDIR-is-not-absolute-path.patch"
]
}
]
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
From e456380c128493654fdeabe51666c5d798a2c40d Mon Sep 17 00:00:00 2001
From: bbhtt <bbhtt.zn0i8@slmail.me>
Date: Thu, 4 Jul 2024 13:29:23 +0530
Subject: [PATCH] CMAKE_INSTALL_LIBDIR is not absolute path

---
src/builder-module.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/builder-module.c b/src/builder-module.c
index 910cd551..a3cc9f8a 100644
--- a/src/builder-module.c
+++ b/src/builder-module.c
@@ -1788,7 +1788,7 @@ builder_module_build_helper (BuilderModule *self,
if (libdir)
g_ptr_array_add (configure_args_arr, g_strdup_printf ("-DCMAKE_INSTALL_LIBDIR:PATH='%s'", libdir));
else
- g_ptr_array_add (configure_args_arr, g_strdup_printf ("-DCMAKE_INSTALL_LIBDIR:PATH='%s/lib'", prefix));
+ g_ptr_array_add (configure_args_arr, g_strdup_printf ("-DCMAKE_INSTALL_LIBDIR:PATH='lib'"));
g_ptr_array_add (configure_args_arr, g_strdup ("-G"));
g_ptr_array_add (configure_args_arr, g_strdup_printf ("%s", cmake_generator));
}
--
2.45.2

0 comments on commit 5d5bd1a

Please sign in to comment.