From 1fbe67af3db94d41018ef575ea43fa7149448eee Mon Sep 17 00:00:00 2001 From: Matthew Scott Krafczyk Date: Tue, 22 Nov 2016 17:30:25 -0500 Subject: Update flex package url's and versions (#2384) * Update flex package url's and versions The old sourceforge page for flex is now defunct. While version 2.6.0 still downloads fine, later versions are no longer hosted there. Development continues on github. I've adjusted urls to point to this new location. In addition, from 2.6.0 onwards, a new naming scheme for releases seems to have been adopted. I've created a url_for_version function to sort this out. * Change flex to an AutotoolsPackage Also move the url_for_version function to the end of the package definition. * Implement the autoreconf function for flex --- var/spack/repos/builtin/packages/flex/package.py | 33 +++++++++++++++--------- 1 file changed, 21 insertions(+), 12 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/flex/package.py b/var/spack/repos/builtin/packages/flex/package.py index 9b173bb0dd..cddd72f434 100644 --- a/var/spack/repos/builtin/packages/flex/package.py +++ b/var/spack/repos/builtin/packages/flex/package.py @@ -25,20 +25,29 @@ from spack import * -class Flex(Package): +class Flex(AutotoolsPackage): """Flex is a tool for generating scanners.""" - homepage = "http://flex.sourceforge.net/" - url = "http://download.sourceforge.net/flex/flex-2.5.39.tar.gz" - - version('2.6.0', '5724bcffed4ebe39e9b55a9be80859ec') - version('2.5.39', 'e133e9ead8ec0a58d81166b461244fde') + homepage = "https://github.com/westes/flex" + url = "https://github.com/westes/flex/archive/v2.6.2.tar.gz" + version('2.6.2', 'acde3a89ef2b376aac94586fd5fda460') + version('2.6.1', 'c4f31e0e4bd1711b7c91f16ef526ad90') + version('2.6.0', '760be2ee9433e822b6eb65318311c19d') + version('2.5.39', '5865e76ac69c05699f476515592750d7') + depends_on("bison", type='build') depends_on("m4", type='build') - - def install(self, spec, prefix): - configure("--prefix=%s" % prefix) - - make() - make("install") + depends_on('autoconf', type='build') + depends_on('libtool', type='build') + + def url_for_version(self, version): + base_url = "https://github.com/westes/flex/archive" + if version >= Version("2.6.0"): + return "{0}/v{1}.tar.gz".format(base_url, version) + else: + return "{0}/flex-{1}.tar.gz".format(base_url, version) + + def autoreconf(self, spec, prefix): + autogen = Executable('./autogen.sh') + autogen() -- cgit v1.2.3-70-g09d2