diff options
Diffstat (limited to 'dev-ada/gnatcoll')
-rw-r--r-- | dev-ada/gnatcoll/Manifest | 7 | ||||
-rw-r--r-- | dev-ada/gnatcoll/files/gnatcoll-2016-gentoo.patch | 333 | ||||
-rw-r--r-- | dev-ada/gnatcoll/files/gnatcoll-2017-gentoo.patch | 169 | ||||
-rw-r--r-- | dev-ada/gnatcoll/gnatcoll-2016.ebuild | 129 | ||||
-rw-r--r-- | dev-ada/gnatcoll/gnatcoll-2017.ebuild | 32 |
5 files changed, 51 insertions, 619 deletions
diff --git a/dev-ada/gnatcoll/Manifest b/dev-ada/gnatcoll/Manifest index 829505901c9a..11bd5f56b0ce 100644 --- a/dev-ada/gnatcoll/Manifest +++ b/dev-ada/gnatcoll/Manifest @@ -1,7 +1,4 @@ -AUX gnatcoll-2016-gentoo.patch 14137 BLAKE2B 9e3c7086a4ecce79dbb7d2c21f5d97b46bf30c7665b416c0266ed59610886192b2931dde20b3ed605bdcfd5587125755acc229a1739ace97e1a6138a9a30710c SHA512 641da348023eedb141e555148056e591af09ef31954178c128a4627bff80777e3e274663bdc4ea712afc10cd902efb186a0bba9b03b7f67f6655944af83ff8d0 -AUX gnatcoll-2017-gentoo.patch 10577 BLAKE2B 02d129052b0b10429ce8e003b0a0759a547884f92d67b0018170f8d2e8719cf22da1f277f9568673006e8f7abdb4759ec37626e3b4260d343f5560e479f0c729 SHA512 bf61075b9ce327b37d01f36d8fcb38f6f2e197167abb02a1dee9a96d456a710c986ed079a40e07edceb280281f8c8465315f09e5a0e3b880f3db44371ae3efef -DIST gnatcoll-gpl-2016-src.tar.gz 5687584 BLAKE2B 0ff5489f3e02ceeb44292f0d13907959884a55ec8f00fcadb21ee4e8a07f863a3bae3c7ae18d3fc669895a76b5f8f495699d31af71940a5abd32b156ad5fe247 SHA512 8cf06e7c5d58d3b159855534791e7969882e04856ba9d03982a63dcfc630f5b5910c6cad57fec9b00c3d04008b0cb0a1fb238e349766348fa4548868238ede8a +AUX gnatcoll-2017-gentoo.patch 5731 BLAKE2B 392f9cd7f76b835c03646a52eb651bad4094f7ebb51f36a1168ce36b5ab9ff29f287437aa9fd9f2f1a5351f4ee04dbd3a21ea096f0e918d1c61b5822c14c552c SHA512 d15a05823419e763e96cc8d8c8202cac30511d555413fa9b45a79275b5325dda53271b7dbb2cc3a7d1583269b32738a82f3adcb0282bdee4588247c9e8b32e12 DIST gnatcoll-gpl-2017-src.tar.gz 5785988 BLAKE2B 828aff797f7d992bf3f5dda7f8ce8a79e97ecd98253a657fb6e79a2fd08aac97e19cb421f47010f8c1f26442a013b9126ab3a95353d9ce0f29d071601e9dfe2f SHA512 e8b7f2c00816597f33496168bf8928841a2037e517908810761849e23633b2c229d47e4bfaa808e5a619da52bc165f17b8aefa5dee39ecf1a6773b3b1db80363 -EBUILD gnatcoll-2016.ebuild 3054 BLAKE2B 7a0bbdff620eba5c2fa4d5741bc16af0e0a041350480740f6c3f3950f853f62ccf1373c11c98d21a290fbcb6b767713fbcb360ec8f59cdb634d1b791f8644284 SHA512 0d86e9b77320282b2c3044bda968465abc1157e114c113ae891776aa0f480c62158f2d7ad94cee2b77b570a4c89440d5b7863c18403886b9b509d88d80652f25 -EBUILD gnatcoll-2017.ebuild 3182 BLAKE2B 7bed5c75933d402a26f62f83922df50ab786980ce80059abf833f0ceab9f9e421c257a84ef5f9c5cafc506b22e7c29d2f158d20c1653e3c72a1286668025cec4 SHA512 a1a8fb749a8df6276b33c19063ea9e5d59543e8abf1fea7ec32725ba00166aed1d11ddb77b9d5322a05da6522c45cba6730602b1902c5ebdf79cd05467c6e682 +EBUILD gnatcoll-2017.ebuild 3176 BLAKE2B b271efb01c404f10f97b247300d1157fc873ac60cd6abe335fb68c84de60bc16cf433da1b73a21cb1462d2219b550acf0e1e1282e749f4f3e6f7171f63fa0d44 SHA512 8a4a005d7bb43b15873744a2de1b19dbb6e318d257fab99429e36f181337b3bf9ab73f0e0b29d331a099549d50fc9e38f7192ecbd9338f85cc0af7230f1947da MISC metadata.xml 1362 BLAKE2B 0660675cc1821ffb20a9a80bce768db18252bf049f6f52cf3389a7681cc4a31b040350008e6477a2259c8faba5689525586cd35cdf4bcb9df298941021c5a0bd SHA512 64620ff6da6c812968ac057a3724b9733d4d14e1cacd654bf750efe33f64910ae74da07bbca0d6996f58405c083636e574f1b93958d0fe4447e1896ded2b3940 diff --git a/dev-ada/gnatcoll/files/gnatcoll-2016-gentoo.patch b/dev-ada/gnatcoll/files/gnatcoll-2016-gentoo.patch deleted file mode 100644 index 1a1d4d14eec2..000000000000 --- a/dev-ada/gnatcoll/files/gnatcoll-2016-gentoo.patch +++ /dev/null @@ -1,333 +0,0 @@ ---- 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 ---- 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 ---- gnatcoll-gpl-2016-src/testsuite/json/__init__.py.old 2017-04-24 17:52:34.158513249 +0200 -+++ gnatcoll-gpl-2016-src/testsuite/json/__init__.py 2017-04-24 17:52:52.636207017 +0200 -@@ -21,7 +21,7 @@ - @requires_not_aix # Storage_Error on that machine - @chdir("MB28-001") - def test_MB28_001(self): -- self.runexec(["python", "make_json.py"]) -+ self.runexec(["python2.7", "make_json.py"]) - self.gprbuild() - self.runexec("json_stack_test", "test.out") - ---- gnatcoll-gpl-2016-src/testsuite/projects/aggregate_create/c1/c.gpr.old 2017-04-24 18:00:21.652975475 +0200 -+++ gnatcoll-gpl-2016-src/testsuite/projects/aggregate_create/c1/c.gpr 2017-04-24 18:01:23.035983670 +0200 -@@ -15,6 +15,7 @@ - for Default_Switches ("ada") use
- ("-g", "-gnatQ", "-O1", "-gnatf", "-gnato", "-gnatwa.Xe", "-gnaty");
- for Switches ("c") use ("-fdump-xref");
-+ for Driver ("c") use External ("CC", "gcc");
- end Compiler;
-
- end c;
---- gnatcoll-gpl-2016-src/testsuite/projects/aggregate_create/c2/c.gpr.old 2017-04-24 18:01:28.394896928 +0200 -+++ gnatcoll-gpl-2016-src/testsuite/projects/aggregate_create/c2/c.gpr 2017-04-24 18:01:44.343638682 +0200 -@@ -15,6 +15,7 @@ - for Default_Switches ("ada") use
- ("-g", "-gnatQ", "-O1", "-gnatf", "-gnato", "-gnatwa.Xe", "-gnaty");
- for Switches ("C") use ("-fdump-xref");
-+ for Driver ("C") use External ("CC", "gcc");
- end Compiler;
-
- end c;
---- gnatcoll-gpl-2016-src/testsuite/projects/__init__.py.old 2017-04-24 19:10:30.465246199 +0200 -+++ gnatcoll-gpl-2016-src/testsuite/projects/__init__.py 2017-04-24 19:10:42.768035080 +0200 -@@ -105,25 +105,6 @@ - self.gprbuild("default.gpr") - self.runexec("main", "") - -- @support.requires_not_windows -- @chdir("N918-040") -- def test_bareboard(self): -- self.create_fake_bb_compiler('install', 'arm-eabi', '6.1.0w', '3.4.6') -- -- # Make sure auto.cgpr is not deleted on exit -- try: -- os.unlink('auto.cgpr') -- except: -- pass -- self.gprbuild('main_prj', switches=['--autoconf=auto.cgpr']) -- m = re.search('for Target use "(.*?)"', open('auto.cgpr').read()) -- target = m.group(1) -- -- def customFilter(actual): -- return actual.replace(target, "<native>") -- -- self.runexec(['sh', 'test.sh'], 'test.out', customFilter=customFilter) -- - @chdir("NB12-045") - def test_NB12_045(self): - # Test registering attribute in unknown package ---- gnatcoll-gpl-2016-src/testsuite/xref/tabs/default.gpr.old 2017-04-24 20:01:55.535913959 +0200 -+++ gnatcoll-gpl-2016-src/testsuite/xref/tabs/default.gpr 2017-04-24 20:02:51.740950192 +0200 -@@ -1,3 +1,6 @@ - project Default is - for Languages use ("Ada", "C"); -+ package Compiler is -+ for Driver ("C") use External ("CC", "gcc"); -+ end Compiler; - end Default; ---- gnatcoll-gpl-2016-src/testsuite/xref/doc1/dummy.gpr.old 2017-04-24 20:04:12.012574064 +0200 -+++ gnatcoll-gpl-2016-src/testsuite/xref/doc1/dummy.gpr 2017-04-24 20:04:54.025853974 +0200 -@@ -6,4 +6,7 @@ - for Body_Suffix ("c++") use ".cc"; - end Naming; - -+ package Compiler is -+ for Driver ("C") use External ("CC", "gcc"); -+ end Compiler; - end Dummy; ---- gnatcoll-gpl-2016-src/testsuite/xref/cpp_ref3/default.gpr.old 2017-04-24 20:08:06.018564544 +0200 -+++ gnatcoll-gpl-2016-src/testsuite/xref/cpp_ref3/default.gpr 2017-04-24 20:08:53.682748215 +0200 -@@ -1,3 +1,7 @@ - project Default is - for Languages use ("C"); -+ -+ package Compiler is -+ for Driver ("C") use External ("CC", "gcc"); -+ end Compiler; - end Default; ---- gnatcoll-gpl-2016-src/testsuite/xref/cpp_ref2/default.gpr.old 2017-04-24 20:10:00.146610101 +0200 -+++ gnatcoll-gpl-2016-src/testsuite/xref/cpp_ref2/default.gpr 2017-04-24 20:10:40.512919251 +0200 -@@ -1,3 +1,7 @@ - project Default is - for Languages use ("C"); -+ -+ package Compiler is -+ for Driver ("C") use External ("CC", "gcc"); -+ end COmpiler; - end Default; ---- gnatcoll-gpl-2016-src/testsuite/xref/cpp_ref1/default.gpr.old 2017-04-24 20:13:28.543059408 +0200 -+++ gnatcoll-gpl-2016-src/testsuite/xref/cpp_ref1/default.gpr 2017-04-24 20:14:05.513430176 +0200 -@@ -1,3 +1,7 @@ - project Default is - for Languages use ("C"); -+ -+ package Compiler is -+ for Driver ("C") use External ("CC", "gcc"); -+ end Compiler; - end Default; ---- gnatcoll-gpl-2016-src/testsuite/xref/cpp_expr1/default.gpr.old 2017-04-24 20:15:26.420053157 +0200 -+++ gnatcoll-gpl-2016-src/testsuite/xref/cpp_expr1/default.gpr 2017-04-24 20:16:12.695265558 +0200 -@@ -1,3 +1,6 @@ - project Default is - for Languages use ("C"); -+ package Compiler is -+ for Driver ("C") use External ("CC", "gcc"); -+ end Compiler; - end Default; ---- gnatcoll-gpl-2016-src/testsuite/xref/cpp_enum/dummy.gpr.old 2017-04-24 20:16:53.562570024 +0200 -+++ gnatcoll-gpl-2016-src/testsuite/xref/cpp_enum/dummy.gpr 2017-04-24 20:17:32.086914323 +0200 -@@ -4,4 +4,7 @@ - for Spec_Suffix ("c++") use ".h"; - for Body_Suffix ("c++") use ".cc"; - end Naming; -+ package Compiler is -+ for Driver ("c") use External ("CC", "gcc"); -+ end Compiler; - end Dummy; ---- gnatcoll-gpl-2016-src/testsuite/xref/cpp_dbi_error/dummy.gpr.old 2017-04-24 20:18:03.688376474 +0200 -+++ gnatcoll-gpl-2016-src/testsuite/xref/cpp_dbi_error/dummy.gpr 2017-04-24 20:18:52.761541251 +0200 -@@ -1,3 +1,6 @@ - project Dummy is - for Languages use ("c"); -+ package Compiler is -+ for Driver ("c") use External ("CC", "gcc"); -+ end Compiler; - end Dummy; ---- gnatcoll-gpl-2016-src/testsuite/xref/L821-017-import/default.gpr.old 2017-04-24 20:19:40.401730504 +0200 -+++ gnatcoll-gpl-2016-src/testsuite/xref/L821-017-import/default.gpr 2017-04-24 20:22:52.303465944 +0200 -@@ -4,5 +4,6 @@ - package Compiler is - for Switches ("C") use ("-fsyntax-only", "-fdump-xref"); - for Switches ("C++") use ("-fsyntax-only", "-fdump-xref"); -+ for Driver ("C") use External ("CC", "gcc"); - end Compiler; - end Default; ---- gnatcoll-gpl-2016-src/testsuite/xref/E224-007-change_obj_dir-c/default.gpr.old 2017-04-24 20:31:02.679123516 +0200 -+++ gnatcoll-gpl-2016-src/testsuite/xref/E224-007-change_obj_dir-c/default.gpr 2017-04-24 20:31:42.515445784 +0200 -@@ -8,4 +8,7 @@ - when "release" => for Object_Dir use "obj1"; - when "debug" => for Object_Dir use "obj2"; - end case; -+ package Compiler is -+ for Driver ("C") use External ("CC", "gcc"); -+ end Compiler; - end Default; ---- gnatcoll-gpl-2016-src/testsuite/xref/I401-027/default.gpr.old 2017-04-24 20:32:45.175379776 +0200 -+++ gnatcoll-gpl-2016-src/testsuite/xref/I401-027/default.gpr 2017-04-24 20:33:16.130853112 +0200 -@@ -7,6 +7,7 @@ - package Compiler is - for Default_Switches ("Ada") use ("-gnatws"); - for Default_Switches ("C") use ("-fdump-xref"); -+ for Driver ("C") use External ("CC", "gcc"); - end Compiler; - - end Default; ---- gnatcoll-gpl-2016-src/src/tools/gnatcoll_db2ada.adb.old 2017-04-24 21:36:09.193973179 +0200 -+++ gnatcoll-gpl-2016-src/src/tools/gnatcoll_db2ada.adb 2017-04-24 21:36:16.029858932 +0200 -@@ -211,7 +211,7 @@ - - declare - Output : constant String := Get_Command_Output -- (Command => "python", -+ (Command => "python2.7", - Arguments => Args, - Input => "", - Status => Status'Access, diff --git a/dev-ada/gnatcoll/files/gnatcoll-2017-gentoo.patch b/dev-ada/gnatcoll/files/gnatcoll-2017-gentoo.patch index ecec0b784589..36da82626f4c 100644 --- a/dev-ada/gnatcoll/files/gnatcoll-2017-gentoo.patch +++ b/dev-ada/gnatcoll/files/gnatcoll-2017-gentoo.patch @@ -1,63 +1,45 @@ ---- 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 -@@ -49,12 +49,12 @@ +--- a/Makefile 2017-01-20 19:39:07.131398270 +0100 ++++ b/Makefile 2017-01-20 19:42:30.088728844 +0100 +@@ -43,18 +43,18 @@ + + # Build either type of library. The argument (%) is the type of library to build + +-GPRBLD_OPTS=-p -m -j${PROCESSORS} -XLIBRARY_TYPE=$(@F) -XGnatcoll_Build=${Gnatcoll_Build} -XXMLADA_BUILD=$(@F) ++GPRBLD_OPTS=-p -m -j${PROCESSORS} -XGPR_BUILD=$(@F) -XLIBRARY_TYPE=$(@F) -XGnatcoll_Build=${Gnatcoll_Build} -XXMLADA_BUILD=$(@F) + + build_library_type/%: generate_sources @${RM} src/gnatcoll-atomic.adb @echo "====== Building $(@F) libraries ======" - ${GPRBUILD} ${GPRBLD_OPTS} -Pgnatcoll_full -+ ${GPRBUILD} ${GPRBLD_OPTS} -Pgnatcoll_full -cargs ${ADAFLAGS} ++ ${GPRBUILD} ${GPRBLD_OPTS} -Pgnatcoll_full -v -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} ++ ${GPRBUILD} ${GPRBLD_OPTS} -Psrc/gnatcoll_gtk -v -cargs ${ADAFLAGS} endif build_tools/%: build_library_type/% -@@ -63,7 +63,7 @@ +@@ -63,13 +63,14 @@ @# 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} ++ ${GPRBUILD} ${GPRBLD_OPTS} -q -Psrc/gnatcoll_tools -v -cargs ${ADAFLAGS} ####################################################################### # install ---- 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 ("GCC", "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 @@ + GPRINST_OPTS=-p -f --prefix=${prefix} --install-name=gnatcoll \ + --exec-subdir=${bindir} --project-subdir=lib/gnat -XXMLADA_BUILD=$(@F) \ ++ -XGPR_BUILD=$(@F) \ + --build-var=LIBRARY_TYPE --build-name=$(@F) -XLIBRARY_TYPE=$(@F) - -- force full optimization for sqlite, we do not debug it - -- in any case. - "-O3") & Gnatcoll_Shared.Sqlite_Switches; - end case; -+ for Driver ("C") use External ("GCC", "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 ("GCC", "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 + install-clean: +--- a/gnatcoll_shared.gpr.in 2017-01-20 19:50:03.222808656 +0100 ++++ b/gnatcoll_shared.gpr.in 2017-01-20 19:50:28.200399274 +0100 @@ -13,7 +13,7 @@ type Yes_No is ("yes", "no"); @@ -67,29 +49,8 @@ Syslog : Yes_No := External ("SYSLOG", "@WITH_SYSLOG@"); Postgres : Yes_No := External ("POSTGRES", "@WITH_POSTGRES@"); type Sqlite_Inclusion is ("yes", "no", "embedded"); ---- 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 ("GCC", "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 ("GCC", "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 +--- a/aclocal.m4 2017-04-06 08:25:14.796699365 +0200 ++++ b/aclocal.m4 2017-04-06 08:25:36.622318016 +0200 @@ -45,7 +45,7 @@ cat > conftest.ada <<EOF [$3] @@ -108,8 +69,8 @@ [ with Interfaces; use Interfaces; procedure Check is ---- gnatcoll-gpl-2016-src/testsuite/json/__init__.py.old 2017-04-24 17:52:34.158513249 +0200 -+++ gnatcoll-gpl-2016-src/testsuite/json/__init__.py 2017-04-24 17:52:52.636207017 +0200 +--- a/testsuite/json/__init__.py 2017-04-24 17:52:34.158513249 +0200 ++++ b/testsuite/json/__init__.py 2017-04-24 17:52:52.636207017 +0200 @@ -21,7 +21,7 @@ @requires_not_aix # Storage_Error on that machine @chdir("MB28-001") @@ -119,26 +80,8 @@ self.gprbuild() self.runexec("json_stack_test", "test.out") ---- gnatcoll-gpl-2016-src/testsuite/projects/aggregate_create/c1/c.gpr.old 2017-04-24 18:00:21.652975475 +0200 -+++ gnatcoll-gpl-2016-src/testsuite/projects/aggregate_create/c1/c.gpr 2017-04-24 18:01:23.035983670 +0200 -@@ -15,5 +15,6 @@ - for Default_Switches ("ada") use
- ("-g", "-gnatQ", "-O1", "-gnatf", "-gnato", "-gnatwa.Xe", "-gnaty");
-+ for Driver ("c") use External ("GCC", "gcc");
- end Compiler;
-
- end c;
---- gnatcoll-gpl-2016-src/testsuite/projects/aggregate_create/c2/c.gpr.old 2017-04-24 18:01:28.394896928 +0200 -+++ gnatcoll-gpl-2016-src/testsuite/projects/aggregate_create/c2/c.gpr 2017-04-24 18:01:44.343638682 +0200 -@@ -15,5 +15,6 @@ - for Default_Switches ("ada") use
- ("-g", "-gnatQ", "-O1", "-gnatf", "-gnato", "-gnatwa.Xe", "-gnaty");
-+ for Driver ("C") use External ("GCC", "gcc");
- end Compiler;
-
- end c;
---- gnatcoll-gpl-2016-src/testsuite/projects/__init__.py.old 2017-04-24 19:10:30.465246199 +0200 -+++ gnatcoll-gpl-2016-src/testsuite/projects/__init__.py 2017-04-24 19:10:42.768035080 +0200 +--- a/testsuite/projects/__init__.py 2017-04-24 19:10:30.465246199 +0200 ++++ b/testsuite/projects/__init__.py 2017-04-24 19:10:42.768035080 +0200 @@ -105,25 +105,6 @@ self.gprbuild("default.gpr") self.runexec("main", "") @@ -165,27 +108,8 @@ @chdir("NB12-045") def test_NB12_045(self): # Test registering attribute in unknown package ---- gnatcoll-gpl-2016-src/testsuite/xref/tabs/default.gpr.old 2017-04-24 20:01:55.535913959 +0200 -+++ gnatcoll-gpl-2016-src/testsuite/xref/tabs/default.gpr 2017-04-24 20:02:51.740950192 +0200 -@@ -1,3 +1,6 @@ - project Default is - for Languages use ("Ada", "C"); -+ package Compiler is -+ for Driver ("C") use External ("GCC", "gcc"); -+ end Compiler; - end Default; ---- gnatcoll-gpl-2016-src/testsuite/xref/doc1/dummy.gpr.old 2017-04-24 20:04:12.012574064 +0200 -+++ gnatcoll-gpl-2016-src/testsuite/xref/doc1/dummy.gpr 2017-04-24 20:04:54.025853974 +0200 -@@ -6,4 +6,7 @@ - for Body_Suffix ("c++") use ".cc"; - end Naming; - -+ package Compiler is -+ for Driver ("C") use External ("GCC", "gcc"); -+ end Compiler; - end Dummy; ---- gnatcoll-gpl-2016-src/src/tools/gnatcoll_db2ada.adb.old 2017-04-24 21:36:09.193973179 +0200 -+++ gnatcoll-gpl-2016-src/src/tools/gnatcoll_db2ada.adb 2017-04-24 21:36:16.029858932 +0200 +--- a/src/tools/gnatcoll_db2ada.adb 2017-04-24 21:36:09.193973179 +0200 ++++ b/src/tools/gnatcoll_db2ada.adb 2017-04-24 21:36:16.029858932 +0200 @@ -211,7 +211,7 @@ declare @@ -195,35 +119,8 @@ Arguments => Args, Input => "", Status => Status'Access, ---- gnatcoll-gpl-2017-src/src/gnatcoll_python.gpr.old 2017-06-24 18:06:19.702063079 +0200 -+++ gnatcoll-gpl-2017-src/src/gnatcoll_python.gpr 2017-06-24 18:05:04.276103652 +0200 -@@ -60,6 +60,7 @@ - - for Switches ("C") use -- ("-g", "-O2") & GnatColl_Shared.Python_Cflags; -+ ("-g", "-O2", "-fPIC") & GnatColl_Shared.Python_Cflags; -+ for Driver ("C") use External ("GCC", "gcc"); - end Compiler; - - package Linker is ---- gnatcoll-gpl-2017-src/src/gnatcoll_gtk.gpr.old 2017-06-24 18:37:22.164631219 +0200 -+++ gnatcoll-gpl-2017-src/src/gnatcoll_gtk.gpr 2017-06-24 18:37:55.763186201 +0200 -@@ -71,11 +71,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 ("GCC", "gcc"); - end Compiler; - - package Linker is ---- gnatcoll-gpl-2017-src/src/gnatcoll-projects.ads.old 2017-11-25 14:50:06.919939453 +0100 -+++ gnatcoll-gpl-2017-src/src/gnatcoll-projects.ads 2017-11-25 14:50:38.932387204 +0100 +--- a/src/gnatcoll-projects.ads 2017-11-25 14:50:06.919939453 +0100 ++++ b/src/gnatcoll-projects.ads 2017-11-25 14:50:38.932387204 +0100 @@ -1917,7 +1917,8 @@ Predefined_Source_Files : GNATCOLL.VFS.File_Array_Access; -- The list of source files in Predefined_Source_Path @@ -234,8 +131,8 @@ -- The default gnatls command to run. Xrefs_Subdir : GNAT.Strings.String_Access; ---- gnatcoll-gpl-2017-src/src/tools/gnatinspect.adb.old 2017-11-25 14:52:47.282170250 +0100 -+++ gnatcoll-gpl-2017-src/src/tools/gnatinspect.adb 2017-11-25 14:52:57.691990254 +0100 +--- a/src/tools/gnatinspect.adb 2017-11-25 14:52:47.282170250 +0100 ++++ b/src/tools/gnatinspect.adb 2017-11-25 14:52:57.691990254 +0100 @@ -642,7 +642,7 @@ GNAT_Version : GNAT.Strings.String_Access; begin diff --git a/dev-ada/gnatcoll/gnatcoll-2016.ebuild b/dev-ada/gnatcoll/gnatcoll-2016.ebuild deleted file mode 100644 index 7f73bf715c62..000000000000 --- a/dev-ada/gnatcoll/gnatcoll-2016.ebuild +++ /dev/null @@ -1,129 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -PYTHON_COMPAT=( python2_7 ) -inherit multilib multiprocessing autotools python-single-r1 - -MYP=${PN}-gpl-${PV} - -DESCRIPTION="GNAT Component Collection" -HOMEPAGE="http://libre.adacore.com" -SRC_URI="http://mirrors.cdn.adacore.com/art/5739942ac7a447658d00e1e7 - -> ${MYP}-src.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="gmp +gnat_2016 gnat_2017 gtk iconv postgres pygobject projects readline - +shared sqlite static-libs syslog tools" - -RDEPEND="gnat_2016? ( dev-lang/gnat-gpl:4.9.4 ) - gnat_2017? ( dev-lang/gnat-gpl:6.3.0 ) - ${PYTHON_DEPS} - gmp? ( dev-libs/gmp:* ) - gtk? ( - dev-ada/gtkada[gnat_2016=,gnat_2017=,shared?,static-libs?] - dev-libs/atk - dev-libs/glib - x11-libs/cairo - x11-libs/gdk-pixbuf - x11-libs/gtk+:3 - x11-libs/pango - ) - pygobject? ( dev-python/pygobject:3[${PYTHON_USEDEP}] ) - postgres? ( dev-db/postgresql:* ) - sqlite? ( dev-db/sqlite ) - projects? ( - =dev-ada/libgpr-2016[gnat_2016=,gnat_2017=,shared?,static-libs?] - dev-ada/xmlada[shared?,static-libs?] - )" -DEPEND="${RDEPEND} - dev-ada/gprbuild[gnat_2016=,gnat_2017=]" - -REQUIRED_USE="${PYTHON_REQUIRED_USE} - tools? ( static-libs ) - pygobject? ( gtk ) - ^^ ( gnat_2016 gnat_2017 )" - -S="${WORKDIR}"/${MYP}-src - -PATCHES=( "${FILESDIR}"/${P}-gentoo.patch ) - -src_prepare() { - default - mv configure.{in,ac} || die - eautoreconf -} - -src_configure() { - if use gnat_2016; then - GCC_PV=4.9.4 - else - GCC_PV=6.3.0 - fi - GCC=${CHOST}-gcc-${GCC_PV} - GNATMAKE=${CHOST}-gnatmake-${GCC_PV} - GNATCHOP=${CHOST}-gnatchop-${GCC_PV} - if use sqlite; then - myConf="--with-sqlite=$(get_libdir)" - else - myConf="--without-sqlite" - fi - if use gtk ; then - myConf="$myConf --with-gtk=3.0" - else - myConf="$myConf --with-gtk=no" - fi - econf \ - GNATCHOP="${GNATCHOP}" \ - GNATMAKE="${GNATMAKE}" \ - --with-python \ - $(use_with gmp) \ - $(use_with iconv) \ - $(use_with postgres postgresql) \ - $(use_enable projects) \ - $(use_enable pygobject) \ - $(use_enable readline gpl) \ - $(use_enable readline) \ - $(use_enable syslog) \ - --with-python-exec=${EPYTHON} \ - --enable-shared-python \ - --disable-pygtk \ - CC=${GCC} \ - $myConf -} - -src_compile() { - if use shared; then - emake PROCESSORS=$(makeopts_jobs) GPRBUILD_OPTIONS=-v GCC=${GCC} \ - build_library_type/relocatable - fi - if use static-libs; then - emake PROCESSORS=$(makeopts_jobs) GPRBUILD_OPTIONS=-v GCC=${GCC} \ - build_library_type/static - fi - python_fix_shebang . -} - -src_install() { - if use shared; then - emake prefix="${D}usr" install_library_type/relocatable - fi - if use static-libs; then - emake prefix="${D}usr" install_library_type/static - fi - emake prefix="${D}usr" install_gps_plugin - einstalldocs - dodoc -r features-* known-problems-* -} - -src_test() { - # The test suite is in - # To run you need to have the ada compiler available as gcc - # Even in this case there are still some problem - # Going into the testsuite directory and running - # ./run.py -v -v - # run here (having enabled most USE flags) - true -} diff --git a/dev-ada/gnatcoll/gnatcoll-2017.ebuild b/dev-ada/gnatcoll/gnatcoll-2017.ebuild index e13a6333db26..8790026af64c 100644 --- a/dev-ada/gnatcoll/gnatcoll-2017.ebuild +++ b/dev-ada/gnatcoll/gnatcoll-2017.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -18,11 +18,12 @@ KEYWORDS="amd64 x86" IUSE="gmp gnat_2016 +gnat_2017 gtk iconv postgres pygobject projects readline +shared sqlite static-libs syslog tools" -RDEPEND="dev-lang/gnat-gpl:6.3.0 +RDEPEND="gnat_2016? ( dev-lang/gnat-gpl:4.9.4 ) + gnat_2017? ( dev-lang/gnat-gpl:6.3.0 ) ${PYTHON_DEPS} gmp? ( dev-libs/gmp:* ) gtk? ( - dev-ada/gtkada[gnat_2017,shared?,static-libs?] + dev-ada/gtkada[gnat_2016=,gnat_2017=,shared?,static-libs?] dev-libs/atk dev-libs/glib x11-libs/cairo @@ -34,23 +35,27 @@ RDEPEND="dev-lang/gnat-gpl:6.3.0 postgres? ( dev-db/postgresql:* ) sqlite? ( dev-db/sqlite ) projects? ( - =dev-ada/libgpr-2017*[gnat_2017,shared?,static-libs?] + ~dev-ada/libgpr-2017[gnat_2016=,gnat_2017=,shared?,static-libs?] dev-ada/xmlada[shared?,static-libs?] )" DEPEND="${RDEPEND} - dev-ada/gprbuild[gnat_2017]" + dev-ada/gprbuild[gnat_2016=,gnat_2017=]" REQUIRED_USE="${PYTHON_REQUIRED_USE} tools? ( static-libs ) pygobject? ( gtk ) - !gnat_2016 gnat_2017" + ^^ ( gnat_2016 gnat_2017 )" S="${WORKDIR}"/${MYP}-src PATCHES=( "${FILESDIR}"/${P}-gentoo.patch ) src_prepare() { - GCC_PV=6.3.0 + if use gnat_2016; then + GCC_PV=4.9.4 + else + GCC_PV=6.3.0 + fi default mv configure.{in,ac} || die sed -i \ @@ -62,7 +67,6 @@ src_prepare() { } src_configure() { - GCC=${CHOST}-gcc-${GCC_PV} GNATMAKE=${CHOST}-gnatmake-${GCC_PV} GNATCHOP=${CHOST}-gnatchop-${GCC_PV} if use sqlite; then @@ -90,22 +94,18 @@ src_configure() { --with-python-exec=${EPYTHON} \ --enable-shared-python \ --disable-pygtk \ - CC=${GCC} \ $myConf } src_compile() { if use shared; then - emake PROCESSORS=$(makeopts_jobs) GPRBUILD_OPTIONS=-v GCC=${GCC} \ - build_library_type/relocatable + emake PROCESSORS=$(makeopts_jobs) build_library_type/relocatable fi if use static-libs; then - emake PROCESSORS=$(makeopts_jobs) GPRBUILD_OPTIONS=-v GCC=${GCC} \ - build_library_type/static + emake PROCESSORS=$(makeopts_jobs) build_library_type/static fi if use tools; then - emake PROCESSORS=$(makeopts_jobs) GPRBUILD_OPTIONS=-v GCC=${GCC} \ - build_tools/static + emake PROCESSORS=$(makeopts_jobs) build_tools/static fi python_fix_shebang . } @@ -127,7 +127,7 @@ src_install() { src_test() { # The test suite is in # To run you need to have the ada compiler available as gcc - # Even in this case there are still some problem + # Even in this case there are still some problems # Going into the testsuite directory and running # ./run.py -v -v # run here (having enabled most USE flags) |