CVS commit: pkgsrc/x11/hs-X11

["Masatake Daimon" <pho%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   pho
Date:           Sat Jan 11 14:19:18 UTC 2020

Modified Files:
        pkgsrc/x11/hs-X11: Makefile buildlink3.mk

Log Message:
No packages depending on this should build .so


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 pkgsrc/x11/hs-X11/Makefile \
    pkgsrc/x11/hs-X11/buildlink3.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/x11/hs-X11/Makefile
diff -u pkgsrc/x11/hs-X11/Makefile:1.6 pkgsrc/x11/hs-X11/Makefile:1.7
--- pkgsrc/x11/hs-X11/Makefile:1.6      Sat Jan 11 13:45:37 2020
+++ pkgsrc/x11/hs-X11/Makefile  Sat Jan 11 14:19:18 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2020/01/11 13:45:37 pho Exp $
+# $NetBSD: Makefile,v 1.7 2020/01/11 14:19:18 pho Exp $
 
 DISTNAME=      X11-1.9.1
 CATEGORIES=    x11 graphics
@@ -11,6 +11,8 @@ LICENSE=      modified-bsd
 # while linking shared libraries:
 # https://github.com/haskell/cabal/issues/4925
 HASKELL_ENABLE_SHARED_LIBRARY= no
+# Note to devs: when you remove this please also remove it from
+# ../../x11/hs-X11/buildlink3.mk
 
 .include "../../mk/haskell.mk"
 .include "../../devel/hs-data-default/buildlink3.mk"
Index: pkgsrc/x11/hs-X11/buildlink3.mk
diff -u pkgsrc/x11/hs-X11/buildlink3.mk:1.6 pkgsrc/x11/hs-X11/buildlink3.mk:1.7
--- pkgsrc/x11/hs-X11/buildlink3.mk:1.6 Sat Jan 11 13:45:37 2020
+++ pkgsrc/x11/hs-X11/buildlink3.mk     Sat Jan 11 14:19:18 2020
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2020/01/11 13:45:37 pho Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2020/01/11 14:19:18 pho Exp $
 
 BUILDLINK_TREE+=       hs-X11
 
@@ -9,6 +9,13 @@ BUILDLINK_API_DEPENDS.hs-X11+= hs-X11>=1
 BUILDLINK_ABI_DEPENDS.hs-X11+= hs-X11>=1.9.1
 BUILDLINK_PKGSRCDIR.hs-X11?=   ../../x11/hs-X11
 
+# Work around a Cabal bug. It ignores "ld-options" in X11.buildinfo
+# while linking shared libraries:
+# https://github.com/haskell/cabal/issues/4925
+HASKELL_ENABLE_SHARED_LIBRARY= no
+# Note to devs: when you remove this please also remove it from
+# ../../x11/hs-X11/Makefile
+
 .include "../../devel/hs-data-default/buildlink3.mk"
 .include "../../x11/libX11/buildlink3.mk"
 .include "../../x11/libXrandr/buildlink3.mk"