From a5b76d24cf44a9b60d53cd807ebbc93034674623 Mon Sep 17 00:00:00 2001 From: Pramod S Kumbhar Date: Tue, 8 Aug 2017 00:03:51 +0200 Subject: Update openspeedshop and cbtf-krell to use latest binutils version (fix #4992) (#4997) --- .../packages/binutils/binutilskrell-2.24.patch | 52 ---------------------- .../repos/builtin/packages/binutils/package.py | 5 --- .../repos/builtin/packages/cbtf-krell/package.py | 2 +- .../builtin/packages/openspeedshop/package.py | 4 +- 4 files changed, 3 insertions(+), 60 deletions(-) delete mode 100644 var/spack/repos/builtin/packages/binutils/binutilskrell-2.24.patch diff --git a/var/spack/repos/builtin/packages/binutils/binutilskrell-2.24.patch b/var/spack/repos/builtin/packages/binutils/binutilskrell-2.24.patch deleted file mode 100644 index f48291a6c9..0000000000 --- a/var/spack/repos/builtin/packages/binutils/binutilskrell-2.24.patch +++ /dev/null @@ -1,52 +0,0 @@ ---- binutils-2.24/libiberty/Makefile.in 2013-11-04 10:33:40.000000000 -0500 -+++ binutils-2.24-fixes/libiberty/Makefile.in 2014-10-17 16:22:31.413655000 -0400 -@@ -66,6 +66,7 @@ - MAKEOVERRIDES = - - TARGETLIB = ./libiberty.a -+TARGETLIBPIC = ./libiberty_pic.a - TESTLIB = ./testlib.a - - LIBOBJS = @LIBOBJS@ -@@ -355,27 +356,27 @@ - # since it will be passed the multilib flags. - MULTIOSDIR = `$(CC) $(CFLAGS) -print-multi-os-directory` - install_to_libdir: all -- if test -n "${target_header_dir}"; then \ -- ${mkinstalldirs} $(DESTDIR)$(libdir)/$(MULTIOSDIR); \ -- $(INSTALL_DATA) $(TARGETLIB) $(DESTDIR)$(libdir)/$(MULTIOSDIR)/$(TARGETLIB)n; \ -- ( cd $(DESTDIR)$(libdir)/$(MULTIOSDIR) ; chmod 644 $(TARGETLIB)n ;$(RANLIB) $(TARGETLIB)n ); \ -- mv -f $(DESTDIR)$(libdir)/$(MULTIOSDIR)/$(TARGETLIB)n $(DESTDIR)$(libdir)/$(MULTIOSDIR)/$(TARGETLIB); \ -- case "${target_header_dir}" in \ -- /*) thd=${target_header_dir};; \ -- *) thd=${includedir}/${target_header_dir};; \ -- esac; \ -- ${mkinstalldirs} $(DESTDIR)$${thd}; \ -- for h in ${INSTALLED_HEADERS}; do \ -- ${INSTALL_DATA} $$h $(DESTDIR)$${thd}; \ -- done; \ -- fi -+ ${mkinstalldirs} $(DESTDIR)$(libdir)/$(MULTIOSDIR); \ -+ $(INSTALL_DATA) $(TARGETLIB) $(DESTDIR)$(libdir)/$(MULTIOSDIR)/$(TARGETLIB)n; \ -+ $(INSTALL_DATA) pic/$(TARGETLIB) $(DESTDIR)$(libdir)/$(MULTIOSDIR)/$(TARGETLIBPIC)n; \ -+ ( cd $(DESTDIR)$(libdir)/$(MULTIOSDIR) ; chmod 644 $(TARGETLIB)n ;$(RANLIB) $(TARGETLIB)n ); \ -+ ( cd $(DESTDIR)$(libdir)/$(MULTIOSDIR) ; chmod 644 $(TARGETLIBPIC)n ;$(RANLIB) $(TARGETLIBPIC)n ); \ -+ mv -f $(DESTDIR)$(libdir)/$(MULTIOSDIR)/$(TARGETLIB)n $(DESTDIR)$(libdir)/$(MULTIOSDIR)/$(TARGETLIB); \ -+ mv -f $(DESTDIR)$(libdir)/$(MULTIOSDIR)/$(TARGETLIBPIC)n $(DESTDIR)$(libdir)/$(MULTIOSDIR)/$(TARGETLIBPIC); \ -+ ${mkinstalldirs} $(DESTDIR)$${includedir}; \ -+ for h in ${INSTALLED_HEADERS}; do \ -+ ${INSTALL_DATA} $$h $(DESTDIR)$${includedir}; \ -+ done; - @$(MULTIDO) $(FLAGS_TO_PASS) multi-do DO=install - - install_to_tooldir: all - ${mkinstalldirs} $(DESTDIR)$(tooldir)/lib/$(MULTIOSDIR) - $(INSTALL_DATA) $(TARGETLIB) $(DESTDIR)$(tooldir)/lib/$(MULTIOSDIR)/$(TARGETLIB)n -+ $(INSTALL_DATA) pic/$(TARGETLIB) $(DESTDIR)$(tooldir)/lib/$(MULTIOSDIR)/$(TARGETLIBPIC)n - ( cd $(DESTDIR)$(tooldir)/lib/$(MULTIOSDIR) ; chmod 644 $(TARGETLIB)n; $(RANLIB) $(TARGETLIB)n ) -+ ( cd $(DESTDIR)$(tooldir)/lib/$(MULTIOSDIR) ; chmod 644 $(TARGETLIBPIC)n; $(RANLIB) $(TARGETLIBPIC)n ) - mv -f $(DESTDIR)$(tooldir)/lib/$(MULTIOSDIR)/$(TARGETLIB)n $(DESTDIR)$(tooldir)/lib/$(MULTIOSDIR)/$(TARGETLIB) -+ mv -f $(DESTDIR)$(tooldir)/lib/$(MULTIOSDIR)/$(TARGETLIBPIC)n $(DESTDIR)$(tooldir)/lib/$(MULTIOSDIR)/$(TARGETLIBPIC) - @$(MULTIDO) $(FLAGS_TO_PASS) multi-do DO=install - - # required-list was used when building a shared bfd/opcodes/libiberty diff --git a/var/spack/repos/builtin/packages/binutils/package.py b/var/spack/repos/builtin/packages/binutils/package.py index abfe33df9c..de1f23520f 100644 --- a/var/spack/repos/builtin/packages/binutils/package.py +++ b/var/spack/repos/builtin/packages/binutils/package.py @@ -39,16 +39,11 @@ class Binutils(AutotoolsPackage): version('2.23.2', '4f8fa651e35ef262edc01d60fb45702e') version('2.20.1', '2b9dc8f2b7dbd5ec5992c6e29de0b764') - # Add a patch that creates binutils libiberty_pic.a which is preferred by - # OpenSpeedShop and cbtf-krell - variant('krellpatch', default=False, - description="build with openspeedshop based patch.") variant('plugins', default=False, description="enable plugins, needed for gold linker") variant('gold', default=True, description="build the gold linker") variant('libiberty', default=False, description='Also install libiberty.') - patch('binutilskrell-2.24.patch', when='@2.24+krellpatch') patch('cr16.patch') patch('update_symbol-2.26.patch', when='@2.26') diff --git a/var/spack/repos/builtin/packages/cbtf-krell/package.py b/var/spack/repos/builtin/packages/cbtf-krell/package.py index 40fc932e8f..fce4ae62e2 100644 --- a/var/spack/repos/builtin/packages/cbtf-krell/package.py +++ b/var/spack/repos/builtin/packages/cbtf-krell/package.py @@ -75,7 +75,7 @@ class CbtfKrell(CMakePackage): depends_on("cmake@3.0.2:", type='build') # For binutils service - depends_on("binutils@2.24+krellpatch") + depends_on("binutils") # collectionTool depends_on("boost@1.50.0:1.59.0") diff --git a/var/spack/repos/builtin/packages/openspeedshop/package.py b/var/spack/repos/builtin/packages/openspeedshop/package.py index 95971af10e..1b71e44346 100644 --- a/var/spack/repos/builtin/packages/openspeedshop/package.py +++ b/var/spack/repos/builtin/packages/openspeedshop/package.py @@ -78,7 +78,7 @@ class Openspeedshop(CMakePackage): variant('cuda', default=False, description="build with cuda packages included.") - variant('gui', default='qt3', values=('none', 'qt3', 'qt4'), + variant('gui', default='qt3', values=('none', 'qt3', 'qt4'), description='Build or not build a GUI of choice' ) @@ -111,7 +111,7 @@ class Openspeedshop(CMakePackage): depends_on("libtool", type='build') depends_on("bison", type='build') depends_on("flex", type='build') - depends_on("binutils@2.24+krellpatch", type='build') + depends_on("binutils", type='build') depends_on("elf", type="link") depends_on("libdwarf") depends_on("sqlite") -- cgit v1.2.3-70-g09d2