diff options
Diffstat (limited to 'dev-ada/gnatmem')
| -rw-r--r-- | dev-ada/gnatmem/Manifest | 1 | ||||
| -rw-r--r-- | dev-ada/gnatmem/files/gnatmem-2018-gentoo.patch (renamed from dev-ada/gnatmem/files/gnatmem-2016-gentoo.patch) | 15 | ||||
| -rw-r--r-- | dev-ada/gnatmem/gnatmem-2017.ebuild | 42 | ||||
| -rw-r--r-- | dev-ada/gnatmem/gnatmem-2018.ebuild | 13 |
4 files changed, 10 insertions, 61 deletions
diff --git a/dev-ada/gnatmem/Manifest b/dev-ada/gnatmem/Manifest index 007d1bb66a82..92f100868d80 100644 --- a/dev-ada/gnatmem/Manifest +++ b/dev-ada/gnatmem/Manifest @@ -1,2 +1 @@ -DIST gnatmem-gpl-2017-src.tar.gz 80106 BLAKE2B 81f5b2fe4cacf383a39230bf3ebbbbfce0cd0a774b0289a78774dacedbfa0f2ca385b5538e1d12a075383158ff3c657d3a645f8f08be62fe6a437c9f7cd4b971 SHA512 52ba2cfb24314f481ec07e351ff6d8883753dcfe5d0489a78536bf0b841d931055be02271a5d93b2ec15c52fd775d4b177a17de52f9472cc8f352bf044b28897 DIST gnatmem-gpl-2018-src.tar.gz 80101 BLAKE2B c117552c2f8369f588127933ca1ba3075aeea6d7c3867861817b080f633fe26a7692c101b500d7441b49e79e75ce5a771a80287d0fb28bd0f569a358a8976d7d SHA512 539703bcb97cab996a4b4381685b021a419df781be3997538120580944fdcbb021fd28f574f66b8d52adbf5c6f1d7e29495c2115515d761f3cfce5bcc7bd8f56 diff --git a/dev-ada/gnatmem/files/gnatmem-2016-gentoo.patch b/dev-ada/gnatmem/files/gnatmem-2018-gentoo.patch index 69530dd24b23..32b08af4da89 100644 --- a/dev-ada/gnatmem/files/gnatmem-2016-gentoo.patch +++ b/dev-ada/gnatmem/files/gnatmem-2018-gentoo.patch @@ -1,5 +1,5 @@ ---- 1/configure.in.old 2016-12-08 20:57:53.942004080 +0100 -+++ 1/configure.in 2016-12-08 21:00:10.393677257 +0100 +--- a/configure.in 2016-12-08 20:57:53.942004080 +0100 ++++ b/configure.in 2016-12-08 21:00:10.393677257 +0100 @@ -2,23 +2,14 @@ AC_INIT(gnatmem.gpr.in) AC_CANONICAL_SYSTEM @@ -48,13 +48,12 @@ AC_SUBST(BINUTILS_OBJDIR) AC_SUBST(BINUTILS_SRCDIR) ---- gnatmem-gpl-2016-src/gnatmem.gpr.in.old 2017-02-02 22:15:30.247906007 +0100 -+++ gnatmem-gpl-2016-src/gnatmem.gpr.in 2017-02-02 22:17:22.604974363 +0100 -@@ -10,8 +10,10 @@ +--- a/gnatmem.gpr.in 2017-02-02 22:15:30.247906007 +0100 ++++ b/gnatmem.gpr.in 2017-02-02 22:17:22.604974363 +0100 +@@ -10,8 +10,9 @@ for Languages use ("ada", "c"); package Compiler is -+ for Driver ("C") use External ("CC", "gcc"); for Default_Switches ("ada") use ("-O2", "-W", "-Wall", "-gnatpg"); for Default_Switches ("c") use ("-O2", + "-I..", @@ -72,8 +71,8 @@ "@LIBDL@", "@LIBZ@"); end Linker; ---- gnatmem-gpl-2015-src/src/libaddr2line.c.old 2017-01-04 21:03:36.185233702 +0100 -+++ gnatmem-gpl-2015-src/src/libaddr2line.c 2017-01-04 21:04:17.680455390 +0100 +--- a/src/libaddr2line.c 2017-01-04 21:03:36.185233702 +0100 ++++ b/src/libaddr2line.c 2017-01-04 21:04:17.680455390 +0100 @@ -23,9 +23,9 @@ #include <string.h> #include <stdlib.h> diff --git a/dev-ada/gnatmem/gnatmem-2017.ebuild b/dev-ada/gnatmem/gnatmem-2017.ebuild deleted file mode 100644 index e7d409d86e59..000000000000 --- a/dev-ada/gnatmem/gnatmem-2017.ebuild +++ /dev/null @@ -1,42 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit multiprocessing autotools - -MYP=${PN}-gpl-${PV}-src - -DESCRIPTION="Monitors dynamic allocation and deallocation activity in a program" -HOMEPAGE="http://libre.adacore.com/" -SRC_URI="http://mirrors.cdn.adacore.com/art/591c45e2c7a447af2deed033 -> - ${MYP}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="gnat_2016 +gnat_2017" - -RDEPEND="" -DEPEND="dev-ada/gprbuild[gnat_2016=,gnat_2017=]" - -REQUIRED_USE="^^ ( gnat_2016 gnat_2017 )" - -S="${WORKDIR}"/${MYP} - -PATCHES=( "${FILESDIR}"/${PN}-2016-gentoo.patch ) - -src_prepare() { - default - mv configure.in configure.ac - eautoreconf -} - -src_compile() { - gprbuild -Pgnatmem.gpr -j$(makeopts_jobs) \ - -cargs:C ${CFLAGS} -cargs:Ada ${ADAFLAGS} -} - -src_install() { - dobin obj/gnatmem -} diff --git a/dev-ada/gnatmem/gnatmem-2018.ebuild b/dev-ada/gnatmem/gnatmem-2018.ebuild index 5c78d05a3175..e49fc2ffe959 100644 --- a/dev-ada/gnatmem/gnatmem-2018.ebuild +++ b/dev-ada/gnatmem/gnatmem-2018.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 @@ -24,7 +24,7 @@ REQUIRED_USE="^^ ( gnat_2016 gnat_2017 gnat_2018 )" S="${WORKDIR}"/${MYP} -PATCHES=( "${FILESDIR}"/${PN}-2016-gentoo.patch ) +PATCHES=( "${FILESDIR}"/${P}-gentoo.patch ) src_prepare() { default @@ -33,14 +33,7 @@ src_prepare() { } src_compile() { - if use gnat_2016; then - GCC_PV=4.9.0 - elif use gnat_2017; then - GCC_PV=6.3.0 - else - GCC_PV=7.3.1 - fi - gprbuild -v -Pgnatmem.gpr -j$(makeopts_jobs) -XCC=gcc-${GCC_PV} \ + gprbuild -v -Pgnatmem.gpr -j$(makeopts_jobs) \ -cargs:C ${CFLAGS} -cargs:Ada ${ADAFLAGS} } |