diff options
| author | Todd Gamblin <tgamblin@llnl.gov> | 2024-11-09 01:25:25 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-11-09 10:25:25 +0100 |
| commit | 7fbfb0f6dc962a18efbaefdf199f3a8e3760194a (patch) | |
| tree | f34674f68207c045961186361956700087e69ec1 /var | |
| parent | 11d276ab6fc24ad96155940f8aa0b7d0ae382aa5 (diff) | |
| download | spack-7fbfb0f6dc962a18efbaefdf199f3a8e3760194a.tar.gz spack-7fbfb0f6dc962a18efbaefdf199f3a8e3760194a.tar.bz2 spack-7fbfb0f6dc962a18efbaefdf199f3a8e3760194a.tar.xz spack-7fbfb0f6dc962a18efbaefdf199f3a8e3760194a.zip | |
Revert "fix patched dependencies across repositories (#42463)" (#47519)
This reverts commit da1d533877f90610571b72f070c01e13b9729108.
Diffstat (limited to 'var')
6 files changed, 0 insertions, 58 deletions
diff --git a/var/spack/repos/builtin.mock/README.md b/var/spack/repos/builtin.mock/README.md deleted file mode 100644 index 5a5f6e747f..0000000000 --- a/var/spack/repos/builtin.mock/README.md +++ /dev/null @@ -1,7 +0,0 @@ -# `builtin.mock` - -This repository and the secondary mock repo `builtin.mock2` contain mock packages used -by Spack tests. - -Most tests are in `builtin.mock`, but `builtin.mock2` is used for scenarios where we -need multiple repos for testing. diff --git a/var/spack/repos/builtin.mock/packages/patch-a-foreign-dependency/mock2-package.patch b/var/spack/repos/builtin.mock/packages/patch-a-foreign-dependency/mock2-package.patch deleted file mode 100644 index 02bfad9103..0000000000 --- a/var/spack/repos/builtin.mock/packages/patch-a-foreign-dependency/mock2-package.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- patch-a-dependency/configure 2018-08-13 23:13:51.000000000 -0700 -+++ patch-a-dependency/configure.patched 2018-08-13 23:14:15.000000000 -0700 -@@ -2,7 +2,7 @@ - prefix=$(echo $1 | sed 's/--prefix=//') - cat > Makefile <<EOF - all: -- echo Building... -+ echo Patched! - - install: - mkdir -p $prefix diff --git a/var/spack/repos/builtin.mock/packages/patch-a-foreign-dependency/package.py b/var/spack/repos/builtin.mock/packages/patch-a-foreign-dependency/package.py deleted file mode 100644 index 6e52029a1d..0000000000 --- a/var/spack/repos/builtin.mock/packages/patch-a-foreign-dependency/package.py +++ /dev/null @@ -1,17 +0,0 @@ -# Copyright 2013-2024 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.package import * - - -class PatchAForeignDependency(Package): - """Package that requries a patched version of a dependency.""" - - homepage = "http://www.example.com" - url = "http://www.example.com/patch-a-dependency-1.0.tar.gz" - - version("1.0", md5="0123456789abcdef0123456789abcdef") - - depends_on("mock2-patched-dependency", patches=patch("mock2-package.patch")) diff --git a/var/spack/repos/builtin.mock2/README.md b/var/spack/repos/builtin.mock2/README.md deleted file mode 100644 index 8a079b1a6b..0000000000 --- a/var/spack/repos/builtin.mock2/README.md +++ /dev/null @@ -1,6 +0,0 @@ -# `builtin.mock2` - -This is the secondary mock repo for testing Spack, along with `builtin.mock`. - -Most tests are in `builtin.mock`, but this repository is used for scenarios where we -need multiple repos for testing. diff --git a/var/spack/repos/builtin.mock2/packages/mock2-patched-dependency/package.py b/var/spack/repos/builtin.mock2/packages/mock2-patched-dependency/package.py deleted file mode 100644 index ed34ff025a..0000000000 --- a/var/spack/repos/builtin.mock2/packages/mock2-patched-dependency/package.py +++ /dev/null @@ -1,15 +0,0 @@ -# Copyright 2013-2024 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.package import * - - -class Mock2PatchedDependency(Package): - """Package patched by patch-a-foreign-dependency in builtin.mock.""" - - homepage = "http://www.example.com" - url = "http://www.example.com/mock2-patch-dependency-1.0.tar.gz" - - version("1.0", md5="0123456789abcdef0123456789abcdef") diff --git a/var/spack/repos/builtin.mock2/repo.yaml b/var/spack/repos/builtin.mock2/repo.yaml deleted file mode 100644 index 84923d8367..0000000000 --- a/var/spack/repos/builtin.mock2/repo.yaml +++ /dev/null @@ -1,2 +0,0 @@ -repo: - namespace: 'builtin.mock2' |