pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/x11/hs-X11 No packages depending on this should build .so



details:   https://anonhg.NetBSD.org/pkgsrc/rev/1007a64e8771
branches:  trunk
changeset: 407962:1007a64e8771
user:      pho <pho%pkgsrc.org@localhost>
date:      Sat Jan 11 14:19:18 2020 +0000

description:
No packages depending on this should build .so

diffstat:

 x11/hs-X11/Makefile      |  4 +++-
 x11/hs-X11/buildlink3.mk |  9 ++++++++-
 2 files changed, 11 insertions(+), 2 deletions(-)

diffs (41 lines):

diff -r 1eb6ab10895c -r 1007a64e8771 x11/hs-X11/Makefile
--- a/x11/hs-X11/Makefile       Sat Jan 11 14:12:20 2020 +0000
+++ b/x11/hs-X11/Makefile       Sat Jan 11 14:19:18 2020 +0000
@@ -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 @@
 # 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"
diff -r 1eb6ab10895c -r 1007a64e8771 x11/hs-X11/buildlink3.mk
--- a/x11/hs-X11/buildlink3.mk  Sat Jan 11 14:12:20 2020 +0000
+++ b/x11/hs-X11/buildlink3.mk  Sat Jan 11 14:19:18 2020 +0000
@@ -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_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"



Home | Main Index | Thread Index | Old Index