From 0be9cee98433d5e7a71574fcc78d891b1687024c Mon Sep 17 00:00:00 2001 From: Michael Kuhn Date: Mon, 20 Mar 2017 21:07:24 +0100 Subject: Update leveldb to 1.20 (#3441) --- .../repos/builtin/packages/leveldb/package.py | 25 ++++++++++++++++++---- 1 file changed, 21 insertions(+), 4 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/leveldb/package.py b/var/spack/repos/builtin/packages/leveldb/package.py index f571baa1ce..7d2c470b60 100644 --- a/var/spack/repos/builtin/packages/leveldb/package.py +++ b/var/spack/repos/builtin/packages/leveldb/package.py @@ -31,8 +31,9 @@ class Leveldb(Package): that provides an ordered mapping from string keys to string values.""" homepage = "https://github.com/google/leveldb" - url = "https://github.com/google/leveldb/archive/v1.18.tar.gz" + url = "https://github.com/google/leveldb/archive/v1.20.tar.gz" + version('1.20', '298b5bddf12c675d6345784261302252') version('1.18', '73770de34a2a5ab34498d2e05b2b7fa0') depends_on("snappy") @@ -42,12 +43,28 @@ class Leveldb(Package): mkdirp(prefix.include) mkdirp(prefix.lib) + mkdirp(join_path(prefix.lib, 'pkgconfig')) cp = which('cp') # cp --preserve=links libleveldb.* prefix/lib - args = glob.glob('libleveldb.*') - args.append(prefix + '/lib') + args = glob.glob('out-shared/libleveldb.*') \ + + glob.glob('out-static/libleveldb.*') + args.append(prefix.lib) cp('--preserve=links', *args) - cp('-r', 'include/leveldb', prefix + '/include') + cp('-r', 'include/leveldb', prefix.include) + + with open(join_path(prefix.lib, 'pkgconfig', 'leveldb.pc'), 'w') as f: + f.write('prefix={0}\n'.format(prefix)) + f.write('exec_prefix=${prefix}\n') + f.write('libdir={0}\n'.format(prefix.lib)) + f.write('includedir={0}\n'.format(prefix.include)) + f.write('\n') + f.write('Name: leveldb\n') + f.write('Description: LevelDB is a fast key-value storage library' + ' written at Google that provides an ordered mapping from' + ' string keys to string values.\n') + f.write('Version: {0}\n'.format(spec.version)) + f.write('Cflags: -I${includedir}\n') + f.write('Libs: -L${libdir} -lleveldb\n') -- cgit v1.2.3-70-g09d2