head	1.1;
access;
symbols
	pkgsrc-2026Q1:1.1.0.6
	pkgsrc-2026Q1-base:1.1
	pkgsrc-2025Q4:1.1.0.4
	pkgsrc-2025Q4-base:1.1
	pkgsrc-2025Q3:1.1.0.2
	pkgsrc-2025Q3-base:1.1;
locks; strict;
comment	@-- @;


1.1
date	2025.08.15.08.10.03;	author dkazankov;	state Exp;
branches;
next	;
commitid	gRILv30ypwElIN6G;


desc
@@


1.1
log
@net/ada-polyorb: Add new package 25.0.0

Polymorphic, reusable infrastructure for building
object-oriented distributed systems
@
text
@$NetBSD: patch-compilers_gnatdist_xe__back-garlic.adb,v 1.0 2025/02/05 15:00:00 dkazankov Exp $

Fix include/library paths
Fix params for gprbuild

--- compilers/gnatdist/xe_back-garlic.adb.orig	2024-08-23 19:03:44.000000000 +0300
+++ compilers/gnatdist/xe_back-garlic.adb
@@@@ -194,8 +194,10 @@@@
    --  Take a unit id and return its name removing unit suffix.
 
    DSA_Inc_Rel_Dir : constant String :=
-                      "lib" & Directory_Separator & "garlic";
+                      "include" & Directory_Separator & "garlic";
    --  GARLIC include directory, relative to the installation prefix
+   DSA_Lib_Rel_Dir : constant String :=
+                      "lib" & Directory_Separator & "garlic";
 
    GARLIC_Prefix : constant String :=
                      XE_Back.Prefix
@@@@ -203,6 +205,7 @@@@
                                       & Dir_Separator & "s-garlic.ads");
 
    DSA_Inc_Dir : constant String := GARLIC_Prefix & DSA_Inc_Rel_Dir;
+   DSA_Lib_Dir : constant String := GARLIC_Prefix & DSA_Lib_Rel_Dir;
 
    ------------------
    -- Add_Protocol --
@@@@ -1346,10 +1349,12 @@@@
          raise Fatal_Error with "GARLIC library not found";
       end if;
 
+      if not Use_GPRBuild then
       Scan_Dist_Arg ("-aI" & DSA_Inc_Dir);
-      Scan_Dist_Arg ("-aO" & DSA_Inc_Dir);
+         Scan_Dist_Arg ("-aO" & DSA_Lib_Dir);
+      end if;
       Scan_Dist_Arg ("-largs");
-      Scan_Dist_Arg ("-L" & DSA_Inc_Dir);
+      Scan_Dist_Arg ("-L" & DSA_Lib_Dir);
       Scan_Dist_Arg ("-lgarlic");
    end Set_PCS_Dist_Flags;
 
@