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
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
|
--- a/gps/Makefile 2018-07-09 20:27:34.950424490 +0200
+++ b/gps/Makefile 2018-07-09 20:37:39.510558817 +0200
@@ -47,7 +47,8 @@
for f in ../kernel/generated/*; do cat $$f | tr -d '\015' > $$f-aux; mv -f $$f-aux $$f; done
endif
$(GPRBUILD) $(GPRBUILD_FLAGS) -m -p -ws \
- $(GPRBUILD_BUILD_TYPE_FLAGS) -Pgps -largs `pkg-config gmodule-2.0 --libs`
+ $(GPRBUILD_BUILD_TYPE_FLAGS) -Pgps -largs `pkg-config gmodule-2.0 --libs` -lpython2.7 \
+ -cargs:Ada ${ADAFLAGS} -cargs:C ${CFLAGS}
resources:
ifeq ($(OS),Windows_NT)
--- a/Makefile.in 2018-07-09 21:51:08.422550386 +0200
+++ b/Makefile.in 2018-07-09 21:51:32.187225891 +0200
@@ -10,7 +10,7 @@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_DATA = @INSTALL_DATA@
GNATCOLL_INSTALL = @GNATCOLL_INSTALL@
-prefix = @prefix@
+prefix = $(DESTDIR)@prefix@
bindir = $(prefix)/bin
sharedir = $(prefix)/share
examplesdir = $(prefix)/share/examples/gps
--- a/docs/Makefile.in 2018-07-09 21:53:33.074572729 +0200
+++ b/docs/Makefile.in 2018-07-09 21:53:52.149311484 +0200
@@ -1,4 +1,4 @@
-prefix = @prefix@
+prefix = $(DESTDIR)@prefix@
docdir = $(prefix)/share/doc/gps
sharedir = $(prefix)/share/gps
--- a/share/support/core/toolchains.py 2018-07-11 12:15:18.758674244 +0200
+++ b/share/support/core/toolchains.py 2018-07-11 12:20:20.389220849 +0200
@@ -16,11 +16,11 @@
nullified by using an empty value in the corresponding tag
-->
<toolchain_default>
- <gnat_driver>gnat</gnat_driver>
- <gnat_list>gnatls</gnat_list>
+ <gnat_driver>@GNAT@</gnat_driver>
+ <gnat_list>@GNATLS@</gnat_list>
<debugger>gdb</debugger>
<cpp_filt>c++filt</cpp_filt>
- <compiler lang="ada">gnatmake</compiler>
+ <compiler lang="ada">@GNATMAKE@</compiler>
<compiler lang="c">gcc</compiler>
<compiler lang="c++">g++</compiler>
<compiler lang="asm">gcc</compiler>
--- a/share/support/core/projects.py 2018-07-11 13:49:29.631289680 +0200
+++ b/share/support/core/projects.py 2018-07-11 13:51:46.568252607 +0200
@@ -146,7 +146,7 @@
<string />
</index>
<specialized_index value="Ada">
- <choice default="true" >gnatmake</choice>
+ <choice default="true" >@GNATMAKE@</choice>
</specialized_index>
</project_attribute>
@@ -166,7 +166,7 @@
description="The gnatls command used to find where the Ada run time files are installed (including optional arguments, e.g. gnatls --RTS=sjlj)."
hide_in="all"
label="Gnatls">
- <choice default="true" >gnatls</choice>
+ <choice default="true" >@GNATLS@</choice>
<string />
</project_attribute>
@@ -178,7 +178,7 @@
description="The gnat driver used to run the various commands associated with the GNAT toolchain."
hide_in="all"
label="Gnat">
- <choice default="true" >gnat</choice>
+ <choice default="true" >@GNAT@</choice>
<string />
</project_attribute>
--- a/gnatcoll_extras/gnatcoll_extras.gpr 2018-07-22 14:42:17.618161040 +0200
+++ b/gnatcoll_extras/gnatcoll_extras.gpr 2018-07-22 14:43:33.973070921 +0200
@@ -14,6 +14,7 @@
for Switches ("C") use
("-g", "-O2")
& Shared.Gtk_Cflags & Shared.Pygobject_Include & Shared.Python_Cflags;
+ for Driver ("C") use External ("CC", "gcc");
end Compiler;
end GNATCOLL_Extras;
--- a/widgets/widgets.gpr 2018-07-22 21:46:23.907355738 +0200
+++ b/widgets/widgets.gpr 2018-07-22 21:47:02.673825994 +0200
@@ -14,6 +14,7 @@
for Switches ("C") use
("-g", "-O2")
& Shared.Gtk_Cflags;
+ for Driver ("C") use External ("CC", "gcc");
end Compiler;
end Widgets;
--- a/common/common.gpr.in 2018-07-25 08:05:45.227060250 +0200
+++ b/common/common.gpr.in 2018-07-25 08:06:55.067009811 +0200
@@ -23,6 +23,7 @@
for Switches ("dynamic_arrays.adb") use No_Checks;
when "Debug" =>
end case;
+ for Driver ("C") use External ("CC", "gcc");
end Compiler;
package Binder is
--- a/shared.gpr.in 2018-07-25 08:11:47.317597391 +0200
+++ b/shared.gpr.in 2018-07-25 08:10:56.774362671 +0200
@@ -60,6 +60,7 @@
);
for Switches ("C") use Optimize & ("-g", "-O2");
end case;
+ for Driver ("C") use External ("CC", "gcc");
end Compiler;
package Binder is
|
GitWeb