[Git][haskell-team/DHG_packages][master] yaml: Backport upstream patch to build against system libyaml

[Ilias Tsitsimpis]

Ilias Tsitsimpis pushed to branch master at Debian Haskell Group / DHG_packages


Commits:
59f0cb9a by Ilias Tsitsimpis at 2018-10-23T12:37:05Z
yaml: Backport upstream patch to build against system libyaml

- - - - -


3 changed files:

- p/haskell-yaml/debian/changelog
- + p/haskell-yaml/debian/patches/fix-system-libyaml
- + p/haskell-yaml/debian/patches/series


Changes:

=====================================
p/haskell-yaml/debian/changelog
=====================================
@@ -1,3 +1,9 @@
+haskell-yaml (0.8.32-3) unstable; urgency=medium
+
+  * Backport upstream patch to build against system libyaml
+
+ -- Ilias Tsitsimpis <iliastsi at debian.org>  Tue, 23 Oct 2018 15:32:38 +0300
+
 haskell-yaml (0.8.32-2) unstable; urgency=medium
 
   * Remove build dependency on libghc-text-dev (provided by ghc-8.4.3)


=====================================
p/haskell-yaml/debian/patches/fix-system-libyaml
=====================================
@@ -0,0 +1,29 @@
+From ba216731cd5bf4264e9ad95d55616ff1a9edfac5 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Niklas=20Hamb=C3=BCchen?= <mail at nh2.me>
+Date: Wed, 29 Aug 2018 12:31:04 +0200
+Subject: [PATCH] Correctly declare libyaml dependency on system-libyaml flag.
+
+Fixes
+
+    stack build --extra-include-dirs ... --extra-lib-dirs ...
+
+to set libyaml path being ignored.
+
+Also fixes https://github.com/NixOS/cabal2nix/issues/372#issuecomment-416062945
+---
+ package.yaml | 25 ++++++++++++++-----------
+ 1 file changed, 14 insertions(+), 11 deletions(-)
+
+Index: b/yaml.cabal
+===================================================================
+--- a/yaml.cabal
++++ b/yaml.cabal
+@@ -113,6 +113,8 @@ library
+         libyaml/reader.c
+         libyaml/scanner.c
+         libyaml/writer.c
++  else
++    extra-libraries: yaml
+   if os(windows)
+     cpp-options: -DWINDOWS
+   default-language: Haskell2010


=====================================
p/haskell-yaml/debian/patches/series
=====================================
@@ -0,0 +1 @@
+fix-system-libyaml



View it on GitLab: https://salsa.debian.org/haskell-team/DHG_packages/commit/59f0cb9a0f95c5c66c0153150f8bcfea8270ff39

-- 
View it on GitLab: https://salsa.debian.org/haskell-team/DHG_packages/commit/59f0cb9a0f95c5c66c0153150f8bcfea8270ff39
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-haskell-commits/attachments/20181023/6a75675b/attachment-0001.html>