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
|
Description: in examples, require the same major version for Ada and C compilers
This cannot be forwarded because /usr/bin/gcc-MAJOR is specific to Debian.
Forwarded: not-needed
Author: Nicolas Boulenguez <nicolas@debian.org>
--- a/examples/ada_cpp/Makefile
+++ b/examples/ada_cpp/Makefile
@@ -2,8 +2,9 @@
gprbuild -Panimals $(GPRBUILDFLAGS)
gprbuild -Pexcept $(GPRBUILDFLAGS)
+gcc_major != gnatmake --version | sed 's/.* \([0-9]\+\).*/\1/;q'
default.cgpr:
- gprconfig --batch --config Ada --config C++
+ gprconfig --batch --config Ada --config C++,,,,g++-$(gcc_major)
clean: default.cgpr
gprclean -Panimals
--- a/examples/ada_f77/Makefile
+++ b/examples/ada_f77/Makefile
@@ -1,8 +1,9 @@
all: default.cgpr
gprbuild -p -Pft $(GPRBUILDFLAGS)
+gcc_major != gnatmake --version | sed 's/.* \([0-9]\+\).*/\1/;q'
default.cgpr:
- gprconfig --batch --config Ada --config Fortran
+ gprconfig --batch --config Ada --config ,,,,gfortran-$(gcc_major)
clean: default.cgpr
gprclean -r -Pft
--- a/examples/first_steps/Makefile
+++ b/examples/first_steps/Makefile
@@ -2,8 +2,9 @@
gprbuild -p -Pc_main $(GPRBUILDFLAGS)
gprbuild -p -Pada_main $(GPRBUILDFLAGS)
+gcc_major != gnatmake --version | sed 's/.* \([0-9]\+\).*/\1/;q'
default.cgpr:
- gprconfig --batch --config Ada --config C
+ gprconfig --batch --config Ada --config C,,,,gcc-$(gcc_major)
clean: default.cgpr
gprclean -Pc_main
--- a/examples/libraries/Makefile
+++ b/examples/libraries/Makefile
@@ -5,8 +5,9 @@
gprbuild -p -Pmain3 $(GPRBUILDFLAGS)
gprbuild -p -Pmain4 $(GPRBUILDFLAGS)
+gcc_major != gnatmake --version | sed 's/.* \([0-9]\+\).*/\1/;q'
default.cgpr:
- gprconfig --batch --config Ada --config C
+ gprconfig --batch --config Ada --config C,,,,gcc-$(gcc_major)
clean: default.cgpr
gprclean -r -Pmain0
--- a/examples/matrix/Makefile
+++ b/examples/matrix/Makefile
@@ -1,8 +1,9 @@
all: default.cgpr
gprbuild -p -Pmatrix $(GPRBUILDFLAGS)
+gcc_major != gnatmake --version | sed 's/.* \([0-9]\+\).*/\1/;q'
default.cgpr:
- gprconfig --batch --config Ada --config C --config Fortran
+ gprconfig --batch --config Ada --config C,,,,gcc-$(gcc_major) --config Fortran,,,,gfortran-$(gcc_major)
clean: default.cgpr
gprclean -Pmatrix
--- a/examples/namings/Makefile
+++ b/examples/namings/Makefile
@@ -3,8 +3,9 @@
gprbuild -p -Pnamings -XC1=case2 $(GPRBUILDFLAGS)
gprbuild -p -Pnamings -XC1=case3 $(GPRBUILDFLAGS)
+gcc_major != gnatmake --version | sed 's/.* \([0-9]\+\).*/\1/;q'
default.cgpr:
- gprconfig --batch --config Ada --config C
+ gprconfig --batch --config Ada --config C,,,,gcc-$(gcc_major)
clean: default.cgpr
gprclean -Pnamings -XC1=case1
--- a/examples/scenarios/Makefile
+++ b/examples/scenarios/Makefile
@@ -3,8 +3,9 @@
gprbuild -p -Pmain -XLIB=dynamic $(GPRBUILDFLAGS)
+gcc_major != gnatmake --version | sed 's/.* \([0-9]\+\).*/\1/;q'
default.cgpr:
- gprconfig --batch --config Ada --config C
+ gprconfig --batch --config Ada --config C,,,,gcc-$(gcc_major)
clean: default.cgpr
gprclean -r -Pmain -XLIB=static
--- a/examples/subsystems/Makefile
+++ b/examples/subsystems/Makefile
@@ -2,8 +2,9 @@
gprbuild -p -Pc_main $(GPRBUILDFLAGS)
gprbuild -p -Pada_main $(GPRBUILDFLAGS)
+gcc_major != gnatmake --version | sed 's/.* \([0-9]\+\).*/\1/;q'
default.cgpr:
- gprconfig --batch --config Ada --config C
+ gprconfig --batch --config Ada --config C,,,,gcc-$(gcc_major)
clean: default.cgpr
gprclean -r -Pc_main
|