The unified diff between revisions [c9f346c2..] and [bd016fa4..] is displayed below. It can also be downloaded as a raw diff.
This diff has been restricted to the following files: 'debian/gnade_odbc_build.gpr'
#
#
# patch "debian/gnade_odbc_build.gpr"
# from [ff7ace60d6c4fe4a6f4c74b0438971b0f5200a1e]
# to [880521012c75c4047de599758437db2a6de49a4d]
#
============================================================
--- debian/gnade_odbc_build.gpr ff7ace60d6c4fe4a6f4c74b0438971b0f5200a1e
+++ debian/gnade_odbc_build.gpr 880521012c75c4047de599758437db2a6de49a4d
@@ -8,16 +8,31 @@ project GNADE_ODBC_Build is
Libtype : Lib_Type := external ("LIBTYPE");
for Languages use ("Ada");
+
+ -- We we only need gnu.ads, gnu-db.ads from ../support; the rest
+ -- of the files in ../support go in libgnadecommon, which we don't
+ -- need otherwise. However, if we don't depend on
+ -- gnade_common_ref, there would be two packages installing
+ -- gnu.ads, gnu-db.ads. That's a problem when one package is
+ -- removed without the other. We also need libgnadecommon to
+ -- install gnade.gpr.
+ --
+ -- So we just ignore the warning from dh_shlibdeps about the
+ -- useless dependency on libgnadecommon.
for Source_Dirs use ("../dbi/odbc", "tmp/odbc-prep");
+ for Library_Dir use "tmp";
for Object_Dir use "tmp/odbc-" & Libtype;
for Library_Name use "gnadeodbc";
- for Library_Dir use "tmp";
for Library_Kind use Libtype;
-- Library_Version is not used when Library_Kind is "static"
for Library_Version use "libgnadeodbc.so." & Soversion;
+ -- We want libgnadeodbc.so to contain a dynamic link to libodbc,
+ -- so dh_shlibdeps will create the correct package dependencies.
+ for Library_Options use ("-lodbc");
+
package Compiler is
Base_Switches :=
("-g",