don't use SAGE_LOCAL/share/gap, switch to GAP's "make install"

also add a workaround for Semigroups (see comment in the code)

Author: dimpase

build/pkgs/gap/spkg-install.in

@@ -8,43 +8,22 @@ export CFLAGS=$CFLAGS_NON_NATIVE
 export CXXFLAGS=$CXXFLAGS_NON_NATIVE
 
 GAP_BUILD_ROOT="$(pwd)"
-GAP_ROOT="$SAGE_LOCAL/share/gap"
-DESTDIR_GAP_ROOT="$SAGE_DESTDIR$GAP_ROOT"
+GAP_ROOT="$SAGE_LOCAL/lib/gap"
 
 # Enable debug info if requested.
 # Note that -g3 allows you to use preprocessor macros in gdb which are widely used
 if [ "$SAGE_DEBUG" = yes ] ; then
     export CFLAGS="-O0 -g3 -DDEBUG_MASTERPOINTERS -DDEBUG_GLOBAL_BAGS -DDEBUG_FUNCTIONS_BAGS $CFLAGS"
 fi
 
-sdh_configure $SAGE_CONFIGURE_GMP
-sdh_make -j1
+# LDFLAGS hack below needed by Semigroups package
+sdh_configure $SAGE_CONFIGURE_GMP LDFLAGS="-pthread" --prefix=$SAGE_LOCAL
+sdh_make
 
 # GAP's "make install" is work in progress; we use bits and pieces of it
 # but we install many things manually.
-sdh_make install-headers install-libgap
-
-# Install config.h, which is not currently handled by `make install-headers`
-sdh_install build/config.h "$SAGE_LOCAL/include/gap"
-
-# Now install the gap executable as "gap-bin"; it will be called normally
-# through our wrapper script that sets the appropriate GAP_ROOT
-SAGE_BIN="$SAGE_LOCAL/bin"
-mkdir -p "$SAGE_DESTDIR$SAGE_BIN" || sdh_die "Failed to create the directory $SAGE_BIN"
-
-./libtool --mode=install install gap "$SAGE_DESTDIR$SAGE_BIN/gap-bin" || \
-    sdh_die "Failed to install gap-bin to $SAGE_BIN"
-
-./libtool --mode=install install gac "$SAGE_DESTDIR$SAGE_BIN/gac" || \
-    sdh_die "Failed to install gac to $SAGE_BIN"
-
-# Now copy additional files GAP needs to run (and a few optional bits) into
-# GAP_ROOT; we don't need everything from the source tree
-sdh_install bin doc grp lib src tst sysinfo.gap "$GAP_ROOT"
-
-# GAP's copy of libtool is also used by the toolchain for build GAP packages
-# (i.e. by gac)
-sdh_install libtool "$GAP_ROOT"
+sdh_make install
+# sdh_make install-headers install-libgap
 
 # Install only the minimal packages GAP needs to run
 sdh_install pkg/gapdoc pkg/primgrp pkg/smallgrp pkg/transgrp "$GAP_ROOT"/pkg
@@ -77,34 +56,6 @@ sdh_install \
     pkg/utils \
     "$GAP_ROOT"/pkg
 
-# Install the GAP startup script; ensure it is executable
-sdh_install -T ../gap "$SAGE_BIN/gap"
-chmod +x "$SAGE_DESTDIR$SAGE_BIN/gap"
-
-# Create symlinks under $GAP_ROOT for these executables, as they are expected
-# (especially when building kernel packages) to exist
-ln -sf "../../bin/gap-bin" "$DESTDIR_GAP_ROOT/gap"
-ln -sf "../../bin/gac" "$DESTDIR_GAP_ROOT/gac"
-
-# Fix the $GAP_ROOT/bin/<arch>/src symlink to be relative (otherwise it links
-# to the actual path of the sources GAP was compiled from)
-for srclink in "$DESTDIR_GAP_ROOT"/bin/*/src; do
-    rm -f "$srclink"
-    ln -s "../../src" "$srclink"
-done
-
-# Additional fixups for some files after they have been copied into their
-# destination directory.  gac and sysinfo.gap are generated files that contain
-# in them hard-coded references to the GAP build directory, which will soon
-# be going away.  This breaks the build toolchain for some compiled GAP
-# packages.  We need to replace these paths with the final GAP_ROOT path.  The
-# below will work so long as neither of these paths contain '|', and if they do
-# then god help you.  https://github.com/sagemath/sage/issues/27218
-sed -i -e "s|$GAP_BUILD_ROOT|$GAP_ROOT|g" \
-    "$SAGE_DESTDIR$SAGE_BIN/gac" "$DESTDIR_GAP_ROOT/sysinfo.gap" \
-    "$DESTDIR_GAP_ROOT/bin/gap.sh" "$DESTDIR_GAP_ROOT/doc/make_doc" || \
-    sdh_die "Failed to fix up hard-coded paths in GAP build tools."
-
 # TODO: This seems unnecessary--we are already installing all of doc/ to
 # GAP_ROOT, which is necessary for some functionality in GAP to work.  Do
 # we need this?  Maybe doc/gap could just be a symlink to gap/doc??

build/pkgs/gap_packages/spkg-install.in

@@ -1,4 +1,4 @@
-GAP_ROOT="$SAGE_LOCAL/share/gap"
+GAP_ROOT="$SAGE_LOCAL/lib/gap"
 PKG_DIR="$GAP_ROOT/pkg"
 
 PKG_SRC_DIR="$(pwd)/src/pkg"
@@ -43,20 +43,16 @@ install_compiled_pkg()
     local pkg="$1"
     # Install the bin/ dir (where compiled modules should end up)
     # under <prefix>/lib/gap; we then symlink to it later
-    sdh_install bin "$SAGE_LOCAL/lib/gap/pkg/$pkg"
+    sdh_install * "$SAGE_LOCAL/lib/gap/pkg/$pkg"
 
+    # TODO:
     # Clean up any build artificts before installing the rest of the package
     # Also remove configure/Makefiles
     # Note: None, if any of the packages really have a proper install target
-    make clean  # Works for some packages but not all
-    rm -rf bin/
-    rm -rf configure configure.* config.* autogen.sh *.m4 Makefile* m4/
+    #make clean  # Works for some packages but not all
+    #rm -rf bin/
+    #rm -rf configure configure.* config.* autogen.sh *.m4 Makefile* m4/
 
-    # Create the bin/ symlink
-    ln -s "$SAGE_LOCAL/lib/gap/pkg/$pkg/bin" bin
-
-    # Install the rest of the package files
-    sdh_install * "$PKG_DIR/$pkg"
 }
 
 # Build and install compiled packages: