summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVanessasaurus <814322+vsoch@users.noreply.github.com>2021-10-14 23:53:29 -0600
committerGitHub <noreply@github.com>2021-10-15 07:53:29 +0200
commit842e56efb87dce66f50504a9a01e87d996dcac50 (patch)
tree04ca444aed6832fb51cacd8f2629be33adf44249
parent0749d94ad3eeec4042377fd49a1e3c63e6a85c1b (diff)
downloadspack-842e56efb87dce66f50504a9a01e87d996dcac50.tar.gz
spack-842e56efb87dce66f50504a9a01e87d996dcac50.tar.bz2
spack-842e56efb87dce66f50504a9a01e87d996dcac50.tar.xz
spack-842e56efb87dce66f50504a9a01e87d996dcac50.zip
libabigail: add v2.0 (#26753)
Signed-off-by: vsoch <vsoch@users.noreply.github.com> Co-authored-by: vsoch <vsoch@users.noreply.github.com>
-rw-r--r--var/spack/repos/builtin/packages/libabigail/0001-plt.patch27
-rw-r--r--var/spack/repos/builtin/packages/libabigail/package.py16
2 files changed, 42 insertions, 1 deletions
diff --git a/var/spack/repos/builtin/packages/libabigail/0001-plt.patch b/var/spack/repos/builtin/packages/libabigail/0001-plt.patch
new file mode 100644
index 0000000000..d6ee21eff8
--- /dev/null
+++ b/var/spack/repos/builtin/packages/libabigail/0001-plt.patch
@@ -0,0 +1,27 @@
+From ba5e2b5dc9de106635c12ebe9260e2fc0212ff91 Mon Sep 17 00:00:00 2001
+From: @vsoch <vsoch@noreply.users.github.com>
+Date: Fri, 15 Oct 2021 05:17:47 +0000
+Subject: [PATCH] fixing incorrect symbol
+
+Signed-off-by: @vsoch <vsoch@noreply.users.github.com>
+---
+ src/abg-dwarf-reader.cc | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/abg-dwarf-reader.cc b/src/abg-dwarf-reader.cc
+index 1d6ad24c..8dd86c5a 100644
+--- a/src/abg-dwarf-reader.cc
++++ b/src/abg-dwarf-reader.cc
+@@ -11053,7 +11053,7 @@ dwarf_language_to_tu_language(size_t l)
+ return translation_unit::LANG_Ada95;
+ case DW_LANG_Fortran95:
+ return translation_unit::LANG_Fortran95;
+- case DW_LANG_PL1:
++ case DW_LANG_PLI:
+ return translation_unit::LANG_PL1;
+ case DW_LANG_ObjC:
+ return translation_unit::LANG_ObjC;
+--
+2.17.1
+
+
diff --git a/var/spack/repos/builtin/packages/libabigail/package.py b/var/spack/repos/builtin/packages/libabigail/package.py
index 48ea8664bd..cfa9c68c98 100644
--- a/var/spack/repos/builtin/packages/libabigail/package.py
+++ b/var/spack/repos/builtin/packages/libabigail/package.py
@@ -10,13 +10,19 @@ class Libabigail(AutotoolsPackage):
"""The ABI Generic Analysis and Instrumentation Library"""
homepage = "https://sourceware.org/libabigail"
- url = "https://mirrors.kernel.org/sourceware/libabigail/libabigail-1.8.tar.gz"
+ url = "https://mirrors.kernel.org/sourceware/libabigail/libabigail-2.0.tar.gz"
+ git = "https://sourceware.org/git/libabigail.git"
+ version('master')
+ version('2.0', sha256='3704ae97a56bf076ca08fb5dea6b21db998fbbf14c4f9de12824b78db53b6fda')
version('1.8', sha256='1cbf260b894ccafc61b2673ba30c020c3f67dbba9dfa88dca3935dff661d665c')
variant('docs', default=False, description='build documentation')
+ # version 2.0 will error because of using an old symbol, this error
+ # libdw: dwarf.h corrected the DW_LANG_PLI constant name (was DW_LANG_PL1).
depends_on('elfutils', type=('build', 'link'))
+
depends_on('libdwarf')
depends_on('libxml2')
@@ -26,3 +32,11 @@ class Libabigail(AutotoolsPackage):
# Documentation dependencies
depends_on('doxygen', type="build", when="+docs")
depends_on('py-sphinx', type='build', when="+docs")
+
+ # The symbol PL1 needs to be renamed to PLI
+ patch("0001-plt.patch")
+
+ def autoreconf(self, spec, prefix):
+ autoreconf = which('autoreconf')
+ with working_dir(self.configure_directory):
+ autoreconf('-ivf')