Fix spkg-installs of packages with legacy uninstall commands; moving those commands into spkg-legacy-uninstall scripts

embray · dimpase · commit 99796aded4da · 2023-12-10T18:35:23.000Z
diff --git a/build/pkgs/eclib/spkg-install.in b/build/pkgs/eclib/spkg-install.in
@@ -3,20 +3,6 @@ CXXFLAGS="$CXXFLAGS_O3_NON_NATIVE"
 
 export CFLAGS CXXFLAGS
 
-
-echo "Deleting old versions of eclib libraries, which"
-echo "would interfere with new builds..."
-# Delete any pre-autotools libraries:
-rm -f "$SAGE_LOCAL"/lib/lib{curvesntl,g0nntl,jcntl,rankntl,mwrank}.*
-# Delete autotools libraries:
-rm -f "$SAGE_LOCAL"/lib/lib{e,j}c.*
-if [ "$UNAME" = "CYGWIN" ]; then
-    rm -f "$SAGE_LOCAL"/lib/cyg{e,j}c-*.dll
-fi
-echo "Deleting old include directory..."
-rm -rf "$SAGE_LOCAL"/include/eclib/
-
-
 cd src/
 
 #############################################################
diff --git a/build/pkgs/ecm/spkg-install.in b/build/pkgs/ecm/spkg-install.in
@@ -238,17 +238,6 @@ sdh_configure $SAGE_CONFIGURE_GMP $ECM_CONFIGURE
 
 sdh_make
 
-###############################################################################
-# Remove old executable/header/libraries/manpage:
-###############################################################################
-
-echo
-echo "Build succeeded.  Now removing old binary, header file, manual page and libraries..."
-rm -f "$SAGE_LOCAL"/bin/ecm
-rm -f "$SAGE_LOCAL"/lib/libecm.*
-rm -f "$SAGE_LOCAL"/include/ecm.h
-rm -f "$SAGE_LOCAL"/share/man/man1/ecm.1
-
 ###############################################################################
 # Now install ECM:
 ###############################################################################
diff --git a/build/pkgs/fplll/spkg-install.in b/build/pkgs/fplll/spkg-install.in
@@ -32,7 +32,3 @@ export CXX="$CXX"
 sdh_configure $CONFIGUREFLAGS
 sdh_make
 sdh_make_install
-
-# Pretend that the "libfplll" package is not installed. This is needed to
-# support renaming libfplll -> fplll done on Trac #24042
-rm -f "$SAGE_SPKG_INST/"libfplll-*
diff --git a/build/pkgs/freetype/spkg-install.in b/build/pkgs/freetype/spkg-install.in
@@ -4,9 +4,3 @@ cd src
 GNUMAKE=${MAKE} sdh_configure --enable-freetype-config $FREETYPE_CONFIGURE
 sdh_make
 sdh_make_install
-
-# The following file may be present from old builds of freetype, and
-# its presence can break the matplotlib build. So remove it. (The
-# current version is $SAGE_LOCAL/include/freetype2/ftbuild.h.)
-
-rm -f "$SAGE_LOCAL/include/ft2build.h"
diff --git a/build/pkgs/gf2x/spkg-install.in b/build/pkgs/gf2x/spkg-install.in
@@ -1,7 +1,3 @@
-echo "Deleting old gf2x files."
-rm -f "$SAGE_LOCAL"/lib/libgf2x*
-rm -rf "$SAGE_LOCAL"/include/gf2x*
-
 cd src
 
 # Use newer version of config.guess and config.sub (see Trac #19727)
diff --git a/build/pkgs/giac/spkg-install.in b/build/pkgs/giac/spkg-install.in
@@ -64,24 +64,6 @@ sdh_configure --disable-gui --disable-ao "$DISABLENLS" --enable-png=no --disable
 
 sdh_make
 
-#############################################################
-#   Clean old install
-#############################################################
-echo "Cleaning giac..."
-rm -f ${SAGE_LOCAL}/lib/libgiac*
-rm -f ${SAGE_LOCAL}/bin/icas
-rm -f ${SAGE_LOCAL}/bin/xcas
-rm -f ${SAGE_LOCAL}/bin/cas_help
-rm -f ${SAGE_LOCAL}/bin/pgiac
-rm -f ${SAGE_LOCAL}/bin/en_cas_help
-rm -f ${SAGE_LOCAL}/bin/es_cas_help
-rm -f ${SAGE_LOCAL}/bin/fr_cas_help
-rm -f ${SAGE_LOCAL}/bin/giac
-rm -f ${SAGE_LOCAL}/bin/xcasnew
-rm -rf ${SAGE_LOCAL}/share/giac
-rm -rf ${SAGE_LOCAL}/share/doc/giac
-rm -rf ${SAGE_LOCAL}/include/giac
-
 #############################################################
 #   Install
 #############################################################
diff --git a/build/pkgs/glpk/spkg-install.in b/build/pkgs/glpk/spkg-install.in
@@ -25,8 +25,4 @@ export CFLAGS LDFLAGS CPPFLAGS
 sdh_configure --with-gmp --disable-static
 sdh_make
 
-# Remove old libraries to make sure we can downgrade it if needed.
-# See https://github.com/sagemath/sage/issues/23596#comment:4 and later.
-rm -f "$SAGE_LOCAL"/lib/libglpk.*
-
 sdh_make_install
diff --git a/build/pkgs/m4ri/spkg-install.in b/build/pkgs/m4ri/spkg-install.in
@@ -24,9 +24,6 @@ else
     DISABLE_SSE2=""
 fi
 
-# otherwise we might run into problems with old headers
-rm -rf "$SAGE_LOCAL/include/m4ri"
-
 cd src
 
 # Configure and build M4RI
diff --git a/build/pkgs/m4rie/spkg-install.in b/build/pkgs/m4rie/spkg-install.in
@@ -27,12 +27,6 @@ export CFLAGS
 export CPPFLAGS
 export LDFLAGS
 
-# otherwise we might run into problems with old headers
-
-if [ -d "$SAGE_LOCAL/include/m4rie" ]; then
-    rm -rf "$SAGE_LOCAL/include/m4rie"
-fi
-
 # build M4RIE
 
 cd $ROOT_DIR/src/
diff --git a/build/pkgs/mathjax/spkg-install.in b/build/pkgs/mathjax/spkg-install.in
@@ -1,4 +1,2 @@
 TARGET="${SAGE_SHARE}/mathjax"
-# Cleanup installed version
-rm -rf "${TARGET}"
 sdh_install src/* "${TARGET}"
diff --git a/build/pkgs/meataxe/spkg-install.in b/build/pkgs/meataxe/spkg-install.in
@@ -1,16 +1,3 @@
-# Delete old (Shared)MeatAxe libraries. This ensures a sane state if
-# installation of this package fails: the mtx library should exist if
-# and only if meataxe is installed. In detail: the build-time check in
-# src/setup.py checks whether or not the "meataxe" package is
-# marked as installed but the run-time check for the matrix_gfpn_dense
-# module checks whether it can be imported. We need to ensure that these
-# two conditions are equivalent, otherwise strange things can happen.
-# See also https://github.com/sagemath/sage/issues/24359#comment:154
-#
-# This also deletes the static library left behind from the installation
-# of MeatAxe (as opposed to SharedMeatAxe).
-rm -f "$SAGE_LOCAL"/lib/libmtx.*
-
 # Directory where executables are installed.
 export MTXBIN="$SAGE_LOCAL"/bin
 
@@ -34,4 +21,3 @@ sdh_make_install
 if [ "$SAGE_SPKG_INSTALL_DOCS" = yes ] ; then
     $MAKE doc || sdh_die "Error documenting SharedMeatAxe"
 fi
-
diff --git a/build/pkgs/mpc/spkg-install.in b/build/pkgs/mpc/spkg-install.in
@@ -16,13 +16,5 @@ fi
 sdh_configure $SAGE_CONFIGURE_GMP $SAGE_CONFIGURE_MPFR $EXTRA
 sdh_make
 
-# Cleaning
-echo "Deleting old headers"
-rm -f "$SAGE_LOCAL"/include/mpc.h
-# Do not delete old libraries as this causes gcc to break during
-# parallel builds.
-# echo "Deleting old libraries"
-# rm -f "$SAGE_LOCAL"/lib/libmpc.*
-
 # Installing
 sdh_make_install
diff --git a/build/pkgs/mpfr/spkg-install.in b/build/pkgs/mpfr/spkg-install.in
@@ -149,14 +149,6 @@ mpfr_build()
 {
     mpfr_configure
     sdh_make
-
-    echo
-    echo "Building MPFR succeeded.  Now deleting old headers..."
-    rm -f "$SAGE_LOCAL"/include/*mpfr*
-    # Do not delete old libraries as this causes gcc to break during
-    # parallel builds.
-    # rm -f "$SAGE_LOCAL"/lib/libmpfr.*
-
     sdh_make_install
 }
 
diff --git a/build/pkgs/ntl/spkg-install.in b/build/pkgs/ntl/spkg-install.in
@@ -115,11 +115,6 @@ ntl_build()
 
 ntl_install()
 {
-    echo
-    echo "Removing old NTL files."
-    rm -rf "$SAGE_LOCAL"/lib/libntl*
-    rm -rf "$SAGE_LOCAL"/include/NTL
-
     echo
     echo "Installing NTL."
 
diff --git a/build/pkgs/qhull/spkg-install.in b/build/pkgs/qhull/spkg-install.in
@@ -5,9 +5,4 @@ sdh_cmake -DCMAKE_VERBOSE_MAKEFILE=ON \
 
 sdh_make
 
-# clean old install
-rm -rf "${SAGE_LOCAL}"/include/libqhull
-rm -rf "${SAGE_LOCAL}"/include/qhull
-rm -rf "${SAGE_LOCAL}"/lib/libqhull*
-
 sdh_make_install
diff --git a/build/pkgs/readline/spkg-install.in b/build/pkgs/readline/spkg-install.in
@@ -4,16 +4,6 @@ sdh_configure --with-curses --enable-shared --disable-static
 echo "Now building static and shared readline libraries..."
 sdh_make
 
-echo "Build succeedeed.  Deleting old readline headers and libs"
-echo "before installing the new ones..."
-# (Note; Actually also readline does this by itself, but doing it
-# here, too, doesn't hurt either.)
-rm -rf "$SAGE_LOCAL"/include/readline/ "$SAGE_LOCAL"/lib/libreadline.*
-if [[ $? -ne 0 ]]; then
-    echo >&2 "Error removing old version of readline."
-    exit 1
-fi
-
 echo "Now installing the new readline headers and libraries..."
 sdh_make_install
 
diff --git a/build/pkgs/singular/spkg-install.in b/build/pkgs/singular/spkg-install.in
@@ -11,51 +11,6 @@ if [ "x$SAGE_DEBUG" = "xyes" ]; then
     SINGULAR_CONFIGURE="$SINGULAR_CONFIGURE --enable-debug --disable-optimizationflags"
 fi
 
-remove_old_version()
-{
-    # the following is a little verbose but it ensures we leave no trace of 3.x
-    # _or_ 4.x
-    rm -f "$SAGE_LOCAL"/bin/*Singular*
-    rm -f "$SAGE_LOCAL"/bin/*singular*
-    rm -rf "$SAGE_LOCAL/include/singular" # 3.x and 4.x
-    rm -rf "$SAGE_LOCAL/include/factory" # 3.x and 4.x
-    rm -f "$SAGE_LOCAL/include/factor.h" # 3.x only
-    rm -f "$SAGE_LOCAL/include/factoryconf.h" # 3.x only
-    rm -rf "$SAGE_LOCAL/include/omalloc" #4.x only
-    rm -f "$SAGE_LOCAL/include/omalloc.h" # 3.x only
-    rm -f "$SAGE_LOCAL/include/omlimits.h" # 3.x only
-    rm -rf "$SAGE_LOCAL/include/resources" #4.x only
-    rm -rf "$SAGE_LOCAL/include/gfanlib" #4.x only
-
-    # Clean up all Singular-related libraries
-    libs=(
-        singular  # 3.x with lower case
-        singcf    # 3.x only additional archives
-        singfac   # 3.x only additional archives
-        Singular  # 4.x with upper case
-        polys
-        factory
-        omalloc
-        resources           # 3.x
-        singular_resources  # 4.x and up
-        gfan
-    )
-    if [ "$UNAME" = "CYGWIN" ]; then
-        for name in ${libs[*]}; do
-            rm -f "$SAGE_LOCAL"/bin/cyg${name}*.dll
-            rm -f "$SAGE_LOCAL"/lib/lib${name}*.a
-        done
-    else
-        for name in ${libs[*]}; do
-            rm -f "$SAGE_LOCAL"/lib/lib${name}*
-        done
-    fi
-
-    rm -f "$SAGE_LOCAL"/lib/p_Procs_Field* # 3.x only
-    rm -rf "$SAGE_LOCAL/share/singular"
-    rm -f "$SAGE_LOCAL"/share/info/singular*
-}
-
 config()
 {
     if [ "$UNAME" = "CYGWIN" ]; then
@@ -104,7 +59,7 @@ build_singular()
 
 
 # Actually run all the functions defined above
-for i in remove_old_version config build_singular; do
+for i in config build_singular; do
     echo "############### Singular stage $i ###############"
     cd "$SRC" && $i
 done
diff --git a/build/pkgs/sqlite/spkg-install.in b/build/pkgs/sqlite/spkg-install.in
@@ -1,5 +1,3 @@
-rm -f "$SAGE_LOCAL/bin/sqlite3"
-
 cd src
 
 export CPPFLAGS="$CPPFLAGS -I$SAGE_LOCAL/include"
