From 53bd2349f92bbf39fb5e703dc8f692a9638c8bd9 Mon Sep 17 00:00:00 2001 From: Vadim Godunko Date: Mon, 26 Jan 2026 15:15:10 +0400 Subject: [PATCH] Disable RPATH generation for libraries --- gnat/spawn.gpr | 15 +++++++++------ gnat/spawn_glib.gpr | 15 +++++++++------ 2 files changed, 18 insertions(+), 12 deletions(-) diff --git a/gnat/spawn.gpr b/gnat/spawn.gpr index f266eb1..430dc90 100644 --- a/gnat/spawn.gpr +++ b/gnat/spawn.gpr @@ -1,5 +1,5 @@ -- --- Copyright (C) 2018-2023, AdaCore +-- Copyright (C) 2018-2026, AdaCore -- -- SPDX-License-Identifier: Apache-2.0 -- @@ -21,13 +21,16 @@ library project Spawn is Superproject := external ("SUPERPROJECT", ""); - for Library_Kind use Library_Type; - for Object_Dir use "../.obj/" & Superproject & "/spawn/" & Library_Type; - for Library_Dir use "../.libs/" & Superproject & "/spawn/" & Library_Type; - for Library_Name use "spawn"; - for Source_Dirs use ("../source/spawn"); for Languages use ("Ada", "c"); + for Library_Kind use Library_Type; + for Library_Name use "spawn"; + for Run_Path_Option use (); + + for Object_Dir use "../.obj/" & Superproject & "/spawn/" & Library_Type; + for Library_Dir use "../.libs/" & Superproject & "/spawn/" & Library_Type; + for Source_Dirs use ("../source/spawn"); + Common_Excluded := ("spawn-channels__glib_posix.ads", "spawn-channels__glib_posix.adb"); diff --git a/gnat/spawn_glib.gpr b/gnat/spawn_glib.gpr index c438df6..6ee9ad5 100644 --- a/gnat/spawn_glib.gpr +++ b/gnat/spawn_glib.gpr @@ -1,5 +1,5 @@ -- --- Copyright (C) 2018-2023, AdaCore +-- Copyright (C) 2018-2026, AdaCore -- -- SPDX-License-Identifier: Apache-2.0 -- @@ -20,13 +20,16 @@ library project Spawn_Glib is Build_Mode : Spawn_Glib_Build_Kind := external ("SPAWN_GLIB_BUILD_MODE", external ("BUILD_MODE", "prod")); - for Library_Kind use Library_Type; - for Object_Dir use "../.obj/spawn_glib/" & Library_Type; - for Library_Dir use "../.libs/spawn_glib/" & Library_Type; - for Library_Name use "spawn_glib"; - for Source_Dirs use ("../source/spawn"); for Languages use ("Ada", "c"); + for Library_Kind use Library_Type; + for Library_Name use "spawn_glib"; + for Run_Path_Option use (); + + for Object_Dir use "../.obj/spawn_glib/" & Library_Type; + for Library_Dir use "../.libs/spawn_glib/" & Library_Type; + for Source_Dirs use ("../source/spawn"); + case Library_Type is when "relocatable" => for Library_Options use ("-lglib-2.0");