From ba295afbbb907833cfa6ac387484f96d170b9932 Mon Sep 17 00:00:00 2001
From: Matteo Bernardini
Date: Sat, 6 Mar 2021 11:17:38 +0100
Subject: 20210306.1 global branch merge.

Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>
---
 haskell/ghc/ghc.SlackBuild | 24 +++++++++++-------------
 1 file changed, 11 insertions(+), 13 deletions(-)

(limited to 'haskell/ghc/ghc.SlackBuild')

diff --git a/haskell/ghc/ghc.SlackBuild b/haskell/ghc/ghc.SlackBuild
index 2d5985a6e8..f36be75be0 100644
--- a/haskell/ghc/ghc.SlackBuild
+++ b/haskell/ghc/ghc.SlackBuild
@@ -24,8 +24,8 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=ghc
-VERSION=${VERSION:-8.4.3}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-8.10.4}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -69,7 +69,7 @@ if [ "${BOOTSTRAP:-yes}" = "yes" ] ; then
 
   cd $TMP
   rm -rf $PRGNAM-$VERSION
-  tar xvf $CWD/$PRGNAM-$VERSION-$TARARCH-deb8-linux.tar.xz
+  tar xvf $CWD/$PRGNAM-$VERSION-$TARARCH-deb9-linux.tar.xz
   cd $PRGNAM-$VERSION
   chown -R root:root .
   find -L . \
@@ -96,7 +96,7 @@ if [ "${BOOTSTRAP:-yes}" = "yes" ] ; then
   mkdir -p $LIBTINFO_DIR
   ln -s /lib$LIBDIRSUFFIX/libncurses.so.5 $LIBTINFO_DIR/libtinfo.so.5
   LD_LIBRARY_PATH=$LIBTINFO_DIR \
-  make install
+  make -j1 install
   sed -i -r -e "s|^exec |LD_LIBRARY_PATH=$LIBTINFO_DIR exec |" $BOOTSTRAPDIR/usr/bin/ghc{,-pkg}-$VERSION
 
   BOOTSTRAPGHC=$BOOTSTRAPDIR/usr/bin/ghc
@@ -115,11 +115,7 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-# Fix build with Sphinx
-# https://phabricator.haskell.org/D5161
-# https://github.com/ghc/ghc/commit/4eebc8016f68719e1ccdf460754a97d1f4d6ef05.patch
-patch -p1 < $CWD/4eebc8016f68719e1ccdf460754a97d1f4d6ef05.patch
-
+GHC=$BOOTSTRAPGHC \
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
@@ -128,21 +124,23 @@ CXXFLAGS="$SLKCFLAGS" \
   --sysconfdir=/etc \
   --localstatedir=/var \
   --mandir=/usr/man \
-  --docdir=/usr/doc/$PRGNAM-$VERSION \
-  --with-ghc=$BOOTSTRAPGHC
+  --docdir=/usr/doc/$PRGNAM-$VERSION
 
 make
-make install DESTDIR=$PKG
+make -j1 install DESTDIR=$PKG
 
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
 # If docs were not built and installed, let's install the prebuilt manpage
-# (taken from ghc-8.4.3-x86_64-deb8-linux.tar.xz)
+# (taken from the prebuilt tarball)
 if [ ! -d $PKG/usr/man ]; then
   install -D -m0644 $CWD/ghc.1 $PKG/usr/man/man1
 fi
 
+# Install the bash completion file too
+install -D -m0644 utils/completion/ghc.bash $PKG/usr/share/bash-completion/completions/ghc
+
 find $PKG/usr/man -type f -exec gzip -9 {} \;
 for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
 
-- 
cgit v1.2.3