From 272a4030d5183d8c5f074f99436e7aa32420bdcc Mon Sep 17 00:00:00 2001 From: Sonny Piers Date: Sat, 21 Sep 2024 11:01:43 +0200 Subject: [PATCH] Specify libdir in several modules For some reason, the dependencies wouldn't be found during build on Github actions/CI. --- build-aux/modules/GTKCssLanguageServer.json | 6 +++++- build-aux/modules/libportal.json | 1 + build-aux/modules/libshumate.json | 2 +- build-aux/modules/vte.json | 1 + demos | 2 +- 5 files changed, 9 insertions(+), 3 deletions(-) diff --git a/build-aux/modules/GTKCssLanguageServer.json b/build-aux/modules/GTKCssLanguageServer.json index d0d3182f5..cbf93e759 100644 --- a/build-aux/modules/GTKCssLanguageServer.json +++ b/build-aux/modules/GTKCssLanguageServer.json @@ -12,7 +12,11 @@ "modules": [ { "name": "jsonrpc-glib", - "config-opts": ["--buildtype=release", "-Denable_tests=false"], + "config-opts": [ + "--libdir=/app/lib", + "--buildtype=release", + "-Denable_tests=false" + ], "buildsystem": "meson", "sources": [ { diff --git a/build-aux/modules/libportal.json b/build-aux/modules/libportal.json index a97a2fdee..bfaa3f2c7 100644 --- a/build-aux/modules/libportal.json +++ b/build-aux/modules/libportal.json @@ -2,6 +2,7 @@ "name": "libportal", "buildsystem": "meson", "config-opts": [ + "--libdir=/app/lib", "-Dtests=false", "-Dbackend-gtk3=disabled", "-Dbackend-gtk4=enabled", diff --git a/build-aux/modules/libshumate.json b/build-aux/modules/libshumate.json index abbc8f19e..d4918e89b 100644 --- a/build-aux/modules/libshumate.json +++ b/build-aux/modules/libshumate.json @@ -1,7 +1,7 @@ { "name": "libshumate", "buildsystem": "meson", - "config-opts": ["-Dgtk_doc=false"], + "config-opts": ["--libdir=/app/lib", "-Dgtk_doc=false"], "sources": [ { "type": "archive", diff --git a/build-aux/modules/vte.json b/build-aux/modules/vte.json index e511a93b0..dc5b14c48 100644 --- a/build-aux/modules/vte.json +++ b/build-aux/modules/vte.json @@ -2,6 +2,7 @@ "name": "vte", "buildsystem": "meson", "config-opts": [ + "--libdir=/app/lib", "-Ddocs=false", "-Dgtk3=false", "-Dgtk4=true", diff --git a/demos b/demos index 3e727f085..b3982bb3f 160000 --- a/demos +++ b/demos @@ -1 +1 @@ -Subproject commit 3e727f085044ac110351d62f2dcd2c7a0d1a6871 +Subproject commit b3982bb3f5614b970e70921b0b6f41d9c59e8386