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

flux: update flux-core package and add a flux-sched package (#8818)

Browse Source 
Renames the flux package to flux-core and updates its dependencies, versions,
and variants. Adds a flux-sched package.

This also updates two flux-core dependencies: lua and czmq.
This commit is contained in:
Stephen Herbein
2018-08-02 13:20:55 -07:00
committed by scheibelp
parent e554add64b
commit 3b0983a217
5 changed files with 261 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
var/spack/repos/builtin/packages/lua/package.py
View File

@@ -64,28 +64,41 @@ def install(self, spec, prefix):
else:
target = 'linux'
make('INSTALL_TOP=%s' % prefix,
'MYCFLAGS=%s' % (
self.compiler.pic_flag),
'MYLDFLAGS=-L%s -L%s' % (
spec['readline'].prefix.lib,
spec['ncurses'].prefix.lib),
'MYLIBS=-lncursesw',
'CC=%s -std=gnu99' % spack_cc,
'CC=%s -std=gnu99 %s' % (spack_cc,
self.compiler.pic_flag),
target)
make('INSTALL_TOP=%s' % prefix,
'MYCFLAGS=%s' % (
self.compiler.pic_flag),
'MYLDFLAGS=-L%s -L%s' % (
spec['readline'].prefix.lib,
spec['ncurses'].prefix.lib),
'MYLIBS=-lncursesw',
'CC=%s -std=gnu99' % spack_cc,
'install')
static_to_shared_library(join_path(prefix.lib, 'liblua.a'),
arguments=['-lm'], version=self.version,
compat_version=self.version.up_to(2))
# compatibility with ax_lua.m4 from autoconf-archive
# https://www.gnu.org/software/autoconf-archive/ax_lua.html
with working_dir(prefix.lib):
# e.g., liblua.so.5.1.5
src_path = 'liblua.{0}.{1}'.format(dso_suffix,
str(self.version.up_to(3)))
# For lua version 5.1.X, the symlinks should be:
# liblua5.1.so
# liblua51.so
# liblua-5.1.so
# liblua-51.so
version_formats = [str(self.version.up_to(2)),
Version(str(self.version.up_to(2))).joined]
for version_str in version_formats:
for joiner in ['', '-']:
dest_path = 'liblua{0}{1}.{2}'.format(joiner,
version_str,
dso_suffix)
os.symlink(src_path, dest_path)
with working_dir(os.path.join('luarocks', 'luarocks')):
configure('--prefix=' + prefix, '--with-lua=' + prefix)
make('build')