From 25ee143d4e7a349451a3b70211349648c61f31bc Mon Sep 17 00:00:00 2001 From: ms Date: Tue, 30 Nov 2021 22:03:23 +0100 Subject: taler-local building gnutls from the Git version, trying to fix Vagrant's build on Ubuntu 20.10. --- bin/WIP/taler-local | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/bin/WIP/taler-local b/bin/WIP/taler-local index dbfcc97..9fab7db 100755 --- a/bin/WIP/taler-local +++ b/bin/WIP/taler-local @@ -117,7 +117,7 @@ def build_libmicrohttpd(r: Repo, p: Path): update_checkout(r, p) subprocess.run(["./bootstrap"], check=True) # Debian gnutls packages are too old ... - default_configure("--with-gnutls=/usr/local") + default_configure(f"--with-gnutls={TALER_PREFIX}") subprocess.run(["make"], check=True) subprocess.run(["make", "install"], check=True) (p / "taler-buildstamp").touch() @@ -147,6 +147,13 @@ def build_exchange(r: Repo, p: Path): subprocess.run(["make", "install"], check=True) (p / "taler-buildstamp").touch() +def build_gnutls(r, p): + update_checkout(r, p) + subprocess.run(["./bootstrap"], check=True) + default_configure() + subprocess.run(["make", "install"], check=True) + (p / "taler-buildstamp").touch() + def build_wallet(r, p): update_checkout(r, p) subprocess.run(["./bootstrap"], check=True) @@ -232,6 +239,12 @@ def build_backoffice(r, p): (p / "taler-buildstamp").touch() repos = { + "gnutls": Repo( + "gnutls", + "git://github.com/gnutls/gnutls", + [], + build_gnutls, + ), "libmicrohttpd": Repo( "libmicrohttpd", "git://git.gnunet.org/libmicrohttpd.git", @@ -398,7 +411,7 @@ def build(without_repos, only_repos) -> None: "--repos", "-r", metavar="REPOS", help="REPOS is a unspaced and comma-separated list of the repositories to clone.", - default="libmicrohttpd,gnunet,exchange,merchant,wallet-core,taler-merchant-demos,sync,anastasis,libeufin", + default="libgnutls,libmicrohttpd,gnunet,exchange,merchant,wallet-core,taler-merchant-demos,sync,anastasis,libeufin", show_default=True, ) @click.option( -- cgit v1.2.3