summaryrefslogtreecommitdiff
path: root/var
diff options
context:
space:
mode:
authoretiennemlb <72296335+etiennemlb@users.noreply.github.com>2024-08-30 19:57:24 +0200
committerGitHub <noreply@github.com>2024-08-30 12:57:24 -0500
commit14277358762ae841a56bb3caee04da049cd845f5 (patch)
tree1402eea19dd639427fdd9f165af94b2c1d872e22 /var
parentf88ca8cc1f10a08c1200f5988700b6e63b1e5e0e (diff)
downloadspack-14277358762ae841a56bb3caee04da049cd845f5.tar.gz
spack-14277358762ae841a56bb3caee04da049cd845f5.tar.bz2
spack-14277358762ae841a56bb3caee04da049cd845f5.tar.xz
spack-14277358762ae841a56bb3caee04da049cd845f5.zip
unzip: use more generic strip flag for cce (#46087)
* Use more generic strip flag for cce * [@spackbot] updating style on behalf of etiennemlb * Apply always
Diffstat (limited to 'var')
-rw-r--r--var/spack/repos/builtin/packages/unzip/package.py3
-rw-r--r--var/spack/repos/builtin/packages/unzip/strip.patch11
2 files changed, 13 insertions, 1 deletions
diff --git a/var/spack/repos/builtin/packages/unzip/package.py b/var/spack/repos/builtin/packages/unzip/package.py
index e15cec39da..8616b3630d 100644
--- a/var/spack/repos/builtin/packages/unzip/package.py
+++ b/var/spack/repos/builtin/packages/unzip/package.py
@@ -22,6 +22,7 @@ class Unzip(MakefilePackage):
# clang and oneapi need this patch, likely others
# There is no problem with it on gcc, so make it a catch all
patch("configure-cflags.patch")
+ patch("strip.patch")
def get_make_args(self):
make_args = ["-f", join_path("unix", "Makefile")]
@@ -31,7 +32,7 @@ class Unzip(MakefilePackage):
cflags.append("-Wno-error=implicit-int")
cflags.append("-DLARGE_FILE_SUPPORT")
- make_args.append(f"LOC=\"{' '.join(cflags)}\"")
+ make_args.append(f"LOC={' '.join(cflags)}")
return make_args
@property
diff --git a/var/spack/repos/builtin/packages/unzip/strip.patch b/var/spack/repos/builtin/packages/unzip/strip.patch
new file mode 100644
index 0000000000..bff72d7bc8
--- /dev/null
+++ b/var/spack/repos/builtin/packages/unzip/strip.patch
@@ -0,0 +1,11 @@
+--- spack-src/unix/configure 2024-08-23 14:21:34.822163922 +0200
++++ spack-src/unix/configure.patched 2024-08-23 14:27:24.862640828 +0200
+@@ -17,7 +17,7 @@
+ IZ_BZIP2=${3}
+ CFLAGS="${CFLAGS} -I. -DUNIX"
+ LFLAGS1=""
+-LFLAGS2="-s"
++LFLAGS2="-Wl,-s"
+ LN="ln -s"
+
+ CFLAGS_OPT=''