diff options
| author |   Duncan Coutts <dcoutts@gentoo.org> | 2005-05-08 14:49:25 +0000 |
|---|---|---|
| committer | Duncan Coutts <dcoutts@gentoo.org> | 2005-05-08 14:49:25 +0000 |
| commit | de0479b8cb754ef06d25e7dbf275d32a62f87469 (patch) | |
| tree | cda88a3c0bab71935b65b6bc3e6fa7bc2f8d295e /eclass/ghc-package.eclass | |
| parent | using toolchain-funcs. (diff) | |
| download | gentoo-2-de0479b8cb754ef06d25e7dbf275d32a62f87469.tar.gz gentoo-2-de0479b8cb754ef06d25e7dbf275d32a62f87469.tar.bz2 gentoo-2-de0479b8cb754ef06d25e7dbf275d32a62f87469.zip | |
ghc-6.4 compatibility changes
Diffstat (limited to 'eclass/ghc-package.eclass')
| -rw-r--r-- | eclass/ghc-package.eclass | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/eclass/ghc-package.eclass b/eclass/ghc-package.eclass index f17344ac65ad..1b6b0543ae17 100644 --- a/eclass/ghc-package.eclass +++ b/eclass/ghc-package.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ghc-package.eclass,v 1.9 2005/04/08 01:13:39 araujo Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ghc-package.eclass,v 1.10 2005/05/08 14:49:25 dcoutts Exp $ # # Author: Andres Loeh <kosmikus@gentoo.org> # @@ -89,21 +89,19 @@ ghc-makeghcilib() { ghc-setup-pkg() { local localpkgconf localpkgconf="${S}/$(ghc-localpkgconf)" - echo '[' > ${localpkgconf} - while [ -n "$1" ]; do - cat "$1" >> ${localpkgconf} - shift - [ -n "$1" ] && echo ',' >> ${localpkgconf} + echo '[]' > ${localpkgconf} + for pkg in $*; do + $(ghc-getghcpkgbin) -f ${localpkgconf} -u --force \ + < ${pkg} done - echo ']' >> ${localpkgconf} } # fixes the library and import directories path # of the package configuration file ghc-fixlibpath() { - sed -i "s|$1|$(ghc-libdir)|" ${S}/$(ghc-localpkgconf) + sed -i "s|$1|$(ghc-libdir)|g" ${S}/$(ghc-localpkgconf) if [[ -n "$2" ]]; then - sed -i "s|$2|$(ghc-libdir)/imports|" ${S}/$(ghc-localpkgconf) + sed -i "s|$2|$(ghc-libdir)/imports|g" ${S}/$(ghc-localpkgconf) fi } @@ -111,7 +109,7 @@ ghc-fixlibpath() { # file to its final destination ghc-install-pkg() { mkdir -p ${D}/$(ghc-confdir) - cat ${S}/$(ghc-localpkgconf) | sed "s:${D}::" \ + cat ${S}/$(ghc-localpkgconf) | sed "s|${D}||g" \ > ${D}/$(ghc-confdir)/$(ghc-localpkgconf) } |