diff options
author | pho <pho@pkgsrc.org> | 2020-01-02 16:52:57 +0000 |
---|---|---|
committer | pho <pho@pkgsrc.org> | 2020-01-02 16:52:57 +0000 |
commit | b2d089a907ffbb4b231fe03288e81830d383bfb0 (patch) | |
tree | 769037fb02b28277700428f81adbf580b781ea41 /x11/hs-X11-xft | |
parent | 1ac7d2ee0e2647b2010cf3d63a7f6ba55c01f377 (diff) | |
download | pkgsrc-b2d089a907ffbb4b231fe03288e81830d383bfb0.tar.gz |
Fix build with GHC 7.10.x
Diffstat (limited to 'x11/hs-X11-xft')
-rw-r--r-- | x11/hs-X11-xft/Makefile | 7 | ||||
-rw-r--r-- | x11/hs-X11-xft/PLIST | 22 |
2 files changed, 6 insertions, 23 deletions
diff --git a/x11/hs-X11-xft/Makefile b/x11/hs-X11-xft/Makefile index 943ab3fa869..275b284807e 100644 --- a/x11/hs-X11-xft/Makefile +++ b/x11/hs-X11-xft/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2018/03/12 11:15:51 wiz Exp $ +# $NetBSD: Makefile,v 1.7 2020/01/02 16:52:57 pho Exp $ DISTNAME= X11-xft-0.3.1 PKGREVISION= 4 @@ -8,6 +8,11 @@ MAINTAINER= esg@sdf.lonestar.org COMMENT= Bindings to the Xft library, and some Xrender parts LICENSE= gnu-gpl-v2 +# Work around a Cabal bug. It ignores "ld-options" in +# {package}.buildinfo while linking shared libraries: +# https://github.com/haskell/cabal/issues/4925 +HASKELL_ENABLE_SHARED_LIBRARY= no + .include "../../devel/hs-utf8-string/buildlink3.mk" .include "../../mk/haskell.mk" .include "../../x11/hs-X11/buildlink3.mk" diff --git a/x11/hs-X11-xft/PLIST b/x11/hs-X11-xft/PLIST deleted file mode 100644 index b62d57e58b6..00000000000 --- a/x11/hs-X11-xft/PLIST +++ /dev/null @@ -1,22 +0,0 @@ -@comment $NetBSD: PLIST,v 1.1 2014/05/22 21:36:32 szptvlfn Exp $ -lib/X11-xft-${PKGVERSION}/${HASKELL_VERSION}/Graphics/X11/Xft.hi -lib/X11-xft-${PKGVERSION}/${HASKELL_VERSION}/Graphics/X11/Xrender.hi -lib/X11-xft-${PKGVERSION}/${HASKELL_VERSION}/HSX11-xft-${PKGVERSION}.o -lib/X11-xft-${PKGVERSION}/${HASKELL_VERSION}/libHSX11-xft-${PKGVERSION}.a -lib/X11-xft-${PKGVERSION}/${HASKELL_VERSION}/package-description -share/doc/X11-xft-${PKGVERSION}/LICENSE -${PLIST.doc}share/doc/X11-xft-${PKGVERSION}/html/Graphics-X11-Xft.html -${PLIST.doc}share/doc/X11-xft-${PKGVERSION}/html/Graphics-X11-Xrender.html -${PLIST.doc}share/doc/X11-xft-${PKGVERSION}/html/X11-xft.haddock -${PLIST.doc}share/doc/X11-xft-${PKGVERSION}/html/doc-index.html -${PLIST.doc}share/doc/X11-xft-${PKGVERSION}/html/frames.html -${PLIST.doc}share/doc/X11-xft-${PKGVERSION}/html/haddock-util.js -${PLIST.doc}share/doc/X11-xft-${PKGVERSION}/html/hslogo-16.png -${PLIST.doc}share/doc/X11-xft-${PKGVERSION}/html/index-frames.html -${PLIST.doc}share/doc/X11-xft-${PKGVERSION}/html/index.html -${PLIST.doc}share/doc/X11-xft-${PKGVERSION}/html/mini_Graphics-X11-Xft.html -${PLIST.doc}share/doc/X11-xft-${PKGVERSION}/html/mini_Graphics-X11-Xrender.html -${PLIST.doc}share/doc/X11-xft-${PKGVERSION}/html/minus.gif -${PLIST.doc}share/doc/X11-xft-${PKGVERSION}/html/ocean.css -${PLIST.doc}share/doc/X11-xft-${PKGVERSION}/html/plus.gif -${PLIST.doc}share/doc/X11-xft-${PKGVERSION}/html/synopsis.png |