Fix libvterm and libtermkey packages (#34776)

* fix PREFIX for both libvterm and libtermkey

* minor: use libtool from dependency

* switch to command-line prefix instead of replacing it in Makefile
This commit is contained in:
Alberto Invernizzi 2023-01-04 10:27:21 +01:00 committed by GitHub
parent ddab6c4ac3
commit a869cfd95d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 4 deletions

View file

@ -6,7 +6,7 @@
from spack.package import *
class Libtermkey(Package):
class Libtermkey(MakefilePackage):
"""Easy keyboard entry processing for terminal programs"""
homepage = "http://www.leonerd.org.uk/code/libtermkey/"
@ -20,9 +20,15 @@ class Libtermkey(Package):
version("0.14", sha256="3d114d4509499b80a583ea39cd35f18268aacf4a7bbf56c142cd032632005c79")
depends_on("libtool", type="build")
depends_on("unibilium")
depends_on("pkgconfig")
def setup_build_environment(self, env):
env.set("LIBTOOL", self.spec["libtool"].prefix.bin.join("libtool"))
def build(self, spec, prefix):
make("PREFIX=" + prefix)
def install(self, spec, prefix):
make()
make("install", "PREFIX=" + prefix)

View file

@ -7,7 +7,7 @@
from spack.package import *
class Libvterm(Package):
class Libvterm(MakefilePackage):
"""An abstract library implementation of a terminal emulator"""
homepage = "http://www.leonerd.org.uk/code/libvterm/"
@ -25,6 +25,11 @@ class Libvterm(Package):
depends_on("libtool", type="build")
def setup_build_environment(self, env):
env.set("LIBTOOL", self.spec["libtool"].prefix.bin.join("libtool"))
def build(self, spec, prefix):
make("PREFIX=" + prefix)
def install(self, spec, prefix):
make()
make("install", "PREFIX=" + prefix)