zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add latest version of git, convert to AutotoolsPackage (#3466)

Browse Source
This commit is contained in:
Adam J. Stewart 2017-03-16 12:50:10 -05:00 committed by GitHub
parent 2eda08f192
commit 4c7a721341
1 changed files with 59 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

112
var/spack/repos/builtin/packages/git/package.py
View File

@ -26,31 +26,26 @@
from spack import * from spack import *
class Git(Package): class Git(AutotoolsPackage):
"""Git is a free and open source distributed version control """Git is a free and open source distributed version control
system designed to handle everything from small to very large system designed to handle everything from small to very large
projects with speed and efficiency.""" projects with speed and efficiency."""
homepage = "http://git-scm.com"
url = "https://github.com/git/git/tarball/v2.7.1"
# See here for info on vulnerable Git versions: homepage = "http://git-scm.com"
# http://www.theregister.co.uk/2016/03/16/git_server_client_patch_now/ url = "https://github.com/git/git/archive/v2.12.0.tar.gz"
# All the following are vulnerable
# version('2.6.3', 'b711be7628a4a2c25f38d859ee81b423')
# version('2.6.2', 'da293290da69f45a86a311ad3cd43dc8')
# version('2.6.1', '4c62ee9c5991fe93d99cf2a6b68397fd')
# version('2.6.0', 'eb76a07148d94802a1745d759716a57e')
# version('2.5.4', '3eca2390cf1fa698b48e2a233563a76b')
# version('2.2.1', 'ff41fdb094eed1ec430aed8ee9b9849c')
# In order to add new versions here, add a new list entry with: # In order to add new versions here, add a new list entry with:
# * version: versionnumber # * version: {version}
# * md5: the md5sum of the v<versionnumber>.tar.gz # * md5: the md5sum of the v{version}.tar.gz
# * md5_manpages: the md5sum of the corresponding manpage from # * md5_manpages: the md5sum of the corresponding manpage from
# https://www.kernel.org/pub/software/scm/git/ # https://www.kernel.org/pub/software/scm/git/git-manpages-{version}.tar.xz
# git-manpages-{}.tar.xz
releases = [ releases = [
{
'version': '2.12.0',
'md5': '11a440ce0ed02098adf554c797facfd3',
'md5_manpages': '4d11e05068231e37d7e42935e9cc43a1',
},
{ {
'version': '2.11.1', 'version': '2.11.1',
'md5': '2cf960f19e56f27248816809ae896794', 'md5': '2cf960f19e56f27248816809ae896794',
@ -121,45 +116,56 @@ class Git(Package):
for release in releases: for release in releases:
version(release['version'], release['md5']) version(release['version'], release['md5'])
resource( resource(
name="git-manpages", name='git-manpages',
url="https://www.kernel.org/pub/software/scm/git/" url="https://www.kernel.org/pub/software/scm/git/git-manpages-{0}.tar.xz".format(
"git-manpages-{0}.tar.xz".format(release['version']), release['version']),
md5=release['md5_manpages'], md5=release['md5_manpages'],
placement="git-manpages", placement='git-manpages',
when="@{0}".format(release['version'])) when='@{0}'.format(release['version']))
depends_on("autoconf", type='build') depends_on('curl')
depends_on("curl") depends_on('expat')
depends_on("expat") depends_on('gettext')
depends_on("gettext") depends_on('libiconv')
depends_on("libiconv") depends_on('openssl')
depends_on("openssl") depends_on('pcre')
depends_on("pcre") depends_on('perl')
depends_on("perl") depends_on('zlib')
depends_on("zlib")
def install(self, spec, prefix): depends_on('autoconf', type='build')
env['LDFLAGS'] = "-L%s" % spec['gettext'].prefix.lib + " -lintl" depends_on('automake', type='build')
configure_args = [ depends_on('libtool', type='build')
"--prefix=%s" % prefix, depends_on('m4', type='build')
"--with-curl=%s" % spec['curl'].prefix,
"--with-expat=%s" % spec['expat'].prefix, def setup_environment(self, spack_env, run_env):
"--with-iconv=%s" % spec['libiconv'].prefix, spack_env.set('LDFLAGS', '-L{0} -lintl'.format(
"--with-libpcre=%s" % spec['pcre'].prefix, self.spec['gettext'].prefix.lib))
"--with-openssl=%s" % spec['openssl'].prefix,
"--with-perl=%s" % join_path(spec['perl'].prefix.bin, 'perl'), def configure_args(self):
"--with-zlib=%s" % spec['zlib'].prefix, spec = self.spec
return [
'--with-curl={0}'.format(spec['curl'].prefix),
'--with-expat={0}'.format(spec['expat'].prefix),
'--with-iconv={0}'.format(spec['libiconv'].prefix),
'--with-libpcre={0}'.format(spec['pcre'].prefix),
'--with-openssl={0}'.format(spec['openssl'].prefix),
'--with-perl={0}'.format(
join_path(spec['perl'].prefix.bin, 'perl')),
'--with-zlib={0}'.format(spec['zlib'].prefix),
] ]
which('autoreconf')('-i') @run_after('configure')
configure(*configure_args) def filter_rt(self):
if sys.platform == "darwin": if sys.platform == 'darwin':
# Don't link with -lrt; the system has no (and needs no) librt # Don't link with -lrt; the system has no (and needs no) librt
filter_file(r' -lrt$', '', 'Makefile') filter_file(r' -lrt$', '', 'Makefile')
make()
make("install")
with working_dir("git-manpages"): @run_after('install')
install_tree("man1", prefix.share_man1) def install_manpages(self):
install_tree("man5", prefix.share_man5) prefix = self.prefix
install_tree("man7", prefix.share_man7)
with working_dir('git-manpages'):
install_tree('man1', prefix.share_man1)
install_tree('man5', prefix.share_man5)
install_tree('man7', prefix.share_man7)