summaryrefslogtreecommitdiff
path: root/dev-ada/gprbuild/files/gprbuild-2017-gentoo.patch
blob: c784920eaf3b85503aac263e0116c7b757fc3725 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
--- gprbuild-2017/gpr/gpr.gpr.old	2017-05-27 20:59:07.061135892 +0200
+++ gprbuild-2017/gpr/gpr.gpr	2017-05-27 20:59:38.022638398 +0200
@@ -67,6 +67,7 @@
             for Switches ("gpr*.ad?") use
               Compiler'Default_Switches ("Ada") & ("-g1");
       end case;
+      for Driver ("C") use External ("CC", "gcc");
    end Compiler;
 
 end GPR;
--- gprbuild-17.0/src/gprbuild-post_compile.adb.old	2017-05-18 14:17:06.114797015 +0200
+++ gprbuild-17.0/src/gprbuild-post_compile.adb	2017-05-18 14:18:55.466956852 +0200
@@ -4744,7 +4744,9 @@
                                  No_Create => Proj.Is_Aggregated);
                            end if;
 
-                           Shared_Libs := not Is_Static (Proj.Proj);
+                           if not Is_Static (Proj.Proj) then
+                              Shared_Libs := True;
+                           end if;
 
                         end if;
                      end if;
--- gprbuild-gpl-2016-src/gpr/src/gpr-conf.adb.old	2017-09-12 21:29:25.945747949 +0200
+++ gprbuild-gpl-2016-src/gpr/src/gpr-conf.adb	2017-09-12 21:35:16.299101715 +0200
@@ -1839,6 +1839,16 @@
                end;
             end if;
 
+            Compiler_Root := First_Compiler_Root;
+            while Compiler_Root.Next /= null loop
+               Compiler_Root := Compiler_Root.Next;
+            end loop;
+            Compiler_Root.Next :=
+              new Compiler_Root_Data'
+                (Root => new String'("/usr"),
+                 Runtimes => null,
+                 Next => null);
+
             --  Now that the compiler roots are in a correct order, add the
             --  directories corresponding to these compiler roots in the
             --  project path.