[Pkg-haskell-commits] darcs: haskell-devscripts: Use "eval" to allow quotes in DEB_SETUP_GHC_CONFIGURE_ARGS to have effect, assemble LDFLAGS more sanely

[Joachim Breitner]

Tue Apr 28 08:23:01 UTC 2015  Joachim Breitner <mail at joachim-breitner.de>
  * Use "eval" to allow quotes in DEB_SETUP_GHC_CONFIGURE_ARGS to have effect, assemble LDFLAGS more sanely

    M ./Dh_Haskell.sh -5 +14

Tue Apr 28 08:23:01 UTC 2015  Joachim Breitner <mail at joachim-breitner.de>
  * Use "eval" to allow quotes in DEB_SETUP_GHC_CONFIGURE_ARGS to have effect, assemble LDFLAGS more sanely
diff -rN -u old-haskell-devscripts/Dh_Haskell.sh new-haskell-devscripts/Dh_Haskell.sh
--- old-haskell-devscripts/Dh_Haskell.sh	2015-04-28 08:48:13.045099339 +0000
+++ new-haskell-devscripts/Dh_Haskell.sh	2015-04-28 08:48:13.049099337 +0000
@@ -374,12 +374,21 @@
 
     ENABLE_PROFILING=`{ for i in ${DEB_PACKAGES}; do package_ext $i | grep prof; done; } | sort -u | sed 's/prof/--enable-library-profiling/'`
     local GHC_OPTIONS
-    for i in `dpkg-buildflags --get LDFLAGS`; do GHC_OPTIONS="$GHC_OPTIONS -optl$i"; done
+    for i in `dpkg-buildflags --get LDFLAGS`
+    do
+        GHC_OPTIONS="$GHC_OPTIONS --ghc-option=-optl$i"
+    done
 
-    ${DEB_SETUP_BIN_NAME} configure "--${hc}" -v2 --package-db=/`hc_pkgdir ${hc}` \
-        --prefix=/`hc_prefix ${hc}` --libdir=/`hc_libdir ${hc}` \
+    # DEB_SETUP_GHC_CONFIGURE_ARGS can contain multiple arguments with their own quoting,
+    # so run this through eval
+    eval run ${DEB_SETUP_BIN_NAME} \
+        configure "--${hc}" \
+	-v2 \
+	--package-db=/`hc_pkgdir ${hc}` \
+        --prefix=/`hc_prefix ${hc}` \
+	--libdir=/`hc_libdir ${hc}` \
 	--builddir=dist-${hc} \
-	--ghc-options="${GHC_OPTIONS}" \
+	${GHC_OPTIONS} \
 	--haddockdir=/`hc_docdir ${hc} ${CABAL_PACKAGE}-${CABAL_VERSION}` \
 	--datasubdir=${CABAL_PACKAGE}\
 	--htmldir=/`hc_htmldir ${hc} ${CABAL_PACKAGE}` \
@@ -395,7 +404,7 @@
 build_recipe(){
     # local PS5=$PS4; PS4=" + build_recipe> "; set -x
     hc=`packages_hc`
-    ${DEB_SETUP_BIN_NAME} build --builddir=dist-${hc}
+    run ${DEB_SETUP_BIN_NAME} build --builddir=dist-${hc}
     # PS4=$PS5
 }