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

fix various pkgs depending on libtool only (#46299)

Browse Source 
autotools packages with a configure script should generate the libtool
executable, there's no point in `depends_on("libtool", type="build")`.

the libtool executable in `<libtool prefix>/bin/libtool` is configured
for the wrong toolchain (libtools %compiler instead of the package's
%compiler).

Some package link to `libltdl.so`, which is fine, but had a wrong
dependency type.
This commit is contained in:
Harmen Stoppels 2024-09-12 14:05:50 +02:00 committed by GitHub
parent 6cb16c39ab
commit 8fa65b286c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
19 changed files with 33 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
var/spack/repos/builtin/packages/3proxy/package.py
View File

@ -18,17 +18,17 @@ class _3proxy(MakefilePackage):
version("0.8.12", sha256="c2ad3798b4f0df06cfcc7b49f658304e451d60e4834e2705ef83ddb85a03f849")
version("0.8.11", sha256="fc4295e1a462baa61977fcc21747db7861c4e3d0dcca86cbaa3e06017e5c66c9")
depends_on("c", type="build") # generated
depends_on("autoconf", type="build")
depends_on("automake", type="build")
depends_on("libtool", type="build")
depends_on("m4", type="build")
depends_on("c", type="build")
def build(self, spec, prefix):
make("-f", f"Makefile.{platform.system()}", f"CC={spack_cc}")
make("-f", f"Makefile.{platform.system()}", f"CC={spack_cc}", f"LN={spack_cc}")
def install(self, spec, prefix):
make(
"-f", f"Makefile.{platform.system()}", f"prefix={prefix}", f"CC={spack_cc}", "install"
"-f",
f"Makefile.{platform.system()}",
f"prefix={prefix}",
f"CC={spack_cc}",
f"LN={spack_cc}",
"install",
)

1
var/spack/repos/builtin/packages/geopm-runtime/package.py
View File

@ -58,6 +58,7 @@ class GeopmRuntime(AutotoolsPackage):
# Autotools dependencies
depends_on("automake", type="build")
depends_on("autoconf", type="build")
depends_on("libtool", type="build")
depends_on("file")

1
var/spack/repos/builtin/packages/geopm-service/package.py
View File

@ -67,6 +67,7 @@ class GeopmService(AutotoolsPackage):
# Autotools dependencies
depends_on("automake", type="build")
depends_on("autoconf", type="build")
depends_on("libtool", type="build")
depends_on("file")

1
var/spack/repos/builtin/packages/graphicsmagick/package.py
View File

@ -42,7 +42,6 @@ class Graphicsmagick(AutotoolsPackage):
depends_on("libpng")
depends_on("libsm")
depends_on("libtiff")
depends_on("libtool")
depends_on("libxml2")
depends_on("xz")
depends_on("zlib-api")

2
var/spack/repos/builtin/packages/guile/package.py
View File

@ -41,7 +41,7 @@ class Guile(AutotoolsPackage, GNUMirrorPackage):
depends_on("bdw-gc@7.0: threads=dgux386", when="threads=dgux386")
depends_on("gmp@4.2:")
depends_on("gettext")
depends_on("libtool@1.5.6:")
depends_on("libtool@1.5.6:", type="link") # links to libltdl.so
depends_on("libunistring@0.9.3:")
depends_on("libffi")
depends_on("readline", when="+readline")

3
var/spack/repos/builtin/packages/imagemagick/package.py
View File

@ -34,8 +34,6 @@ class Imagemagick(AutotoolsPackage):
variant("rsvg", default=False, description="Enable RSVG support")
depends_on("pkgconfig@0.20:", type="build")
depends_on("libtool", when="@:7.1.0-60", type="build")
depends_on("libtool", when="@7.0.8:7.1.0-60", type=("build", "link"))
depends_on("fontconfig@2.1:")
depends_on("freetype@2.8:")
@ -48,7 +46,6 @@ class Imagemagick(AutotoolsPackage):
depends_on("ghostscript-fonts", when="+ghostscript")
depends_on("libsm", when="@:7.1.0-60 platform=linux")
depends_on("libtool", when="platform=linux")
def configure_args(self):
args = []

2
var/spack/repos/builtin/packages/libcanberra/package.py
View File

@ -39,7 +39,7 @@ class Libcanberra(AutotoolsPackage):
depends_on("gtkplus", when="+gtk")
depends_on("libvorbis")
depends_on("libtool", type="build")
depends_on("libtool", type="link") # libltdl
depends_on("pkgconfig", type="build")

3
var/spack/repos/builtin/packages/libpciaccess/package.py
View File

@ -19,9 +19,8 @@ class Libpciaccess(AutotoolsPackage, XorgPackage):
version("0.13.5", sha256="fe26ec788732b4ef60b550f2d3fa51c605d27f646e18ecec878f061807a3526e")
version("0.13.4", sha256="74d92bda448e6fdb64fee4e0091255f48d625d07146a121653022ed3a0ca1f2f")
depends_on("c", type="build") # generated
depends_on("c", type="build")
depends_on("libtool", type="build")
depends_on("pkgconfig", type="build")
depends_on("util-macros", type="build")

2
var/spack/repos/builtin/packages/nest/package.py
View File

@ -53,7 +53,7 @@ class Nest(CMakePackage):
depends_on("gsl", when="+gsl")
depends_on("readline")
depends_on("libtool")
depends_on("libtool", type="link") # links against libltdl
depends_on("pkgconfig", type="build")
extends("python", when="+python")

9
var/spack/repos/builtin/packages/open-iscsi/package.py
View File

@ -21,13 +21,16 @@ class OpenIscsi(MakefilePackage):
version("2.0.877", sha256="69eb95b0c39dee2da9d0d751bfdcdb8d11f9d37390de15c1a0b4558f9d0c4a57")
version("2.0.876", sha256="9f01327d5e100ed794dc5083fc18dc4a06a0c29c77b252e21abd1b8f56edd9a7")
depends_on("c", type="build") # generated
depends_on("c", type="build")
depends_on("gettext")
depends_on("uuid")
depends_on("util-linux")
depends_on("kmod")
depends_on("open-isns")
depends_on("autoconf", type="build")
depends_on("automake", type="build")
depends_on("libtool", type="build")
def setup_build_environment(self, env):
@ -35,7 +38,7 @@ def setup_build_environment(self, env):
def setup_run_environment(self, env):
env.prepend_path("PATH", self.prefix.sbin)
env.prepend_path("LD_LIBRARY_PATH", self.prefix.usr.lib64)
def install(self, spec, prefix):
make("install", "DESTDIR={0}".format(prefix))
etc_dir = join_path(prefix, "etc")
make("install", f"prefix={prefix}", f"exec_prefix={prefix}", f"etcdir={etc_dir}")

10
var/spack/repos/builtin/packages/open-isns/package.py
View File

@ -21,13 +21,15 @@ class OpenIsns(AutotoolsPackage):
version("0.97", sha256="c1c9ae740172e55a1ff33bc22151ec3d916562bf5d60c8420cd64496343683a9")
version("0.96", sha256="487fd0d87826423ea99dc159826d0b654a5da016ed670d4395a77bfa4f62e2ec")
depends_on("c", type="build") # generated
depends_on("c", type="build")
def configure_args(self):
args = ["--enable-shared"]
return args
def install(self, spec, prefix):
make("install")
make("install_hdrs")
make("install_lib")
etc_dir = join_path(prefix, "etc")
var_dir = join_path(prefix, "var")
make("install", f"etcdir={etc_dir}", f"vardir={var_dir}")
make("install_hdrs", f"etcdir={etc_dir}", f"vardir={var_dir}")
make("install_lib", f"etcdir={etc_dir}", f"vardir={var_dir}")

2
var/spack/repos/builtin/packages/openspeedshop-utils/package.py
View File

@ -90,7 +90,7 @@ class OpenspeedshopUtils(CMakePackage):
# Dependencies for openspeedshop that are common to all
# the variants of the OpenSpeedShop build
depends_on("libtool", type="build")
depends_on("libtool", type="link") # links against libltdl
depends_on("bison", type="build")
depends_on("flex@2.6.1", type="build")

2
var/spack/repos/builtin/packages/openspeedshop/package.py
View File

@ -94,7 +94,7 @@ class Openspeedshop(CMakePackage):
# Dependencies for openspeedshop that are common to all
# the variants of the OpenSpeedShop build
depends_on("libtool", type="build")
depends_on("libtool", type="link") # links against libltdl
depends_on("bison", type="build")
depends_on("flex@2.6.1", type="build")

2
var/spack/repos/builtin/packages/pocl/package.py
View File

@ -47,7 +47,7 @@ class Pocl(CMakePackage):
depends_on("cmake @2.8.12:", type="build")
depends_on("hwloc")
depends_on("hwloc@:1", when="@:1.1")
depends_on("libtool", type=("build", "link", "run"))
depends_on("libtool", type="link", when="@:1.3") # links against libltdl
depends_on("pkgconfig", type="build")
depends_on("llvm +clang")

2
var/spack/repos/builtin/packages/pulseaudio/package.py
View File

@ -44,7 +44,7 @@ class Pulseaudio(AutotoolsPackage):
depends_on("libcap")
depends_on("iconv")
depends_on("libsndfile@1.0.18:")
depends_on("libtool@2.4:") # links to libltdl.so
depends_on("libtool@2.4:", type="link") # links to libltdl.so
depends_on("libsm", when="+x11")
depends_on("uuid", when="+x11")
depends_on("libx11", when="+x11")

1
var/spack/repos/builtin/packages/racket/package.py
View File

@ -22,7 +22,6 @@ class Racket(MakefilePackage):
depends_on("libffi", type=("build", "link", "run"))
depends_on("patchutils")
depends_on("libtool", type=("build"))
variant("cs", default=True, description="Build Racket CS (new ChezScheme VM)")
variant("bc", default=False, description="Build Racket BC (old MZScheme VM)")

3
var/spack/repos/builtin/packages/scrot/package.py
View File

@ -20,10 +20,9 @@ class Scrot(AutotoolsPackage):
version("1.6", sha256="42f64d38f04ec530c8b4ebdae04cce8b6893b2f8d30627391d390edcba917090")
version("1.5", sha256="42fcf1c97940f4b4e34ca69990a0fc9b98991357bd6a4b67f30ebe0ccc10f093")
depends_on("c", type="build") # generated
depends_on("c", type="build")
depends_on("giblib", when="@:1.5")
depends_on("imlib2")
depends_on("libtool")
depends_on("libxcomposite")
depends_on("libxfixes")

3
var/spack/repos/builtin/packages/unixodbc/package.py
View File

@ -18,10 +18,9 @@ class Unixodbc(AutotoolsPackage):
version("2.3.4", sha256="2e1509a96bb18d248bf08ead0d74804957304ff7c6f8b2e5965309c632421e39")
depends_on("c", type="build") # generated
depends_on("c", type="build")
depends_on("iconv")
depends_on("libtool")
@property
def libs(self):

3
var/spack/repos/builtin/packages/xbae/package.py
View File

@ -17,9 +17,8 @@ class Xbae(AutotoolsPackage):
version("4.60.4", sha256="eb72702ed0a36d043f2075a9d5a4545556da1b8dab4d67d85fca92f37aeb04a8")
depends_on("c", type="build") # generated
depends_on("c", type="build")
depends_on("libtool", type="build")
depends_on("libxext")
depends_on("libxmu")
depends_on("libxpm")