gentoo-overlay/dev-ada/gnatcoll/files/gnatcoll-2016-gentoo.patch

--- gnatcoll-gpl-2016-src/Makefile.old	2017-01-20 19:39:07.131398270 +0100
+++ gnatcoll-gpl-2016-src/Makefile	2017-01-20 19:42:30.088728844 +0100
@@ -34,19 +36,19 @@
 	@${RM} src/gnatcoll-atomic.adb
 
 	@echo "====== Building $(@F) libraries ======"
-	${GPRBUILD} ${GPRBLD_OPTS} -Pgnatcoll_full
+	${GPRBUILD} ${GPRBLD_OPTS} -Pgnatcoll_full -cargs ${ADAFLAGS}
 
 	@# Need to build libgnatcoll_gtk separately, because its project files
 	@# requires gtkada.gpr, which might not exist on the machine.
 ifeq (${WITH_GTK},yes)
-	${GPRBUILD} ${GPRBLD_OPTS} -Psrc/gnatcoll_gtk
+	${GPRBUILD} ${GPRBLD_OPTS} -Psrc/gnatcoll_gtk -cargs ${ADAFLAGS}
 endif
 
 	@# Build the tools (the list is the project\'s Main attribute)
 	@# They are not build as part of the above because only the Main from
 	@# gnatcoll_full.gpr are build. We could use aggregate projects to
 	@# speed things up.
-	${GPRBUILD} ${GPRBLD_OPTS} -q -Psrc/gnatcoll_tools
+	${GPRBUILD} ${GPRBLD_OPTS} -q -Psrc/gnatcoll_tools -cargs ${ADAFLAGS}
 
 #######################################################################
 #  install
@@ -53,7 +53,7 @@
 #######################################################################
 #  install
 
-GPRINST_OPTS=-p -f --prefix=${prefix} --install-name=gnatcoll \
+GPRINST_OPTS=-p -f --prefix=$(DESTDIR)${prefix} --install-name=gnatcoll \
 	--exec-subdir=${bindir} --project-subdir=lib/gnat \
 	--build-var=LIBRARY_TYPE --build-name=$(@F) -XLIBRARY_TYPE=$(@F)
 
@@ -73,9 +73,9 @@
 	${GPRINSTALL} --mode=usage ${GPRINST_OPTS} -Psrc/gnatcoll_tools
 
 install_gps_plugin: force
-	mkdir -p $(prefix)/share/gps/plug-ins
+	mkdir -p $(DESTDIR)$(prefix)/share/gps/plug-ins
 	(cd distrib/ ; tar cf - gnatcoll) | \
-          (cd $(prefix)/share/gps/plug-ins ; tar xf -)
+          (cd $(DESTDIR)$(prefix)/share/gps/plug-ins ; tar xf -)
 
 # Regenerate part of the sources. Unfortunately, this can be run only after
 # we have build GNATCOLL, and then its tools, even though GNATCOLL itself
--- gnatcoll-gpl-2015-src/src/gnatcoll_gmp.gpr.in.old	2017-01-07 08:52:14.921110195 +0100
+++ gnatcoll-gpl-2015-src/src/gnatcoll_gmp.gpr.in	2017-01-07 08:55:35.718946607 +0100
@@ -24,6 +24,7 @@
 
    package Compiler is
       for Switches ("Ada") use Gnatcoll_Shared.Compiler'Switches ("Ada");
+      for Driver ("C") use External ("CC", "gcc");
       for Switches ("C") use Gnatcoll_Shared.Compiler'Switches ("C")
         & (@GMP_CFLAGS_GPR@);
    end Compiler;
--- gnatcoll-gpl-2015-src/src/gnatcoll_iconv.gpr.old	2017-01-07 08:58:01.361112843 +0100
+++ gnatcoll-gpl-2015-src/src/gnatcoll_iconv.gpr	2017-01-07 08:58:23.653687385 +0100
@@ -26,6 +26,7 @@
 
    package Compiler is
       for Switches ("Ada") use GnatColl_Shared.Compiler'Switches ("Ada");
+      for Driver ("C") use External ("CC", "gcc");
       for Switches ("C") use GnatColl_Shared.Compiler'Switches ("C")
           & GnatColl_Shared.Iconv_Include;
    end Compiler;
--- gnatcoll-gpl-2015-src/src/gnatcoll_sqlite.gpr.old	2017-01-07 09:00:17.146448202 +0100
+++ gnatcoll-gpl-2015-src/src/gnatcoll_sqlite.gpr	2017-01-07 09:00:44.884885281 +0100
@@ -60,8 +60,9 @@
 
                   --  force full optimization for sqlite, we do not debug it
                   --  in any case.
-                  "-O3") & Gnatcoll_Shared.Sqlite_Switches;
+                  "-O3", "-fPIC") & Gnatcoll_Shared.Sqlite_Switches;
       end case;
+      for Driver ("C") use External ("CC", "gcc");
    end Compiler;
 
    package Linker is
--- gnatcoll-gpl-2015-src/src/gnatcoll_postgres.gpr.old	2017-01-07 09:05:09.177756146 +0100
+++ gnatcoll-gpl-2015-src/src/gnatcoll_postgres.gpr	2017-01-07 09:05:34.282279733 +0100
@@ -38,6 +38,7 @@
            for Switches ("C") use
               GnatColl_Shared.Compiler'Switches ("C");
       end case;
+      for Driver ("C") use External ("CC", "gcc");
    end Compiler;
 
    package Linker is
--- gnatcoll-gpl-2015-src/src/gnatcoll_python.gpr.in.old	2017-01-07 09:12:30.490399897 +0100
+++ gnatcoll-gpl-2015-src/src/gnatcoll_python.gpr.in	2017-01-07 09:12:53.111976591 +0100
@@ -30,7 +30,8 @@
         GnatColl_Shared.Compiler'Switches ("Ada");
 
       for Switches ("C") use
-        ("-g", "-O2") & GnatColl_Shared.Python_Cflags;
+        ("-g", "-O2", "-fPIC") & GnatColl_Shared.Python_Cflags;
+      for Driver ("C") use External ("CC", "gcc");
    end Compiler;
 
    package Linker is
--- gnatcoll-gpl-2016-src/gnatcoll_shared.gpr.in.old	2017-01-20 19:50:03.222808656 +0100
+++ gnatcoll-gpl-2016-src/gnatcoll_shared.gpr.in	2017-01-20 19:50:28.200399274 +0100
@@ -13,7 +13,7 @@
 
    type Yes_No is ("yes", "no");
    Gtk    : Yes_No := External ("GTK", "@WITH_GTK@");
-   Python : Yes_No := External ("PYTHON", "@WITH_PYTHON@");
+   Python : Yes_No := "@WITH_PYTHON@";
    Syslog : Yes_No := External ("SYSLOG", "@WITH_SYSLOG@");
    Postgres : Yes_No := External ("POSTGRES", "@WITH_POSTGRES@");
    type Sqlite_Inclusion is ("yes", "no", "embedded");
@@ -67,7 +67,7 @@
 
          when "Production" =>
             for Switches ("Ada") use ("-O2", "-gnatn", "-gnatws");
-            for Switches ("C") use ("-O2", "-Wunreachable-code");
+            for Switches ("C") use ("-O2", "-Wunreachable-code", "-fPIC");
       end case;
 
       case Syslog is
--- gnatcoll-gpl-2016-src/src/gnatcoll_gtk.gpr.in.old	2017-01-20 19:53:16.647607400 +0100
+++ gnatcoll-gpl-2016-src/src/gnatcoll_gtk.gpr.in	2017-01-20 19:53:57.302925708 +0100
@@ -63,11 +63,12 @@
       for Switches ("Ada") use GnatColl_Shared.Compiler'Switches ("Ada");
 
       for Switches ("C") use
-        ("-g", "-O2")
+        ("-g", "-O2", "-fPIC")
         & GnatColl_Shared.Python_Cflags
         & GnatColl_Shared.Pygtk_Include
         & GnatColl_Shared.PyGobject_Include
         & Gtk_Include;
+      for Driver ("C") use External ("CC", "gcc");
    end Compiler;
 
    package Linker is
--- gnatcoll-gpl-2016-src/src/gnatcoll__libgpr.gpr.old	2017-02-04 15:56:11.685079607 +0100
+++ gnatcoll-gpl-2016-src/src/gnatcoll__libgpr.gpr	2017-02-04 15:57:00.383221978 +0100
@@ -49,6 +49,8 @@
    package Builder renames GnatColl_Shared.Builder;
 
    package Compiler is
+      for Driver ("C") use External ("CC", "gcc");
+
       for Switches ("Ada") use GnatColl_Shared.Compiler'Switches ("Ada");
       for Switches ("C") use GnatColl_Shared.Compiler'Switches ("C");
       for Switches ("sinfo.adb") use Compiler'Switches ("Ada") & ("-gnatg");
--- gnatcoll-gpl-2016-src/src/gnatcoll__nogpr.gpr.old	2017-02-04 15:58:41.008450044 +0100
+++ gnatcoll-gpl-2016-src/src/gnatcoll__nogpr.gpr	2017-02-04 15:59:02.815066080 +0100
@@ -64,6 +64,7 @@
       for Switches ("Ada") use GnatColl_Shared.Compiler'Switches ("Ada");
       for Switches ("C") use GnatColl_Shared.Compiler'Switches ("C");
       for Switches ("sinfo.adb") use Compiler'Switches ("Ada") & ("-gnatg");
+      for Driver ("C") use External ("CC", "gcc");
 
       case GnatColl_Shared.Atomics is
          when "intrinsic" =>
--- gnatcoll-gpl-2016-src/aclocal.m4.old	2017-04-06 08:25:14.796699365 +0200
+++ gnatcoll-gpl-2016-src/aclocal.m4	2017-04-06 08:25:36.622318016 +0200
@@ -45,7 +45,7 @@
    cat > conftest.ada <<EOF
 [$3]
 EOF
-   if AC_TRY_COMMAND([gnatchop -q conftest.ada && $1 $2 >/dev/null 2>conftest.out])
+   if AC_TRY_COMMAND([${GNATCHOP} -q conftest.ada && $1 $2 >/dev/null 2>conftest.out])
    then
       : Success
       $4
@@ -68,7 +68,7 @@
 AC_DEFUN(AM_HAS_INTRINSIC_SYNC_COUNTERS,
 [
   AC_MSG_CHECKING([whether platform supports atomic inc/dec])
-  AM_TRY_ADA([gnatmake], [check.adb],
+  AM_TRY_ADA([${GNATMAKE}], [check.adb],
 [
 with Interfaces; use Interfaces;
 procedure Check is