* [gentoo-commits] repo/gentoo:master commit in: dev-ada/gnatmem/files/, dev-ada/gnatmem/
@ 2017-04-25 19:52 Alfredo Tupone
0 siblings, 0 replies; 3+ messages in thread
From: Alfredo Tupone @ 2017-04-25 19:52 UTC (permalink / raw
To: gentoo-commits
commit: d8e663b26f51b3c5f1cdbe1393eb5ec0419b1ab0
Author: Tupone Alfredo <tupone <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 25 19:52:23 2017 +0000
Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Tue Apr 25 19:52:23 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d8e663b2
dev-ada/gnatmem: Adding dev-ada/gnatmem-2016
Package-Manager: Portage-2.3.3, Repoman-2.3.1
dev-ada/gnatmem/Manifest | 1 +
dev-ada/gnatmem/files/gnatmem-2016-gentoo.patch | 85 +++++++++++++++++++++++++
dev-ada/gnatmem/gnatmem-2016.ebuild | 50 +++++++++++++++
dev-ada/gnatmem/metadata.xml | 15 +++++
4 files changed, 151 insertions(+)
diff --git a/dev-ada/gnatmem/Manifest b/dev-ada/gnatmem/Manifest
new file mode 100644
index 00000000000..e30fd588fc2
--- /dev/null
+++ b/dev-ada/gnatmem/Manifest
@@ -0,0 +1 @@
+DIST gnatmem-gpl-2016-src.tar.gz 80104 SHA256 bd39c7b18e4f52fdd029b999f7e1af52d01c975063c28ae1ef6875e4fc5e224f SHA512 bc711af9eda55e89a22fee9dbe506a60fbdd718a9f47141a8d13ad4b97c4520c3988e3a55b6c85bb53098e542f655de9572aeefc99d88c41a2645d9f01b2828b WHIRLPOOL 8aee794c18efcbdbb50a4d58b9f247de30dea8d5b0a41034b1e20ad7786eefab5dfd14bf99994340a993d67989eab939ba78097d46933d841686d1bbc68fce0b
diff --git a/dev-ada/gnatmem/files/gnatmem-2016-gentoo.patch b/dev-ada/gnatmem/files/gnatmem-2016-gentoo.patch
new file mode 100644
index 00000000000..357f723c743
--- /dev/null
+++ b/dev-ada/gnatmem/files/gnatmem-2016-gentoo.patch
@@ -0,0 +1,85 @@
+--- 1/configure.in.old 2016-12-08 20:57:53.942004080 +0100
++++ 1/configure.in 2016-12-08 21:00:10.393677257 +0100
+@@ -6,19 +6,14 @@
+ if test ${GNATBIND} = "no"; then
+ AC_MSG_ERROR(Ada compiler needed,1)
+ fi
++AC_CONFIG_HEADERS(config.h:config.in)
++AC_DEFINE_UNQUOTED(TARGET, "${target}", [Configured target name.])
+ AC_ARG_WITH(binutils-buildtree,
+ [AC_HELP_STRING(
+ [--with-binutils-buildtree=<dir>],
+ [Specifify location of binutils build tree])],
+ BINUTILS_OBJDIR=$withval,
+ BINUTILS_OBJDIR=no)
+-AC_MSG_CHECKING([for binutils build tree validity])
+-if test -f "$BINUTILS_OBJDIR/bfd/libbfd.a"; then
+- AC_MSG_RESULT(yes)
+-else
+- AC_MSG_RESULT(no)
+- AC_MSG_FAILURE([need valid binutils build tree directory (got $BINUTILS_OBJDIR)])
+-fi
+
+ AC_ARG_WITH(binutils-sources,
+ [AC_HELP_STRING(
+@@ -26,21 +21,6 @@
+ [Specifify location of binutils sources])],
+ BINUTILS_SRCDIR=$withval,
+ BINUTILS_SRCDIR=auto)
+-if test "$BINUTILS_SRCDIR" = "auto"; then
+- BINUTILS_SRCDIR=`cat "$BINUTILS_OBJDIR/Makefile" | sed -n -e "/^ *srcdir *=/ s/^ *srcdir *= *// p"`
+- case "$BINUTILS_SRC_DIR" in
+- /*) ;;
+- *) # assume we have relative path
+- BINUTILS_SRCDIR="$BINUTILS_OBJDIR/$BINUTILS_SRCDIR";;
+- esac
+-fi
+-AC_MSG_CHECKING([for binutils source dir validity])
+-if test -f "$BINUTILS_SRCDIR/bfd/Makefile.in"; then
+- AC_MSG_RESULT(yes)
+-else
+- AC_MSG_RESULT(no)
+- AC_MSG_FAILURE([need valid binutils sources directory])
+-fi
+
+ 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 @@
+ 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..",
+ "-I" & BINUTILS_OBJDIR & "/binutils",
+ "-I" & BINUTILS_OBJDIR & "/bfd",
+ "-I" & BINUTILS_SRCDIR & "/include");
+@@ -19,8 +21,8 @@
+
+ package Linker is
+ for Default_Switches ("ada") use
+- (BINUTILS_OBJDIR & "/bfd/libbfd.a",
+- BINUTILS_OBJDIR & "/libiberty/libiberty.a",
++ ("-lbfd",
++ "-liberty",
+ "@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
+@@ -23,9 +23,9 @@
+ #include <string.h>
+ #include <stdlib.h>
+
+-#include "bfd.h"
+-#include "libiberty.h"
+-#include "demangle.h"
++#include <bfd.h>
++#include <libiberty/libiberty.h>
++#include <libiberty/demangle.h>
+
+ static asymbol **cur_syms; /* Symbol table. */
+ static bfd *cur_bfd;
diff --git a/dev-ada/gnatmem/gnatmem-2016.ebuild b/dev-ada/gnatmem/gnatmem-2016.ebuild
new file mode 100644
index 00000000000..6e1f3b1de96
--- /dev/null
+++ b/dev-ada/gnatmem/gnatmem-2016.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2017 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/573995c8c7a447658e0affa2 -> ${MYP}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND=""
+DEPEND="dev-ada/gprbuild"
+
+S="${WORKDIR}"/${MYP}
+
+PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
+
+pkg_setup() {
+ GCC=${ADA:-$(tc-getCC)}
+ export GNATBIND="${GCC/gcc/gnatbind}"
+ if [[ -z "$(type ${GNATBIND} 2>/dev/null)" ]] ; then
+ eerror "You need a gcc compiler that provides the Ada Compiler:"
+ eerror "1) use gcc-config to select the right compiler or"
+ eerror "2) set ADA=gcc-4.9.4 in make.conf"
+ die "ada compiler not available"
+ fi
+}
+
+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/metadata.xml b/dev-ada/gnatmem/metadata.xml
new file mode 100644
index 00000000000..4dacd9de192
--- /dev/null
+++ b/dev-ada/gnatmem/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>tupone@gentoo.org</email>
+ <name>Tupone Alfredo</name>
+ </maintainer>
+ <longdescription lang="en">
+ The gnatmem utility monitors dynamic allocation and deallocation activity in a program, and displays information about incorrect deallocations and possible sources of memory leaks. It provides three type of information:
+
+ General information concerning memory management, such as the total number of allocations and deallocations, the amount of allocated memory and the high water mark, i.e. the largest amount of allocated memory in the course of program execution.
+ Backtraces for all incorrect deallocations, that is to say deallocations which do not correspond to a valid allocation.
+ Information on each allocation that is potentially the origin of a memory leak.
+ </longdescription>
+</pkgmetadata>
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-ada/gnatmem/files/, dev-ada/gnatmem/
@ 2018-11-10 16:24 Alfredo Tupone
0 siblings, 0 replies; 3+ messages in thread
From: Alfredo Tupone @ 2018-11-10 16:24 UTC (permalink / raw
To: gentoo-commits
commit: 9cf4fbba125f846739b5710c7d5e338e05f5db73
Author: Tupone Alfredo <tupone <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 10 16:23:53 2018 +0000
Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Sat Nov 10 16:23:53 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9cf4fbba
dev-ada/gnatmem: stabilize and remove old
Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11
dev-ada/gnatmem/Manifest | 1 -
...2016-gentoo.patch => gnatmem-2018-gentoo.patch} | 15 ++++----
dev-ada/gnatmem/gnatmem-2017.ebuild | 42 ----------------------
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 007d1bb66a8..92f100868d8 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
similarity index 83%
rename from dev-ada/gnatmem/files/gnatmem-2016-gentoo.patch
rename to dev-ada/gnatmem/files/gnatmem-2018-gentoo.patch
index 69530dd24b2..32b08af4da8 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 e7d409d86e5..00000000000
--- 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 5c78d05a317..e49fc2ffe95 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}
}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-ada/gnatmem/files/, dev-ada/gnatmem/
@ 2020-08-05 9:22 Alfredo Tupone
0 siblings, 0 replies; 3+ messages in thread
From: Alfredo Tupone @ 2020-08-05 9:22 UTC (permalink / raw
To: gentoo-commits
commit: e9188ba72be3130b5a15fde1996e07c3bac4d7f7
Author: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 5 09:22:39 2020 +0000
Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Wed Aug 5 09:22:39 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e9188ba7
dev-ada/gnatmem: build with newer binutils-libs
Closes: https://bugs.gentoo.org/735676
Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org>
dev-ada/gnatmem/files/gnatmem-2019-bfd.patch | 29 ++++++++++++++++++++++++++++
dev-ada/gnatmem/gnatmem-2019-r1.ebuild | 13 +++++++++----
2 files changed, 38 insertions(+), 4 deletions(-)
diff --git a/dev-ada/gnatmem/files/gnatmem-2019-bfd.patch b/dev-ada/gnatmem/files/gnatmem-2019-bfd.patch
new file mode 100644
index 00000000000..007d217cf24
--- /dev/null
+++ b/dev-ada/gnatmem/files/gnatmem-2019-bfd.patch
@@ -0,0 +1,29 @@
+--- a/src/libaddr2line.c 2020-08-04 22:41:04.670046491 +0200
++++ b/src/libaddr2line.c 2020-08-04 22:44:55.560802332 +0200
+@@ -55,14 +55,26 @@
+ if (found)
+ return;
+
++#if defined(bfd_get_section_flags)
+ if ((bfd_get_section_flags (abfd, section) & SEC_ALLOC) == 0)
++#else
++ if ((bfd_section_flags (section) & SEC_ALLOC) == 0)
++#endif
+ return;
+
++#if defined(bfd_get_section_vma)
+ vma = bfd_get_section_vma (abfd, section);
++#else
++ vma = bfd_section_vma (section);
++#endif
+ if (pc < vma)
+ return;
+
++#if defined(bfd_get_section_size)
+ size = bfd_get_section_size (section);
++#else
++ size = bfd_section_size (section);
++#endif
+ if (pc >= vma + size)
+ return;
+
diff --git a/dev-ada/gnatmem/gnatmem-2019-r1.ebuild b/dev-ada/gnatmem/gnatmem-2019-r1.ebuild
index 44e18966d1e..67e5964f46a 100644
--- a/dev-ada/gnatmem/gnatmem-2019-r1.ebuild
+++ b/dev-ada/gnatmem/gnatmem-2019-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -21,13 +21,16 @@ IUSE=""
RDEPEND="${ADA_DEPS}"
DEPEND="${RDEPEND}
dev-ada/gprbuild[${ADA_USEDEP}]
- sys-libs/binutils-libs"
+ sys-libs/binutils-libs:="
REQUIRED_USE="${ADA_REQUIRED_USE}"
S="${WORKDIR}"/${MYP}
-PATCHES=( "${FILESDIR}"/${PN}-2018-gentoo.patch )
+PATCHES=(
+ "${FILESDIR}"/${PN}-2018-gentoo.patch
+ "${FILESDIR}"/${P}-bfd.patch
+)
src_prepare() {
default
@@ -37,7 +40,9 @@ src_prepare() {
src_compile() {
gprbuild -v -Pgnatmem.gpr -j$(makeopts_jobs) \
- -cargs:C ${CFLAGS} -cargs:Ada ${ADAFLAGS}
+ -cargs:C ${CFLAGS} -cargs:Ada ${ADAFLAGS} \
+ -largs ${LDFLAGS} \
+ || die
}
src_install() {
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-08-05 9:23 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-11-10 16:24 [gentoo-commits] repo/gentoo:master commit in: dev-ada/gnatmem/files/, dev-ada/gnatmem/ Alfredo Tupone
-- strict thread matches above, loose matches on Subject: below --
2020-08-05 9:22 Alfredo Tupone
2017-04-25 19:52 Alfredo Tupone
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox