Merge branch 't/29354/tox_ini__add_slackware_environments' into t/290…

…87/CI-gh-actions-tox-configure-build
sagemath · Mar 22, 2020 · 9939051 · 9939051
2 parents d95a688 + 136feeb
commit 9939051
Show file tree

Hide file tree

Showing 24 changed files with 32 additions and 1 deletion.
diff --git a/build/bin/sage-guess-package-system b/build/bin/sage-guess-package-system
@@ -13,6 +13,8 @@ elif yum --version > /dev/null 2>&1; then
     echo fedora
 elif pacman --version > /dev/null 2>&1; then
     echo arch
+elif slackpkg --version > /dev/null 2>&1; then
+    echo slackware
 elif zypper --version > /dev/null 2>&1; then
     echo opensuse
 elif apk --version > /dev/null 2>&1; then

diff --git a/build/bin/sage-print-system-package-command b/build/bin/sage-print-system-package-command
@@ -29,6 +29,9 @@ case $system:$command in
     homebrew*:install)
         echo "brew install $system_packages"
         ;;
+    slackware*:install)
+        echo "sudo slackpkg install $system_packages"
+        ;;
     cygwin*:install)
         echo "# first install apt-cyg from https://github.com/transcode-open/apt-cyg"
         echo "apt-cyg install $system_packages"

diff --git a/build/bin/sage-spkg b/build/bin/sage-spkg
@@ -372,7 +372,7 @@ if [ $INFO -ne 0 -a "$USE_LOCAL_SCRIPTS" = yes ]; then
     echo "== Equivalent System Packages =="
     echo
     PKG_DISTROS="$PKG_SCRIPTS"/distros
-    for system_package_file in "$PKG_DISTROS"/debian*.txt "$PKG_DISTROS"/fedora*.txt "$PKG_DISTROS"/*conda*.txt "$PKG_DISTROS"/homebrew*.txt  "$PKG_DISTROS"/arch*.txt ; do
+    for system_package_file in "$PKG_DISTROS"/*.txt; do
         if [ -f "$system_package_file" ]; then
             system=$(basename "$system_package_file" .txt)
             system_packages="$(echo $(sed 's/#.*//;' $system_package_file))"

diff --git a/build/pkgs/boost/distros/slackware.txt b/build/pkgs/boost/distros/slackware.txt
@@ -0,0 +1 @@
+boost
diff --git a/build/pkgs/boost_cropped/distros/slackware.txt b/build/pkgs/boost_cropped/distros/slackware.txt
@@ -0,0 +1 @@
+boost
diff --git a/build/pkgs/bzip2/distros/slackware.txt b/build/pkgs/bzip2/distros/slackware.txt
@@ -0,0 +1 @@
+bzip2
diff --git a/build/pkgs/cmake/distros/slackware.txt b/build/pkgs/cmake/distros/slackware.txt
@@ -0,0 +1 @@
+cmake
diff --git a/build/pkgs/curl/distros/slackware.txt b/build/pkgs/curl/distros/slackware.txt
@@ -0,0 +1,2 @@
+curl
+cyrus-sasl
diff --git a/build/pkgs/freetype/distros/slackware.txt b/build/pkgs/freetype/distros/slackware.txt
@@ -0,0 +1,4 @@
+freetype
+harfbuzz
+glib
+glib2
diff --git a/build/pkgs/git/distros/slackware.txt b/build/pkgs/git/distros/slackware.txt
@@ -0,0 +1 @@
+git
diff --git a/build/pkgs/gmp/distros/slackware.txt b/build/pkgs/gmp/distros/slackware.txt
@@ -0,0 +1 @@
+gmp
diff --git a/build/pkgs/gsl/distros/slackware.txt b/build/pkgs/gsl/distros/slackware.txt
@@ -0,0 +1 @@
+gsl
diff --git a/build/pkgs/libffi/distros/slackware.txt b/build/pkgs/libffi/distros/slackware.txt
@@ -0,0 +1 @@
+libffi
diff --git a/build/pkgs/libgd/distros/slackware.txt b/build/pkgs/libgd/distros/slackware.txt
@@ -0,0 +1 @@
+gd
diff --git a/build/pkgs/mpfr/distros/slackware.txt b/build/pkgs/mpfr/distros/slackware.txt
@@ -0,0 +1 @@
+mpfr
diff --git a/build/pkgs/ncurses/distros/slackware.txt b/build/pkgs/ncurses/distros/slackware.txt
@@ -0,0 +1 @@
+ncurses
diff --git a/build/pkgs/openssl/distros/slackware.txt b/build/pkgs/openssl/distros/slackware.txt
@@ -0,0 +1 @@
+openssl openssl-solibs
diff --git a/build/pkgs/patch/distros/slackware.txt b/build/pkgs/patch/distros/slackware.txt
@@ -0,0 +1 @@
+patch
diff --git a/build/pkgs/pcre/distros/slackware.txt b/build/pkgs/pcre/distros/slackware.txt
@@ -0,0 +1 @@
+pcre
diff --git a/build/pkgs/readline/distros/slackware.txt b/build/pkgs/readline/distros/slackware.txt
@@ -0,0 +1 @@
+readline
diff --git a/build/pkgs/sqlite/distros/slackware.txt b/build/pkgs/sqlite/distros/slackware.txt
@@ -0,0 +1,2 @@
+sqlite
+icu4c
diff --git a/build/pkgs/xz/distros/slackware.txt b/build/pkgs/xz/distros/slackware.txt
@@ -0,0 +1 @@
+xz
diff --git a/build/pkgs/yasm/distros/slackware.txt b/build/pkgs/yasm/distros/slackware.txt
@@ -0,0 +1 @@
+yasm
diff --git a/build/pkgs/zlib/distros/slackware.txt b/build/pkgs/zlib/distros/slackware.txt
@@ -0,0 +1 @@
+zlib