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

lua-luajit: remove duplicated lua-jit and merge to lua-luajit. (#18348)

Browse Source
This commit is contained in:
Toyohisa Kameyama 2020-08-31 09:16:53 +09:00 committed by GitHub
parent 665e5ce0fd
commit 7f9018e893
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 25 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
var/spack/repos/builtin/packages/lua-jit/package.py
View File

@ -1,40 +0,0 @@
# Copyright 2013-2020 Lawrence Livermore National Security, LLC and other
# Spack Project Developers. See the top-level COPYRIGHT file for details.
#
# SPDX-License-Identifier: (Apache-2.0 OR MIT)
from spack import *
import os
class LuaJit(MakefilePackage):
"""LuaJIT is a Just-In-Time Compiler (JIT) for the Lua programming
language. Lua is a powerful, dynamic and light-weight programming
language. It may be embedded or used as a general-purpose,
stand-alone language. """
homepage = "http://luajit.org/luajit.html"
url = "http://luajit.org/download/LuaJIT-2.1.0-beta3.tar.gz"
version('2.1.0-beta3', sha256='1ad2e34b111c802f9d0cdf019e986909123237a28c746b21295b63c9e785d9c3')
version('2.0.5', sha256='874b1f8297c697821f561f9b73b57ffd419ed8f4278c82e05b48806d30c1e979', preferred=True)
conflicts('@:2.0.5', when='target=aarch64:')
depends_on('lua', type='link')
@property
def headers(self):
hdrs = find_headers('luajit', self.prefix.include, recursive=True)
hdrs.directories = os.path.dirname(hdrs[0])
return hdrs or None
def edit(self, spec, prefix):
makefile = FileFilter('Makefile')
makefile.filter('PREFIX= .*', 'PREFIX = {0}'.format(prefix))
src_makefile = FileFilter(join_path('src', 'Makefile'))
src_makefile.filter(
'^DEFAULT_CC = .*',
'DEFAULT_CC = {0}'.format(spack_cc))
src_makefile.filter(
'^DYNAMIC_CC = .*',
'DYNAMIC_CC = $(CC) {0}'.format(self.compiler.cc_pic_flag))

29
var/spack/repos/builtin/packages/lua-luajit/package.py
View File

@ -7,15 +7,36 @@
from spack import *
class LuaLuajit(Package):
class LuaLuajit(MakefilePackage):
"""Flast flexible JITed lua"""
homepage = "http://www.luajit.org"
url = "http://luajit.org/download/LuaJIT-2.0.4.tar.gz"
url = "http://luajit.org/download/LuaJIT-2.0.5.tar.gz"
version('2.1.0-beta3', sha256='1ad2e34b111c802f9d0cdf019e986909123237a28c746b21295b63c9e785d9c3')
version('2.0.5', sha256='874b1f8297c697821f561f9b73b57ffd419ed8f4278c82e05b48806d30c1e979', preferred=True)
version('2.0.4', sha256='620fa4eb12375021bef6e4f237cbd2dd5d49e56beb414bee052c746beef1807d')
def install(self, spec, prefix):
conflicts('@:2.0.5', when='target=aarch64:')
@property
def headers(self):
hdrs = find_headers('luajit', self.prefix.include, recursive=True)
hdrs.directories = os.path.dirname(hdrs[0])
return hdrs or None
def edit(self, spec, prefix):
makefile = FileFilter('Makefile')
makefile.filter('PREFIX= .*', 'PREFIX = {0}'.format(prefix))
src_makefile = FileFilter(join_path('src', 'Makefile'))
src_makefile.filter(
'^DEFAULT_CC = .*',
'DEFAULT_CC = {0}'.format(spack_cc))
src_makefile.filter(
'^DYNAMIC_CC = .*',
'DYNAMIC_CC = $(CC) {0}'.format(self.compiler.cc_pic_flag))
# Linking with the C++ compiler is a dirty hack to deal with the fact
# that unwinding symbols are not included by libc, this is necessary
# on some platforms for the final link stage to work
make("install", "PREFIX=" + prefix, "TARGET_LD=" + os.environ['CXX'])
src_makefile.filter(
'^TARGET_LD = .*',
'TARGET_LD = {0}'.format(spack_cxx))