Skip to content
This repository was archived by the owner on Jan 30, 2023. It is now read-only.

Commit 8f8d8e3

Browse files
author
Matthias Koeppe
committed
build/pkgs/sage_conf/spkg-install: Don't source sage-env, as it is sourced already by the build/make/Makefile rule
1 parent 5f7adc6 commit 8f8d8e3

File tree

1 file changed

+10
-9
lines changed

1 file changed

+10
-9
lines changed

build/pkgs/sage_conf/spkg-install

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
#! /usr/bin/env bash
2-
# From sage-spkg
3-
for lib in "$SAGE_ROOT/build/bin/sage-dist-helpers" "$SAGE_SRC/bin/sage-env" ; do
4-
source "$lib"
5-
if [ $? -ne 0 ]; then
6-
echo >&2 "Error: failed to source $lib"
7-
echo >&2 "Is $SAGE_ROOT the correct SAGE_ROOT?"
8-
exit 1
9-
fi
10-
done
2+
# From sage-spkg.
3+
# For type=script packages, the build rule in build/make/Makefile sources
4+
# sage-env but not sage-dist-helpers.
5+
lib="$SAGE_ROOT/build/bin/sage-dist-helpers"
6+
source "$lib"
7+
if [ $? -ne 0 ]; then
8+
echo >&2 "Error: failed to source $lib"
9+
echo >&2 "Is $SAGE_ROOT the correct SAGE_ROOT?"
10+
exit 1
11+
fi
1112
cd $SAGE_ROOT/build/pkgs/sage_conf/src && sdh_pip_install .

0 commit comments

Comments
 (0)