The unified diff between revisions [fe347ef4..] and [18e36adf..] is displayed below. It can also be downloaded as a raw diff.
#
#
# add_file "debian/gnade_odbc_example_installed.gpr"
# content [c658e7c5b0d205b93f56c8da65f90c0eb18e4400]
#
# add_file "debian/gnade_sqlite3_example_installed.gpr"
# content [2c61e5dce729702dbdbfd72f8f8bdf25983fee70]
#
# patch "debian/changelog"
# from [8f4121d63e59c6e2f4effc31d87360e2164a4642]
# to [a604a0d1ef707ce46e5a8b3149b03afe134cdfa0]
#
# patch "debian/gnade_common_build.gpr"
# from [7487a9151295fb81150139507653e2ae0dd17438]
# to [10a721d9911f9c9a3cbcd45698b893507d42cb84]
#
# patch "debian/gnade_odbc_build.gpr"
# from [9f5f5a47d15bce531758fbcd5d8daa85863982d1]
# to [9d0166974c513c7a91a4f5c4136bf5f27ed5ce38]
#
# patch "debian/gnade_odbc_example_build.gpr"
# from [86a8279b2e3c762144868876c1f38799c9c8127a]
# to [2776018328dee4251d7ad165916d4677d8f56f1c]
#
# patch "debian/gnade_sqlite3_build.gpr"
# from [111b415f96ec985c2715a7479429a3b9bab94427]
# to [8c3edc6c51719cbbad9fb739ef3cc9bf97fc73d1]
#
# patch "debian/gnade_sqlite3_example_build.gpr"
# from [0e7563026a58352889c9e26d59d9daaabdd7c242]
# to [bfc84f210db038c50a64b3e6f24e0807092a2f91]
#
# patch "debian/rules"
# from [79ef55bf8dfccc56a287df9530db82ca0098d73b]
# to [0d66aba89cd6f05945b13ea1e05e0b4d3f119e16]
#
============================================================
--- debian/gnade_odbc_example_installed.gpr c658e7c5b0d205b93f56c8da65f90c0eb18e4400
+++ debian/gnade_odbc_example_installed.gpr c658e7c5b0d205b93f56c8da65f90c0eb18e4400
@@ -0,0 +1,29 @@
+-- Build the odbc example with the installed libraries
+
+with "gnadecommon";
+with "gnadeodbc";
+project GNADE_ODBC_Example_Installed is
+
+ for Languages use ("Ada");
+ for Source_Dirs use ("tmp/odbc-example-src");
+ for Object_Dir use "tmp/odbc-example-obj";
+
+ for Main use ("demo.adb");
+
+ package Compiler is
+ Base_Switches :=
+ ("-g",
+ "-O2",
+ "-gnat05",
+ "-gnatfno",
+ "-gnatwa",
+ "-gnatVa");
+
+ for Default_Switches ("Ada") use Base_Switches;
+
+ end Compiler;
+
+ -- Note that we don't need any linker options here; 'with
+ -- gnadeodbc' pulls in libgnadeodbc.so and libodbc.
+
+end GNADE_ODBC_Example_Installed;
============================================================
--- debian/gnade_sqlite3_example_installed.gpr 2c61e5dce729702dbdbfd72f8f8bdf25983fee70
+++ debian/gnade_sqlite3_example_installed.gpr 2c61e5dce729702dbdbfd72f8f8bdf25983fee70
@@ -0,0 +1,27 @@
+-- Build the sqlite3 example with the installed libraries
+
+with "gnadecommon";
+with "gnadesqlite3";
+project GNADE_Sqlite3_Example_Installed is
+
+ for Languages use ("Ada");
+ for Source_Dirs use ("tmp/sqlite3-example-src");
+ for Object_Dir use "tmp/sqlite3-example-obj";
+
+ for Main use ("demo.adb");
+
+ package Compiler is
+ Base_Switches :=
+ ("-g",
+ "-O2",
+ "-gnat05",
+ "-gnaty",
+ "-gnatfno",
+ "-gnatwa",
+ "-gnatVa");
+
+ for Default_Switches ("Ada") use Base_Switches;
+
+ end Compiler;
+
+end GNADE_Sqlite3_Example_Installed;
============================================================
--- debian/changelog 8f4121d63e59c6e2f4effc31d87360e2164a4642
+++ debian/changelog a604a0d1ef707ce46e5a8b3149b03afe134cdfa0
@@ -1,5 +1,17 @@
+gnade (1.6.2-5) unstable; urgency=low
+
+ * debian/gnade_{common,odbc,sqlite3}_ref.gpr: delete -fstack-check from
+ compiler options; broken in gcc 4.4. Closes: #558980
+
+ * debian/rules: get soversion, aliversion from debian/control
+
+ * debian/gnade_{odbc, sqlite3}_example_installed.gpr: new, used in
+ running demos with installed packages.
+
+ -- Stephen Leake <stephen_leake@stephe-leake.org> Mon, 14 Dec 2009 17:02:46 -0500
+
gnade (1.6.2-4) unstable; urgency=low
-
+
* debian/gnade_{common,odbc,sqlite3}_ref.gpr: add Library_ALI_Dir;
fixes weird FTBFS on i386. Necessary anyway since the libraries
are not in the same place as the .ali files.
@@ -7,7 +19,7 @@ gnade (1.6.2-4) unstable; urgency=low
http://gcc.gnu.org/PR42073.
-- Ludovic Brenta <lbrenta@debian.org> Tue, 17 Nov 2009 00:09:10 +0100
-
+
gnade (1.6.2-3) unstable; urgency=low
* debian/rules: Install source, ali files in correct directories
============================================================
--- debian/gnade_common_build.gpr 7487a9151295fb81150139507653e2ae0dd17438
+++ debian/gnade_common_build.gpr 10a721d9911f9c9a3cbcd45698b893507d42cb84
@@ -34,8 +34,7 @@ project GNADE_Common_Build is
"-gnat05",
"-gnatfno",
"-gnatwa",
- "-gnatVa",
- "-fstack-check");
+ "-gnatVa");
end Compiler;
end GNADE_Common_Build;
============================================================
--- debian/gnade_odbc_build.gpr 9f5f5a47d15bce531758fbcd5d8daa85863982d1
+++ debian/gnade_odbc_build.gpr 9d0166974c513c7a91a4f5c4136bf5f27ed5ce38
@@ -40,8 +40,7 @@ project GNADE_ODBC_Build is
"-gnat05",
"-gnatfno",
"-gnatwa",
- "-gnatVa",
- "-fstack-check");
+ "-gnatVa");
for Default_Switches ("Ada") use Base_Switches;
============================================================
--- debian/gnade_odbc_example_build.gpr 86a8279b2e3c762144868876c1f38799c9c8127a
+++ debian/gnade_odbc_example_build.gpr 2776018328dee4251d7ad165916d4677d8f56f1c
@@ -14,8 +14,7 @@ project GNADE_ODBC_Example_Build is
"-gnat05",
"-gnatfno",
"-gnatwa",
- "-gnatVa",
- "-fstack-check");
+ "-gnatVa");
for Default_Switches ("Ada") use Base_Switches;
============================================================
--- debian/gnade_sqlite3_build.gpr 111b415f96ec985c2715a7479429a3b9bab94427
+++ debian/gnade_sqlite3_build.gpr 8c3edc6c51719cbbad9fb739ef3cc9bf97fc73d1
@@ -28,14 +28,13 @@ project GNADE_Sqlite3_Build is
for Library_Options use ("-lsqlite3");
package Compiler is
- for Default_Switches ("Ada") use
+ for Default_Switches ("Ada") use
("-g",
"-O2",
"-gnat05",
"-gnatfno",
"-gnatwa",
- "-gnatVa",
- "-fstack-check");
+ "-gnatVa");
end Compiler;
end GNADE_Sqlite3_Build;
============================================================
--- debian/gnade_sqlite3_example_build.gpr 0e7563026a58352889c9e26d59d9daaabdd7c242
+++ debian/gnade_sqlite3_example_build.gpr bfc84f210db038c50a64b3e6f24e0807092a2f91
@@ -16,8 +16,7 @@ project GNADE_Sqlite3_Example_Build is
"-gnaty",
"-gnatfno",
"-gnatwa",
- "-gnatVa",
- "-fstack-check");
+ "-gnatVa");
for Default_Switches ("Ada") use Base_Switches;
============================================================
--- debian/rules 79ef55bf8dfccc56a287df9530db82ca0098d73b
+++ debian/rules 0d66aba89cd6f05945b13ea1e05e0b4d3f119e16
@@ -35,15 +35,14 @@ include /usr/share/quilt/quilt.make
# We use gnatmake, not make, for parallel builds.
.NOTPARALLEL:
-# soversions change when the library API changes
-common_soversion := 1
-odbc_soversion := 2
-sqlite3_soversion := 2
+# get soversions, aliversions from debian/control
+common_soversion := $(shell sed -n -e "s/^Package: libgnadecommon\([0123456789]\+\)$$/\1/p" debian/control)
+odbc_soversion := $(shell sed -n -e "s/^Package: libgnadeodbc\([0123456789]\+\)$$/\1/p" debian/control)
+sqlite3_soversion := $(shell sed -n -e "s/^Package: libgnadesqlite3-\([0123456789]\+\)$$/\1/p" debian/control)
-# aliversions change when any ali file changes
-common_aliversion := 1
-odbc_aliversion := 1
-sqlite3_aliversion := 1
+common_aliversion := $(shell sed -n -e "s/^Package: libgnadecommon\(.\+\)-dev$$/\1/p" debian/control)
+odbc_aliversion := $(shell sed -n -e "s/^Package: libgnadeodbc\(.\+\)-dev$$/\1/p" debian/control)
+sqlite3_aliversion := $(shell sed -n -e "s/^Package: libgnadesqlite3-\(.\+\)-dev$$/\1/p" debian/control)
CPUS := $(shell getconf _NPROCESSORS_ONLN)