X-Git-Url: https://git.distorted.org.uk/~mdw/termux-packages/blobdiff_plain/fdc604b15960c086ec2abbca9059f30d627ec78f..ed69691d0570e49f4df144b0b129b88b17dd51b6:/disabled-packages/ghc/build.sh

diff --git a/disabled-packages/ghc/build.sh b/disabled-packages/ghc/build.sh
index f88fd5ff..aaeaea2a 100644
--- a/disabled-packages/ghc/build.sh
+++ b/disabled-packages/ghc/build.sh
@@ -2,38 +2,47 @@
 #     https://ghc.haskell.org/trac/ghc/wiki/Building/Preparation/Linux
 # and
 #     https://github.com/neurocyte/ghc-android
-# Currently fails with:
-#     "Can't use -fPIC or -dynamic on this platform"
 TERMUX_PKG_HOMEPAGE=https://www.haskell.org/ghc/
 TERMUX_PKG_DESCRIPTION="The Glasgow Haskell Compilation system"
-TERMUX_PKG_VERSION=7.10.2
+TERMUX_PKG_VERSION=8.0.1
 TERMUX_PKG_SRCURL=http://downloads.haskell.org/~ghc/${TERMUX_PKG_VERSION}/ghc-${TERMUX_PKG_VERSION}-src.tar.xz
 TERMUX_PKG_FOLDERNAME=ghc-$TERMUX_PKG_VERSION
 TERMUX_PKG_BUILD_IN_SRC=yes
-# TERMUX_PKG_DEPENDS="libandroid-support"
-TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--with-target=$TERMUX_HOST_PLATFORM --host=x86_64-unknown-linux --build=x86_64-unknown-linux --target=$TERMUX_HOST_PLATFORM"
+# Depend on clang for now until llvm is split into separate package:
+TERMUX_PKG_DEPENDS="clang, ncurses"
 
-TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" --with-iconv-includes=$TERMUX_PREFIX/include -with-iconv-libraries=$TERMUX_PREFIX/lib"
+TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--with-iconv-includes=$TERMUX_PREFIX/include -with-iconv-libraries=$TERMUX_PREFIX/lib"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" --with-curses-includes=$TERMUX_PREFIX/include/ncursesw -with-curses-libraries=$TERMUX_PREFIX/lib"
+TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" --host=x86_64-unknown-linux --build=x86_64-unknown-linux"
 
-ORIG_CFLAGS="$CFLAGS"
-ORIG_CPPFLAGS="$CPPFLAGS"
-ORIG_LDFLAGS="$LDFLAGS"
+termux_step_post_extract_package() {
+	ORIG_CFLAGS="$CFLAGS"
+	ORIG_CPPFLAGS="$CPPFLAGS"
+	ORIG_LDFLAGS="$LDFLAGS"
 
-unset AR
-unset AS
-unset CC
-export CFLAGS=""
-unset CPP
-export CPPFLAGS=""
-unset CXXFLAGS
-unset CXX
-export LDFLAGS=""
-unset LD
-unset PKG_CONFIG
-unset RANLIB
+	unset AR
+	unset AS
+	unset CC
+	export CFLAGS=""
+	unset CPP
+	export CPPFLAGS=""
+	unset CXXFLAGS
+	unset CXX
+	export LDFLAGS=""
+	unset LD
+	unset PKG_CONFIG
+	unset RANLIB
+
+	TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" --target=${TERMUX_HOST_PLATFORM}"
+}
 
 termux_step_pre_configure () {
-	echo "GhcStage2HcOpts = $ORIG_CFLAGS $ORIG_CPPFLAGS $ORIG_LDFLAGS" > mk/build.mk
-	echo "INTEGER_LIBRARY = integer-simple" >> mk/build.mk
+	echo "INTEGER_LIBRARY = integer-simple" > mk/build.mk
+	#echo "GhcStage2HcOpts = $ORIG_CFLAGS $ORIG_CPPFLAGS $ORIG_LDFLAGS" >> mk/build.mk
+
+	# Avoid "Can't use -fPIC or -dynamic on this platform":
+	echo "DYNAMIC_GHC_PROGRAMS = NO" >> mk/build.mk
+	echo "GhcLibWays = v" >> mk/build.mk
+	# "Can not build haddock docs when CrossCompiling or Stage1Only".
+	echo "HADDOCK_DOCS=NO" >> mk/build.mk
 }