From 5f3f43460955c219ff9a720862b4b4658b47edc4 Mon Sep 17 00:00:00 2001 From: Ryan Bottriell Date: Thu, 24 Jun 2021 20:08:47 -0700 Subject: [PATCH] Update existing package specs to use new environment section Signed-off-by: Ryan Bottriell --- packages/bootstrap/autoconf.spk.yaml | 7 ++++--- packages/cmake/cmake.spk.yaml | 12 +++++++----- packages/gnu/autoconf.spk.yaml | 6 +++--- packages/gnu/gcc/activate-gcc.csh | 2 -- packages/gnu/gcc/activate-gcc.sh | 2 -- packages/gnu/gcc/gcc48.spk.yaml | 8 +++++--- packages/gnu/gcc/gcc63.spk.yaml | 8 +++++--- packages/gnu/gcc/gcc93.spk.yaml | 8 +++++--- packages/gnu/m4.spk.yaml | 1 - packages/python/python2.spk.yaml | 6 +++--- packages/python/python3.spk.yaml | 6 +++--- packages/stdfs/stdfs.spk.yaml | 3 +++ 12 files changed, 38 insertions(+), 31 deletions(-) delete mode 100644 packages/gnu/gcc/activate-gcc.csh delete mode 100644 packages/gnu/gcc/activate-gcc.sh diff --git a/packages/bootstrap/autoconf.spk.yaml b/packages/bootstrap/autoconf.spk.yaml index 622b3fcba5..7a1ebe5481 100644 --- a/packages/bootstrap/autoconf.spk.yaml +++ b/packages/bootstrap/autoconf.spk.yaml @@ -29,10 +29,11 @@ build: mkdir -p $(dirname $newfile) cp $file $newfile done - mkdir -p /spfs/etc/startup.d/ - echo "export ACLOCAL_PATH=/spfs/share/aclocal" > /spfs/etc/spfs/startup.d/activate-autoconf.sh - echo "setenv ACLOCAL_PATH /spfs/share/aclocal" > /spfs/etc/spfs/startup.d/activate-autoconf.csh + install: + environment: + - set: ACLOCAL_PATH + value: /spfs/share/aclocal requirements: - pkg: stdfs diff --git a/packages/cmake/cmake.spk.yaml b/packages/cmake/cmake.spk.yaml index c4658b4796..c35d60aee1 100644 --- a/packages/cmake/cmake.spk.yaml +++ b/packages/cmake/cmake.spk.yaml @@ -21,8 +21,10 @@ build: --exclude=doc --exclude=Help - rsync -rv ./ $PREFIX/ - - mkdir -p /spfs/etc/spfs/startup.d - - echo "export CMAKE_SYSTEM_INCLUDE_PATH=/spfs/include" > /spfs/etc/spfs/startup.d/activate_cmake.sh - - echo "export CMAKE_SYSTEM_PREFIX_PATH=/spfs" >> /spfs/etc/spfs/startup.d/activate_cmake.sh - - echo "setenv CMAKE_SYSTEM_INCLUDE_PATH /spfs/include" > /spfs/etc/spfs/startup.d/activate_cmake.csh - - echo "setenv CMAKE_SYSTEM_PREFIX_PATH /spfs" >> /spfs/etc/spfs/startup.d/activate_cmake.csh + +install: + environment: + - set: CMAKE_SYSTEM_INCLUDE_PATH + value: /spfs/include + - set: CMAKE_SYSTEM_PREFIX_PATH + value: /spfs diff --git a/packages/gnu/autoconf.spk.yaml b/packages/gnu/autoconf.spk.yaml index 6e95aa969a..dc6728b7c1 100644 --- a/packages/gnu/autoconf.spk.yaml +++ b/packages/gnu/autoconf.spk.yaml @@ -22,11 +22,11 @@ build: --with-local-prefix=/spfs - make - make install - - mkdir -p /spfs/etc/spfs/startup.d - - echo "export ACLOCAL_PATH=/spfs/share/aclocal" > /spfs/etc/spfs/startup.d/activate-autoconf.sh - - echo "setenv ACLOCAL_PATH /spfs/share/aclocal" > /spfs/etc/spfs/startup.d/activate-autoconf.csh install: + environment: + - set: ACLOCAL_PATH + value: /spfs/share/aclocal requirements: - pkg: bash - pkg: perl diff --git a/packages/gnu/gcc/activate-gcc.csh b/packages/gnu/gcc/activate-gcc.csh deleted file mode 100644 index d729a1a2d3..0000000000 --- a/packages/gnu/gcc/activate-gcc.csh +++ /dev/null @@ -1,2 +0,0 @@ -setenv CC /spfs/bin/cc -setenv CXX /spfs/bin/g++ diff --git a/packages/gnu/gcc/activate-gcc.sh b/packages/gnu/gcc/activate-gcc.sh deleted file mode 100644 index dd24f429b4..0000000000 --- a/packages/gnu/gcc/activate-gcc.sh +++ /dev/null @@ -1,2 +0,0 @@ -export CC=/spfs/bin/gcc -export CXX=/spfs/bin/g++ diff --git a/packages/gnu/gcc/gcc48.spk.yaml b/packages/gnu/gcc/gcc48.spk.yaml index 846e69297b..036085c348 100644 --- a/packages/gnu/gcc/gcc48.spk.yaml +++ b/packages/gnu/gcc/gcc48.spk.yaml @@ -42,9 +42,6 @@ build: - make install # no need to keep extra bloat files in info dir - rm -r /spfs/share/info - # include activation scripts - - mkdir -p /spfs/etc/spfs/startup.d - - cp ../activate-gcc.{csh,sh} /spfs/etc/spfs/startup.d/ tests: - stage: install @@ -54,6 +51,11 @@ tests: - rm test.c test.o install: + environment: + - set: CC + value: /spfs/bin/gcc + - set: CXX + value: /spfs/bin/g++ requirements: - pkg: stdfs - pkg: mpfr diff --git a/packages/gnu/gcc/gcc63.spk.yaml b/packages/gnu/gcc/gcc63.spk.yaml index 1beddc72da..f7edae7c16 100644 --- a/packages/gnu/gcc/gcc63.spk.yaml +++ b/packages/gnu/gcc/gcc63.spk.yaml @@ -41,9 +41,6 @@ build: - make install # no need to keep extra bloat files in info dir - rm -r /spfs/share/info - # include activation scripts - - mkdir -p /spfs/etc/spfs/startup.d - - cp ../activate-gcc.{csh,sh} /spfs/etc/spfs/startup.d/ tests: - stage: install @@ -53,6 +50,11 @@ tests: - rm test.c test.o install: + environment: + - set: CC + value: /spfs/bin/gcc + - set: CXX + value: /spfs/bin/g++ requirements: - pkg: stdfs - pkg: mpfr diff --git a/packages/gnu/gcc/gcc93.spk.yaml b/packages/gnu/gcc/gcc93.spk.yaml index 4c3727ba50..de752ed133 100644 --- a/packages/gnu/gcc/gcc93.spk.yaml +++ b/packages/gnu/gcc/gcc93.spk.yaml @@ -42,9 +42,6 @@ build: - make install # no need to keep extra bloat files in info dir - rm -r /spfs/share/info - # include activation scripts - - mkdir -p /spfs/etc/spfs/startup.d - - cp ../activate-gcc.{csh,sh} /spfs/etc/spfs/startup.d/ tests: - stage: install @@ -54,6 +51,11 @@ tests: - rm test.c test.o install: + environment: + - set: CC + value: /spfs/bin/gcc + - set: CXX + value: /spfs/bin/g++ requirements: - pkg: stdfs - pkg: mpfr diff --git a/packages/gnu/m4.spk.yaml b/packages/gnu/m4.spk.yaml index fcf9165814..f11f9bbe44 100644 --- a/packages/gnu/m4.spk.yaml +++ b/packages/gnu/m4.spk.yaml @@ -18,7 +18,6 @@ build: - ./configure --prefix=/spfs - make - make install - - mkdir -p /spfs/etc/startup.d/ - rm -r /spfs/share/info install: diff --git a/packages/python/python2.spk.yaml b/packages/python/python2.spk.yaml index 0214a22d6f..90fe11f55a 100644 --- a/packages/python/python2.spk.yaml +++ b/packages/python/python2.spk.yaml @@ -70,9 +70,6 @@ build: - ln -sf python2 /spfs/bin/python # do not package pyc files, spfs is best when pyc files are not generated at all - find /spfs -type f -name "*.pyc" | xargs rm - - mkdir -p /spfs/etc/spfs/startup.d - - echo "export PYTHONDONTWRITEBYTECODE=1" > /spfs/etc/spfs/startup.d/activate-python.sh - - echo "setenv PYTHONDONTWRITEBYTECODE 1" > /spfs/etc/spfs/startup.d/activate-python.csh tests: - stage: install @@ -91,6 +88,9 @@ tests: - test -z "$(/spfs/bin/python -c 'import bz2' 2>&1)" install: + environment: + - set: PYTHONDONTWRITEBYTECODE + value: 1 requirements: - pkg: gcc fromBuildEnv: x.x diff --git a/packages/python/python3.spk.yaml b/packages/python/python3.spk.yaml index 6b7b48bbb4..4e0e6bb9d9 100644 --- a/packages/python/python3.spk.yaml +++ b/packages/python/python3.spk.yaml @@ -51,9 +51,6 @@ build: - ln -sf python3 /spfs/bin/python # python is best in spfs when pyc files are not used at all - find /spfs -type f -name "*.pyc" | xargs rm - - mkdir -p /spfs/etc/spfs/startup.d - - echo "export PYTHONDONTWRITEBYTECODE=1" > /spfs/etc/spfs/startup.d/activate-python.sh - - echo "setenv PYTHONDONTWRITEBYTECODE 1" > /spfs/etc/spfs/startup.d/activate-python.csh tests: - stage: install @@ -71,6 +68,9 @@ tests: - test -z "$(/spfs/bin/python -c 'import bz2' 2>&1)" install: + environment: + - set: PYTHONDONTWRITEBYTECODE + value: 1 requirements: - pkg: gcc fromBuildEnv: x.x diff --git a/packages/stdfs/stdfs.spk.yaml b/packages/stdfs/stdfs.spk.yaml index 3ca346f06a..c49e67238a 100644 --- a/packages/stdfs/stdfs.spk.yaml +++ b/packages/stdfs/stdfs.spk.yaml @@ -5,6 +5,9 @@ build: - mkdir /spfs/{bin,lib,etc} - mkdir -p /spfs/etc/spfs/startup.d - ln -s lib /spfs/lib64 + # We are explicitly not using the builtin env support because + # this package is expected to initialize the core environment + # as early as possible # Intitialization for bash environments - cat << EOF > /spfs/etc/spfs/startup.d/00_stdfs.sh - export LD_LIBRARY_PATH="/spfs/lib:\${LD_LIBRARY_PATH}"