diff options
Diffstat (limited to 'dev-ada/gps')
-rw-r--r-- | dev-ada/gps/Manifest | 4 | ||||
-rw-r--r-- | dev-ada/gps/files/gps-2017-gentoo.patch | 59 | ||||
-rw-r--r-- | dev-ada/gps/gps-2017.ebuild | 6 |
3 files changed, 56 insertions, 13 deletions
diff --git a/dev-ada/gps/Manifest b/dev-ada/gps/Manifest index 0d2365361d68..5a5264c67798 100644 --- a/dev-ada/gps/Manifest +++ b/dev-ada/gps/Manifest @@ -1,5 +1,5 @@ -AUX gps-2017-gentoo.patch 11521 BLAKE2B d036d5b495cf3d08718347f5f2dba6c327cd97aec437b9b82df7808fc6de5ed24100cdfafec0a54bc162e64b17f9ffa868239582c69b57e218ae5efd5c8da4fa SHA512 950f9b27f50b18d30c29babcc212d52577b20ef17acae8ea4d5a1973b18ab6d01a2ba8d70b5693ea03ad0f50e06011aab6ee54f9399e1c58d61793f4f33794bd +AUX gps-2017-gentoo.patch 13283 BLAKE2B 91b546a0ad1f78fc087980b1366f2e3d22bcc9584df7b975d99122b51a6251ec87532c904411cf4cd95c6898e7a9217a8429cf0157db0f8ad6aef94fed778361 SHA512 82caf18d500d10f6841140f57528726e1dd6d115e5ad6538442af80abe0068b98f137fc35027ded1ef3603e3c7003de0f1ff4cc7eb93d6d8863909fa61fc635b DIST gnat-gpl-2017-x86_64-linux-bin.tar.gz 496338280 BLAKE2B b3eee6d311fb9c20bc8fa7217c0731ca1e91ced38700df1d63d91a16c3fa28dfd44c7c8e867c3a857b88e4f0c8b2a7200fb6a8a630b8403538c4784f8914d1a5 SHA512 01a8f3be9b7b7e83cc5bd4a45137b1d35c6448bc22a88bcaf5d312cd63e11081b6b2fe9f09ad2a27d8f0b6471fc5c1a99573bf3bcee1589329054074eaeef04f DIST gps-gpl-2017-src.tar.gz 41216830 BLAKE2B 51ca89c38fa81888a9cf1831cf97f7e0ad72c444328a29063249a4fe72bbdc8357552d470872e9fbbeaf349ef0427b59fa41a0efb56200a07a9426343c731a57 SHA512 101ecef7f183de1da0c2b09d77f284a5e8c5ae56f34a897c8d471e79fe9a2832742608ff5251197ba2a52b5d9dfee6c6937fc22cd55f6d8f38359b070393cb64 -EBUILD gps-2017.ebuild 1646 BLAKE2B 7d99c9dfc4bb0d98eb9d27b06e8b3c58930de167c163da43d239eb940e1b09778d592ceb4c4d5a10b03d41d29a8cce9c80c6a9f93fd3c8812df70125867b559a SHA512 c892e29d4dc2ee70c6ea85da4379cb4d11f8225ea2d8d7f352bb194cfe5c6d39a1ce9b3d46b4d6eb4d0b8c1a0852fceedd556119a1236da0f9a73b2d1437b314 +EBUILD gps-2017.ebuild 1673 BLAKE2B 0d8c504ff89fdf1478d5966e7c300aa0fdbc9a6f2260c1d46261cbb7aa364e0a7ad93963915f5fb1760a90a92027968bb4bcea57ae1a2e74036204fc7d33552c SHA512 40d6ccd2c4e1ccb94a59682670a3718502fd9b9fa18c7210f8e05b3f7630a86dc7ffb57237deb86c512765a92dc59cae86e56c7270a824a933fc79e32e971bf1 MISC metadata.xml 438 BLAKE2B 105849097d35788d4178db05bd3c9ab5b17eb94bee320d0dfc2914889a3764824f53950f674a4d1488b649a344729e03bb8eacda9896636a632b1288a0abf07c SHA512 2bf4e76aab6f461c501b34fee6fbf719715af34e2af827daee3a145de31b96b5568009a21daaa4269a19386b0be45dd419710e926505bda7763312c809864aae diff --git a/dev-ada/gps/files/gps-2017-gentoo.patch b/dev-ada/gps/files/gps-2017-gentoo.patch index e6ff1453189d..631e6dc92ef9 100644 --- a/dev-ada/gps/files/gps-2017-gentoo.patch +++ b/dev-ada/gps/files/gps-2017-gentoo.patch @@ -244,7 +244,7 @@ ---------------------------- --- gps-gpl-2017-src/toolchains_editor/core/src/toolchains.adb.old 2017-11-23 22:02:52.819994229 +0100 +++ gps-gpl-2017-src/toolchains_editor/core/src/toolchains.adb 2017-11-23 22:07:20.326248295 +0100 -@@ -309,12 +309,12 @@ +@@ -309,12 +309,13 @@ else Set_Command (Tc, GNAT_Driver, @@ -255,7 +255,8 @@ Set_Command (Tc, GNAT_List, - To_String (Full_Path) & "gnatls", -+ To_String (Full_Path) & "@GNATLS@", ++ To_String (Full_Path) & ++ "@GNATLS@", From_Default, Is_Default_Path); Set_Command @@ -278,10 +279,10 @@ - Set_Command (Native_Toolchain, GNAT_Driver, "gnat", From_Default, True); - Set_Command (Native_Toolchain, GNAT_List, "gnatls", From_Default, True); -+ Set_Command (Native_Toolchain, GNAT_Driver, "@GNAT@", From_Default, -+ True); -+ Set_Command (Native_Toolchain, GNAT_List, "@GNATLS@", From_Default, -+ True); ++ Set_Command (Native_Toolchain, GNAT_Driver, ++ "@GNAT@", From_Default, True); ++ Set_Command (Native_Toolchain, GNAT_List, ++ "@GNATLS@", From_Default, True); Set_Command (Native_Toolchain, Debugger, "gdb", From_Default, True); Set_Command (Native_Toolchain, CPP_Filt, "c++filt", From_Default, True); @@ -289,8 +290,50 @@ if Get_Compiler (Native_Toolchain, "Ada") = No_Compiler then - Add_Compiler (Native_Toolchain, "Ada", "gnatmake", From_Default); -+ Add_Compiler (Native_Toolchain, "Ada", "@GNATMAKE@", -+ From_Default); ++ Add_Compiler (Native_Toolchain, "Ada", ++ "@GNATMAKE@", From_Default); end if; if Get_Compiler (Native_Toolchain, "C") = No_Compiler then +--- gps-gpl-2017-src/gps/Makefile.old 2017-12-10 20:29:18.267622400 +0100 ++++ gps-gpl-2017-src/gps/Makefile 2017-12-10 20:29:34.564312700 +0100 +@@ -45,7 +45,8 @@ + for f in ../kernel/generated/*; do cat $$f | tr -d '\015' > $$f-aux; mv -f $$f-aux $$f; done + endif + $(GPRBUILD) $(GPRBUILD_FLAGS) -m -p -ws -XTP_TASKING=No_Tasking \ +- $(GPRBUILD_BUILD_TYPE_FLAGS) -Pgps -largs `pkg-config gmodule-2.0 --libs` ++ $(GPRBUILD_BUILD_TYPE_FLAGS) -Pgps -largs `pkg-config gmodule-2.0 --libs` \ ++ -cargs:Ada $(ADAFLAGS) -cargs:C ${CFLAGS} + + resources: + ifeq ($(OS),Windows_NT) +--- gps-gpl-2017-src/common/common_no_xmlada.gpr.in.old 2017-12-10 20:48:13.986166250 +0100 ++++ gps-gpl-2017-src/common/common_no_xmlada.gpr.in 2017-12-10 20:48:29.654872055 +0100 +@@ -22,6 +22,7 @@ + for Switches ("dynamic_arrays.adb") use No_Checks; + when "Debug" => + end case; ++ for Driver ("C") use External ("CC", "gcc"); + end Compiler; + + package Naming is +--- gps-gpl-2017-src/common/common_with_xmlada.gpr.in.old 2017-12-10 20:48:37.352727540 +0100 ++++ gps-gpl-2017-src/common/common_with_xmlada.gpr.in 2017-12-10 20:48:50.423482155 +0100 +@@ -23,6 +23,7 @@ + for Switches ("dynamic_arrays.adb") use No_Checks; + when "Debug" => + end case; ++ for Driver ("C") use External ("CC", "gcc"); + end Compiler; + + package Binder is +--- gps-gpl-2017-src/shared.gpr.in.old 2017-12-10 20:52:51.117967249 +0100 ++++ gps-gpl-2017-src/shared.gpr.in 2017-12-10 20:53:15.627507886 +0100 +@@ -56,6 +56,7 @@ + ); + for Switches ("C") use Optimize & ("-g", "-O2"); + end case; ++ for Driver ("C") use External ("CC", "gcc"); + end Compiler; + + package Binder is diff --git a/dev-ada/gps/gps-2017.ebuild b/dev-ada/gps/gps-2017.ebuild index 1425084ddd95..7ab72b50e19c 100644 --- a/dev-ada/gps/gps-2017.ebuild +++ b/dev-ada/gps/gps-2017.ebuild @@ -45,9 +45,9 @@ src_prepare() { GCC_PV=6.3.0 mv configure.{in,ac} || die sed -i \ - -e "s:@GNATMAKE@:gnatmake-${GCC_PV}:g" \ - -e "s:@GNAT@:gnat-${GCC_PV}:g" \ - -e "s:@GNATLS@:gnatls-${GCC_PV}:g" \ + -e "s:@GNATMAKE@:${CHOST}-gnatmake-${GCC_PV}:g" \ + -e "s:@GNAT@:${CHOST}-gnat-${GCC_PV}:g" \ + -e "s:@GNATLS@:${CHOST}-gnatls-${GCC_PV}:g" \ aclocal.m4 \ share/support/core/gnat_help_menus.py \ share/support/core/toolchains.py \ |