diff options
| author | Harmen Stoppels <harmenstoppels@gmail.com> | 2022-04-11 09:20:31 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-04-11 09:20:31 +0200 |
| commit | 796ce7fe84ef578b8f1e113d36ccd48d7dec378f (patch) | |
| tree | 0a3d84ad7b880bb514860608c8181c38dcb59737 | |
| parent | 4564aa4549fe06ce3066d5a23f34c1d6266c3141 (diff) | |
| download | spack-796ce7fe84ef578b8f1e113d36ccd48d7dec378f.tar.gz spack-796ce7fe84ef578b8f1e113d36ccd48d7dec378f.tar.bz2 spack-796ce7fe84ef578b8f1e113d36ccd48d7dec378f.tar.xz spack-796ce7fe84ef578b8f1e113d36ccd48d7dec378f.zip | |
gdrcopy: don't run ldconfig (#29999)
| -rw-r--r-- | var/spack/repos/builtin/packages/gdrcopy/ldconfig.patch | 36 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/gdrcopy/package.py | 3 |
2 files changed, 39 insertions, 0 deletions
diff --git a/var/spack/repos/builtin/packages/gdrcopy/ldconfig.patch b/var/spack/repos/builtin/packages/gdrcopy/ldconfig.patch new file mode 100644 index 0000000000..5b5d5b3d4d --- /dev/null +++ b/var/spack/repos/builtin/packages/gdrcopy/ldconfig.patch @@ -0,0 +1,36 @@ +From 46c3b8e08fceaaf29cc0aba9a42d7a203a2379f8 Mon Sep 17 00:00:00 2001 +From: Harmen Stoppels <harmenstoppels@gmail.com> +Date: Mon, 11 Apr 2022 08:43:19 +0200 +Subject: [PATCH] Makefile: remove `ldconfig -n`. + +`ldconfig` can't be assumed to be available. + +``` +ldconfig -n /tmp/spack-stage/spack-stage-gdrcopy-2.3-lxw353euu26enjkcctzbux6n6cj3wjgt/spack-src/src +make[1]: ldconfig: Command not found +make[1]: *** [Makefile:60: libgdrapi.so.2.3] Error 127 +``` + +``` +cat /etc/os-release +NAME="SLES" +VERSION="15-SP2" +VERSION_ID="15.2" +PRETTY_NAME="SUSE Linux Enterprise Server 15 SP2" +``` +--- + src/Makefile | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/src/Makefile b/src/Makefile +index 8a861d3..1bcec4c 100644 +--- a/src/Makefile ++++ b/src/Makefile +@@ -57,7 +57,6 @@ lib: $(LIB) + $(LIBOBJS): CFLAGS+=-fPIC + $(LIB): $(LIBOBJS) + $(CC) -shared -Wl,-soname,$(LIB_SONAME) -o $@ $^ +- ldconfig -n $(PWD) + ln -sf $(LIB_DYNAMIC) $(LIB_SONAME) + ln -sf $(LIB_SONAME) $(LIB_BASENAME) + diff --git a/var/spack/repos/builtin/packages/gdrcopy/package.py b/var/spack/repos/builtin/packages/gdrcopy/package.py index 9ea6690abb..d5579636e4 100644 --- a/var/spack/repos/builtin/packages/gdrcopy/package.py +++ b/var/spack/repos/builtin/packages/gdrcopy/package.py @@ -21,6 +21,9 @@ class Gdrcopy(MakefilePackage): version('2.0', sha256='98320e6e980a7134ebc4eedd6cf23647104f2b3c557f2eaf0d31a02609f5f2b0') version('1.3', sha256='f11cdfe389b685f6636b80b4a3312dc014a385ad7220179c1318c60e2e28af3a') + # Don't call ldconfig: https://github.com/NVIDIA/gdrcopy/pull/229 + patch('ldconfig.patch', when='@2.0:') + def build(self, spec, prefix): make('lib') |