[Git][haskell-team/DHG_packages][master] argon2: disable use of pkg-config

[Sean Whitton]

Sean Whitton pushed to branch master at Debian Haskell Group / DHG_packages


Commits:
eb1bd690 by Sean Whitton at 2018-04-16T21:42:36-07:00
argon2: disable use of pkg-config

- - - - -


3 changed files:

- p/haskell-argon2/debian/changelog
- p/haskell-argon2/debian/control
- p/haskell-argon2/debian/rules


Changes:

=====================================
p/haskell-argon2/debian/changelog
=====================================
--- a/p/haskell-argon2/debian/changelog
+++ b/p/haskell-argon2/debian/changelog
@@ -1,6 +1,7 @@
 haskell-argon2 (1.3.0.1-2) UNRELEASED; urgency=medium
 
-  * Add missing build-dep on pkg-config.
+  * Pass -f-pkg-config to bypass pkg-config when linking with libargon2.
+    Build otherwise fails.
   * Restore d/watch and d/copyright from version 1.2.0-3.
     The upstream source has not been repacked for the last few uploads so
     these files were out of line with reality.  The repack is not actually


=====================================
p/haskell-argon2/debian/control
=====================================
--- a/p/haskell-argon2/debian/control
+++ b/p/haskell-argon2/debian/control
@@ -15,7 +15,6 @@ Build-Depends:
  libghc-text-short-dev (>= 0.1.2),
  libghc-text-short-dev (<< 0.2),
  libghc-text-short-prof,
- pkg-config (>= 0.9.0),
 Build-Depends-Indep: ghc-doc,
  libghc-text-doc,
  libghc-text-short-doc,


=====================================
p/haskell-argon2/debian/rules
=====================================
--- a/p/haskell-argon2/debian/rules
+++ b/p/haskell-argon2/debian/rules
@@ -9,7 +9,7 @@ DEB_INSTALL_CHANGELOGS_ALL = Changelog.md
 DEB_ENABLE_TESTS = no
 
 # use libargon2 shlib
-DEB_SETUP_GHC_CONFIGURE_ARGS := -fuse-system-library
+DEB_SETUP_GHC_CONFIGURE_ARGS := -fuse-system-library -f-pkg-config
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/hlibrary.mk



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

---
View it on GitLab: https://salsa.debian.org/haskell-team/DHG_packages/commit/eb1bd6909339a6c482cc5fe02401b5b327712026
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/20180417/ccf7cebf/attachment.html>