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

Commit

Permalink
build/bin/sage-spkg: Get rid of USE_LOCAL_SCRIPTS (it was always yes)…
Browse files Browse the repository at this point in the history
…; prepare for script packages
  • Loading branch information
Matthias Koeppe committed Jul 21, 2022
1 parent 483b65e commit 445ed7e
Showing 1 changed file with 21 additions and 16 deletions.
37 changes: 21 additions & 16 deletions build/bin/sage-spkg
Original file line number Diff line number Diff line change
Expand Up @@ -444,27 +444,32 @@ if [ -e "$PKG_NAME" ]; then
fi

##################################################################
# Extract the package
# Normal packages: Extract the package
##################################################################

echo "Setting up build directory for $PKG_NAME"
cp -RLp "$PKG_SCRIPTS" "$PKG_NAME"
cd "$PKG_NAME" || exit $?
if [ -f "$PKG_SCRIPTS"/checksums.ini ]; then
# Normal package
echo "Setting up build directory for $PKG_NAME"
cp -RLp "$PKG_SCRIPTS" "$PKG_NAME"
cd "$PKG_NAME" || exit $?

sage-uncompress-spkg -d src "$PKG_SRC"
if [ $? -ne 0 ]; then
error_msg "Error: failed to extract $PKG_SRC"
exit 1
fi

echo "Finished extraction"
sage-uncompress-spkg -d src "$PKG_SRC"
if [ $? -ne 0 ]; then
error_msg "Error: failed to extract $PKG_SRC"
exit 1
fi

cd src
if ! sage-apply-patches; then
error_msg "Error applying patches"
exit 1
echo "Finished extraction"
cd src
if ! sage-apply-patches; then
error_msg "Error applying patches"
exit 1
fi
cd ..
else
# Script package: Build out of the source tree without copying
cd "$PKG_SCRIPTS"
fi
cd ..

##################################################################
# The package has been extracted, prepare for installation
Expand Down

0 comments on commit 445ed7e

Please sign in to comment.