[Pkg-haskell-commits] darcs: haskell-devscripts: Turn the Make rules into shell functions

[Iustin Pop]

On 2015-03-31 17:25:44, David Fox wrote:
> Tue Mar 31 17:19:33 UTC 2015  David Fox <dsf at seereason.com>
>   * Turn the Make rules into shell functions
> 
>     M ./Dh_Haskell.sh +137
>     M ./hlibrary.mk -65 +15

Hi,

This commit seems to have introduced a small bug; not sure what its
impact is though:


> diff -rN -u old-haskell-devscripts/Dh_Haskell.sh new-haskell-devscripts/Dh_Haskell.sh
> --- old-haskell-devscripts/Dh_Haskell.sh	2015-03-31 17:25:44.438418810 +0000
> +++ new-haskell-devscripts/Dh_Haskell.sh	2015-03-31 17:25:44.490418879 +0000
> +install_dev_recipe(){
[…]

> +    install -Dm 644 $pkg_config debian/${PKG}/var/lib/ghc/package.conf.d/$pkg_config
> +    rm -f $pkg_config
> +    if [ "z${DEB_GHC_EXTRA_PACKAGES}" != "z" ] ; then
> +       mkdir -p debian/$(notdir $@)/usr/lib/haskell-packages/extra-packages; \
> +    	echo '${DEB_GHC_EXTRA_PACKAGES}' > debian/${PKG}/usr/lib/haskell-packages/extra-packages/${CABAL_PACKAGE}-${CABAL_VERSION}
> +    fi

Note the Makefile function $(notdir $@) used here, a copy-paste from:

> diff -rN -u old-haskell-devscripts/hlibrary.mk new-haskell-devscripts/hlibrary.mk
> --- old-haskell-devscripts/hlibrary.mk	2015-03-31 17:25:44.438418810 +0000
> +++ new-haskell-devscripts/hlibrary.mk	2015-03-31 17:25:44.466418849 +0000
>  install/libghc-$(CABAL_PACKAGE)-dev:: debian/tmp-inst-ghc debian/extra-depends
[…]
> -	if [ "z$(DEB_GHC_EXTRA_PACKAGES)" != "z" ] ; then \
> -		mkdir -p debian/$(notdir $@)/usr/lib/haskell-packages/extra-packages; \
> -		echo '$(DEB_GHC_EXTRA_PACKAGES)' > debian/$(notdir $@)/usr/lib/haskell-packages/extra-packages/$(CABAL_PACKAGE)-$(CABAL_VERSION) ; \
> -	fi
> -
> -	grep -s binary-or-shlib-defines-rpath $(DEB_LINTIAN_OVERRIDES_FILE) \
> -	     || echo binary-or-shlib-defines-rpath >> $(DEB_LINTIAN_OVERRIDES_FILE)
> -	dh_haskell_provides -p$(notdir $@)
> -	dh_haskell_depends -p$(notdir $@)
> -	dh_haskell_shlibdeps -p$(notdir $@)
> +	. /usr/share/haskell-devscripts/Dh_Haskell.sh && \
> +	  install_dev_recipe "$(DEB_SETUP_BIN_NAME)" "$(CABAL_PACKAGE)" "$(CABAL_VERSION)" "$(HASKELL_HIDE_PACKAGES)" "$(DEB_GHC_EXTRA_PACKAGES)" $(DEB_LINTIAN_OVERRIDES_FILE) "$(notdir $@)"

It seems there is still one call to notdir in the current
/usr/share/haskell-devscripts/Dh_Haskell.sh as installed on my system
(0.9.6). The above example is gone, probably fixed in the meantime (but
I'm not friendly with Darcs, so I don't know how to dig in the history).

Just FYI.

regards,
iustin
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://lists.alioth.debian.org/pipermail/pkg-haskell-commits/attachments/20150530/8c6a3a40/attachment.sig>