Skip to content

Commit 34587f6

Browse files
committed
HOPEFULLY the package changes stick this time
Signed-off-by: tldahlgren <dahlgren1@llnl.gov>
1 parent e8d2bc1 commit 34587f6

12 files changed

Lines changed: 26 additions & 26 deletions

File tree

outputs/package-py-files/2.package.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
#
33
# SPDX-License-Identifier: (Apache-2.0 OR MIT)
44

5+
from spack_repo.builtin.build_systems.autotools import AutotoolsPackage
56
from spack.package import *
67

78

outputs/package-py-files/3.package.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
#
33
# SPDX-License-Identifier: (Apache-2.0 OR MIT)
44

5+
from spack_repo.builtin.build_systems.autotools import AutotoolsPackage
56
from spack.package import *
67

78

outputs/package-py-files/4.package.py

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
#
33
# SPDX-License-Identifier: (Apache-2.0 OR MIT)
44

5+
from spack_repo.builtin.build_systems.autotools import AutotoolsPackage
56
from spack.package import *
67

78

@@ -49,10 +50,7 @@ def configure_args(self):
4950
stackstart = int(self.spec.variants["stackstart"].value)
5051
if stackstart:
5152
args.extend(
52-
[
53-
f"--with-stack-start-c={stackstart}",
54-
f"--with-stack-start-fortran={stackstart}",
55-
]
53+
[f"--with-stack-start-c={stackstart}", f"--with-stack-start-fortran={stackstart}"]
5654
)
5755

5856
return args

outputs/package-py-files/5.package.py

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
#
33
# SPDX-License-Identifier: (Apache-2.0 OR MIT)
44

5+
from spack_repo.builtin.build_systems.autotools import AutotoolsPackage
56
from spack.package import *
67

78

@@ -51,10 +52,7 @@ def configure_args(self):
5152
stackstart = int(self.spec.variants["stackstart"].value)
5253
if stackstart:
5354
args.extend(
54-
[
55-
f"--with-stack-start-c={stackstart}",
56-
f"--with-stack-start-fortran={stackstart}",
57-
]
55+
[f"--with-stack-start-c={stackstart}", f"--with-stack-start-fortran={stackstart}"]
5856
)
5957

6058
return args

outputs/package-py-files/6.package.py

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
#
33
# SPDX-License-Identifier: (Apache-2.0 OR MIT)
44

5+
from spack_repo.builtin.build_systems.autotools import AutotoolsPackage
56
from spack.package import *
67

78

@@ -51,10 +52,7 @@ def configure_args(self):
5152
stackstart = int(self.spec.variants["stackstart"].value)
5253
if stackstart:
5354
args.extend(
54-
[
55-
f"--with-stack-start-c={stackstart}",
56-
f"--with-stack-start-fortran={stackstart}",
57-
]
55+
[f"--with-stack-start-c={stackstart}", f"--with-stack-start-fortran={stackstart}"]
5856
)
5957

6058
return args

outputs/packaging.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@ project="$(dirname "$0")"
66

77
rm -rf "${raw_outputs:?}/packaging"
88
. "$project/init_spack.sh"
9-
mpileaks_package_py="$SPACK_ROOT/var/spack/repos/tutorial/packages/tutorial-mpileaks/package.py"
9+
mpileaks_package_py="$HOME/repos/spack_repo/tutorial/packages/tutorial-mpileaks/package.py"
1010

1111
export SPACK_COLOR=never
1212

13-
example packaging/repo-add "spack repo add \$SPACK_ROOT/var/spack/repos/tutorial/"
13+
example packaging/repo-add "spack repo add \$HOME/repos/spack_repo/tutorial/"
1414

1515
# make the editor automatically exit
1616
export EDITOR=true
@@ -21,7 +21,7 @@ example packaging/checksum-mpileaks-1 "spack checksum tutorial-mpileaks 1.0"
2121
example --expect-error packaging/install-mpileaks-1 "spack install tutorial-mpileaks"
2222

2323
#cp "$PROJECT/package-py-files/1.package.py" "$mpileaks_package_py"
24-
#example packaging/info-mpileaks "spack info tutorial-mpileaks"
24+
#example packaging/info-mpileaks "spack info --phases tutorial-mpileaks"
2525

2626
cp "$PROJECT/package-py-files/2.package.py" "$mpileaks_package_py"
2727
example --expect-error packaging/install-mpileaks-2 "spack install tutorial-mpileaks"
@@ -49,4 +49,4 @@ example packaging/install-mpileaks-6 "spack install --test=root tutorial-mpilea
4949

5050
example packaging/cleanup "spack uninstall -ay tutorial-mpileaks"
5151
example packaging/cleanup "spack repo remove tutorial"
52-
example packaging/cleanup "rm -rf \$SPACK_ROOT/var/spack/repos/tutorial/packages/tutorial-mpileaks"
52+
example packaging/cleanup "rm -rf \$HOME/repos/spack_repo/tutorial/packages/tutorial-mpileaks"

outputs/packaging/info-mpileaks.out

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
$ spack info --phases
12
AutotoolsPackage: tutorial-mpileaks
23

34
Description:
@@ -19,6 +20,9 @@ Variants:
1920
build_system [autotools] autotools
2021
Build systems supported by the package
2122

23+
Installation Phases:
24+
autoreconf configure build install
25+
2226
Build Dependencies:
2327
autoconf automake c cxx fortran gmake gnuconfig libtool m4
2428

tutorial/examples/packaging/2.package.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
# Copyright 2013-2024 Lawrence Livermore National Security, LLC and other
2-
# Spack Project Developers. See the top-level COPYRIGHT file for details.
1+
# Copyright Spack Project Developers. See COPYRIGHT file for details.
32
#
43
# SPDX-License-Identifier: (Apache-2.0 OR MIT)
54

5+
from spack_repo.builtin.build_systems.autotools import AutotoolsPackage
66
from spack.package import *
77

88

tutorial/examples/packaging/3.package.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
# Copyright 2013-2024 Lawrence Livermore National Security, LLC and other
2-
# Spack Project Developers. See the top-level COPYRIGHT file for details.
1+
# Copyright Spack Project Developers. See COPYRIGHT file for details.
32
#
43
# SPDX-License-Identifier: (Apache-2.0 OR MIT)
54

5+
from spack_repo.builtin.build_systems.autotools import AutotoolsPackage
66
from spack.package import *
77

88

tutorial/examples/packaging/4.package.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
# Copyright 2013-2024 Lawrence Livermore National Security, LLC and other
2-
# Spack Project Developers. See the top-level COPYRIGHT file for details.
1+
# Copyright Spack Project Developers. See COPYRIGHT file for details.
32
#
43
# SPDX-License-Identifier: (Apache-2.0 OR MIT)
54

5+
from spack_repo.builtin.build_systems.autotools import AutotoolsPackage
66
from spack.package import *
77

88

0 commit comments

Comments
 (0)