gnucash-on-windows master: Multiple changes pushed
Geert Janssens
gjanssens at code.gnucash.org
Mon Nov 18 16:37:00 EST 2019
Updated via https://github.com/Gnucash/gnucash-on-windows/commit/ec7d28db (commit)
via https://github.com/Gnucash/gnucash-on-windows/commit/ff9e6267 (commit)
from https://github.com/Gnucash/gnucash-on-windows/commit/d35a21eb (commit)
commit ec7d28db10d7babe8d09d04ded1ce6f8ec357b85
Author: Geert Janssens <geert at kobaltwit.be>
Date: Mon Nov 18 22:36:52 2019 +0100
Make libchipcard depend explicitly on gwenhywfar
diff --git a/gnucash.modules b/gnucash.modules
index d2b12b4..19cea4b 100644
--- a/gnucash.modules
+++ b/gnucash.modules
@@ -141,6 +141,7 @@
<dependencies>
<dep package="gcrypt"/>
<dep package="gnutls"/>
+ <dep package="gwenhywfar"/>
</dependencies>
</autotools>
commit ff9e626708d09cb467450b8178eb51e1db1b0998
Author: Geert Janssens <geert at kobaltwit.be>
Date: Mon Nov 18 22:30:04 2019 +0100
Adjust modules to allow libchipcard to work with gwenhywfar's pkg-config setup
The problem is pkg-config by default tries to determine a prefix based on
where it finds the .pc file. Unfortunately on Windows that results in a
Windows style path (C:\...). This is relevant here as libchipcard depends
on gwenhywfar paths returned by pkg-config. This is a recent change in
gwenhywfar.
The current libchipcard version depends on this only indirectly as it calls
gwenhwyfar-config, installed by the gwenhywfar package. Future versions of
libchipcard will use pkg-config directly instead.
The fix is to prevent pkg-config from determining the prefix, and just use
the paths as found in the pc file. That can be achieved by setting the
'--dont-define-prefix' pkg-config switch.
As current libchipcard only uses it indirectly via gwenhywfar, this commit
sets it for the gwenhywfar build. However as future versions of libchipcard
will use pkg-config directly the switch is also added for libchipcard
already as well.
diff --git a/gnucash.modules b/gnucash.modules
index 993b6a3..d2b12b4 100644
--- a/gnucash.modules
+++ b/gnucash.modules
@@ -134,7 +134,7 @@
</dependencies>
</autotools>
- <autotools id="libchipcard" autogen-sh="configure" autogenargs="--enable-local-install">
+ <autotools id="libchipcard" autogen-sh="configure" autogenargs="--enable-local-install PKG_CONFIG='pkg-config --dont-define-prefix'">
<branch module="221/libchipcard-5.1.4rc1.tar.gz" version="5.1.4rc1"
repo="aqbanking">
</branch>
@@ -145,7 +145,7 @@
</autotools>
<autotools id="gwenhywfar" autogen-sh="configure"
- autogenargs="--with-guis='gtk3' --enable-local-install --disable-binreloc --disable-ssl">
+ autogenargs="--with-guis='gtk3' --enable-local-install --disable-binreloc --disable-ssl PKG_CONFIG='pkg-config --dont-define-prefix'">
<branch module="223/gwenhywfar-4.99.25rc9.tar.gz" version="4.99.25rc9"
repo="aqbanking">
</branch>
@@ -156,7 +156,7 @@
</autotools>
<autotools id="gwenhywfar-git" autogen-template="make -fMakefile.cvs && %(srcdir)s/configure --prefix %(prefix)s --libdir %(libdir)s %(autogenargs)s"
- autogenargs="--with-guis='' --enable-local-install --disable-binreloc --disable-ssl">
+ autogenargs="--with-guis='' --enable-local-install --disable-binreloc --disable-ssl PKG_CONFIG='pkg-config --dont-define-prefix'">
<branch module="gwenhywfar" repo="aquamaniac"/>
<dependencies>
<dep package="gcrypt"/>
Summary of changes:
gnucash.modules | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
More information about the gnucash-changes
mailing list