diff options
| -rw-r--r-- | dev-ada/gps/files/gps-2018-gentoo.patch | 40 | ||||
| -rw-r--r-- | dev-ada/gps/gps-2018.ebuild | 56 |
2 files changed, 39 insertions, 57 deletions
diff --git a/dev-ada/gps/files/gps-2018-gentoo.patch b/dev-ada/gps/files/gps-2018-gentoo.patch index 06a080b69d56..6e258bac36a0 100644 --- a/dev-ada/gps/files/gps-2018-gentoo.patch +++ b/dev-ada/gps/files/gps-2018-gentoo.patch @@ -75,43 +75,3 @@ <string /> </project_attribute> ---- a/gnatcoll_extras/gnatcoll_extras.gpr 2018-07-22 14:42:17.618161040 +0200 -+++ b/gnatcoll_extras/gnatcoll_extras.gpr 2018-07-22 14:43:33.973070921 +0200 -@@ -14,6 +14,7 @@ - for Switches ("C") use - ("-g", "-O2") - & Shared.Gtk_Cflags & Shared.Pygobject_Include & Shared.Python_Cflags; -+ for Driver ("C") use External ("CC", "gcc"); - end Compiler; - - end GNATCOLL_Extras; ---- a/widgets/widgets.gpr 2018-07-22 21:46:23.907355738 +0200 -+++ b/widgets/widgets.gpr 2018-07-22 21:47:02.673825994 +0200 -@@ -14,6 +14,7 @@ - for Switches ("C") use - ("-g", "-O2") - & Shared.Gtk_Cflags; -+ for Driver ("C") use External ("CC", "gcc"); - end Compiler; - - end Widgets; ---- a/common/common.gpr.in 2018-07-25 08:05:45.227060250 +0200 -+++ b/common/common.gpr.in 2018-07-25 08:06:55.067009811 +0200 -@@ -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 ---- a/shared.gpr.in 2018-07-25 08:11:47.317597391 +0200 -+++ b/shared.gpr.in 2018-07-25 08:10:56.774362671 +0200 -@@ -60,6 +60,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-2018.ebuild b/dev-ada/gps/gps-2018.ebuild index 85c357baef7e..71560c0907ce 100644 --- a/dev-ada/gps/gps-2018.ebuild +++ b/dev-ada/gps/gps-2018.ebuild @@ -3,7 +3,7 @@ EAPI=6 PYTHON_COMPAT=( python2_7 ) -inherit python-single-r1 autotools desktop +inherit python-single-r1 autotools desktop llvm MYP=${PN}-gpl-${PV}-src @@ -16,16 +16,23 @@ SRC_URI="http://mirrors.cdn.adacore.com/art/5b0cf627c7a4475261f97ceb LICENSE="GPL-3" SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" +KEYWORDS="amd64 x86" +IUSE="gnat_2017 gnat_2018" RDEPEND="${PYTHON_DEPS} - dev-ada/gnatcoll-db[gnatcoll_db2ada,gnatinspect,xref] - dev-ada/gnatcoll-bindings[python] - >=dev-ada/gtkada-2017[gnat_2018] - dev-ada/libadalang[gnat_2018] + dev-ada/gnatcoll-db[gnat_2017=,gnat_2018,gnatcoll_db2ada,gnatinspect,xref] + dev-ada/gnatcoll-bindings[gnat_2017=,gnat_2018=,python] + >=dev-ada/gtkada-2017[gnat_2017=,gnat_2017=] + dev-ada/libadalang[gnat_2017=,gnat_2018=] dev-libs/gobject-introspection dev-libs/libffi + gnat_2017? ( sys-devel/llvm:5 ) + gnat_2018? ( + || ( + sys-devel/llvm:6 + sys-devel/llvm:7 + ) + ) sys-devel/clang:= x11-themes/adwaita-icon-theme x11-themes/hicolor-icon-theme @@ -40,31 +47,46 @@ S="${WORKDIR}"/${MYP} PATCHES=( "${FILESDIR}"/${P}-gentoo.patch ) +pkg_setup() { + if use gnat_2017; then + GCC_PV=6.3.0 + LLVM_MAX_SLOT=5 + else + GCC_PV=7.3.1 + LLVM_MAX_SLOT=7 + fi + GNATMAKE=gnatmake-${GCC_PV} + GNATDRV=gnat-${GCC_PV} + GNATLS=gnatls-${GCC_PV} + llvm_pkg_setup +} + src_prepare() { GCC_PV=7.3.1 default sed -i \ - -e "s:@GNATMAKE@:${CHOST}-gnatmake-${GCC_PV}:g" \ - -e "s:@GNAT@:${CHOST}-gnat-${GCC_PV}:g" \ - -e "s:@GNATLS@:${CHOST}-gnatls-${GCC_PV}:g" \ - share/support/core/toolchains.py \ - share/support/core/projects.py \ - || die + -e "s:@GNATMAKE@:${CHOST}-${GNATMAKE}:g" \ + -e "s:@GNAT@:${CHOST}-${GNATDRV}:g" \ + -e "s:@GNATLS@:${CHOST}-${GNATLS}:g" \ + share/support/core/toolchains.py \ + share/support/core/projects.py \ + || die mv "${WORKDIR}"/libadalang-tools-src laltools } src_configure() { econf \ - GNATMAKE=/usr/bin/gnatmake-7.3.1 \ - GNATDRV=/usr/bin/gnat-7.3.1 \ + GNATMAKE=/usr/bin/${GNATMAKE} \ + GNATDRV=/usr/bin/${GNATDRV} \ --with-clang=$(llvm-config --libdir) } src_compile() { - CC=/usr/bin/gcc-7.3.1 emake -C gps GPRBUILD_FLAGS="-v ${MAKEOPTS}" \ + emake -C gps GPRBUILD_FLAGS="-v ${MAKEOPTS} \ + -XGPR_BUILD=relocatable" \ Build=Production gprbuild -v -p -Pcli/cli.gpr ${MAKEOPTS} -XLIBRARY_TYPE=relocatable \ - -cargs:Ada ${ADAFLAGS} + -XGPR_BUILD=relocatable -cargs:Ada ${ADAFLAGS} || die } src_install() { |