[Git][haskell-team/DHG_packages][experimental] ghc: Simplify configure script, using dh_auto_configure

[Gianfranco Costamagna]

Gianfranco Costamagna pushed to branch experimental at Debian Haskell Group / DHG_packages


Commits:
7c6d2f21 by Gianfranco Costamagna at 2018-07-20T13:53:38+02:00
ghc: Simplify configure script, using dh_auto_configure

- - - - -


2 changed files:

- p/ghc/debian/changelog
- p/ghc/debian/rules


Changes:

=====================================
p/ghc/debian/changelog
=====================================
--- a/p/ghc/debian/changelog
+++ b/p/ghc/debian/changelog
@@ -1,3 +1,13 @@
+ghc (8.4.3-5) UNRELEASED; urgency=medium
+
+  * Switch to dh_auto_configure, making the correct triplet
+    being passed to the build system, with also --target flag
+    (this should hopefully make the configure more robust, and 
+    stop failing now that armhf runs on arm64 systems)
+    - thanks waldi, jcristay for the help
+
+ -- Gianfranco Costamagna <locutusofborg at debian.org>  Fri, 20 Jul 2018 13:52:19 +0200
+
 ghc (8.4.3-4) experimental; urgency=medium
 
   * merge with unstable 8.2.2-6


=====================================
p/ghc/debian/rules
=====================================
--- a/p/ghc/debian/rules
+++ b/p/ghc/debian/rules
@@ -23,9 +23,10 @@ export DEB_HOST_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 export DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 export DEB_HOST_ARCH      ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
 
+EXTRA_CONFIGURE_FLAGS += --target $(DEB_HOST_GNU_TYPE)
 # We're cross-building if DEB_BUILD_GNU_TYPE != DEB_HOST_GNU_TYPE
 ifneq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
-  confflags += --target $(DEB_HOST_GNU_TYPE) --enable-unregisterised
+  EXTRA_CONFIGURE_FLAGS += --enable-unregisterised
   BUILD_CROSS=YES
 else
   BUILD_CROSS=NO
@@ -34,7 +35,7 @@ endif
 ProjectVersion=$(shell cat VERSION)
 
 GHC=$(firstword $(shell bash -c "type -p ghc"))
-EXTRA_CONFIGURE_FLAGS=--with-ghc="$(GHC)"
+EXTRA_CONFIGURE_FLAGS +=--with-ghc="$(GHC)"
 
 DEB_HOOGLE_TXT_DIR = /usr/lib/ghc-doc/hoogle/
 
@@ -124,11 +125,9 @@ endif
 	echo 'RANLIB_CMD = $(DEB_HOST_GNU_TYPE)-ranlib'>> mk/build.mk
 	# We want verbose builds
 	echo 'V=1'                                     >> mk/build.mk
-	./configure $(confflags) --prefix=/usr \
+	dh_auto_configure -- \
 		$(EXTRA_CONFIGURE_FLAGS) \
-		--with-system-libffi \
-		--with-llc=llc-6.0 \
-		--with-opt=opt-6.0
+		--with-system-libffi
 
 override_dh_auto_build:
 	dh_auto_build



View it on GitLab: https://salsa.debian.org/haskell-team/DHG_packages/commit/7c6d2f21950a0abf3f19f0294b08b7c8c3b52874

-- 
View it on GitLab: https://salsa.debian.org/haskell-team/DHG_packages/commit/7c6d2f21950a0abf3f19f0294b08b7c8c3b52874
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-haskell-commits/attachments/20180720/c6b4a8a4/attachment-0001.html>