Skip to content

Commit 5a8a18a

Browse files
committed
Use builtin libtan
1 parent 04be7b0 commit 5a8a18a

File tree

2 files changed

+2
-7
lines changed

2 files changed

+2
-7
lines changed

build/README.md

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -94,11 +94,6 @@ The template system uses [Scriban](https://github.com/scriban/scriban) which use
9494
## What We Template
9595
While there are many things we could template for the most part we want to only keep it to things a user is unlikely to change while creating the script. Build scripts often contain custom code so having to regenerate the template is an annoyance to re-add. This means we don't Things we template include: Does a library use gnulib?, does it use cmake or configure? does it want us to install any vcpkgs for it? We don't template things like what gnulib modules do we need to add, or what vcpkg's to install. These are items that the developer may need to vary while trying to get the build to work properly. Now we do offer the convenience of specifying the default variables from default_config.ini but the user can always set these themselves in the script easily enough.
9696

97-
need to do:
98-
make
99-
gnutls
100-
101-
10297
# Template Calls for Each Lib/App
10398
Below are the template calls and modifications to the produced build script for each build we offer. I try to make sure any changes made to the build scripts gets ported back here.
10499

@@ -502,7 +497,7 @@ make ships with a bunch of gnulib baked in but doesn't use gnulib proper we chan
502497

503498
## gnutls
504499
### Template Script Args
505-
`--BUILD_NAME gnutls --GitRepo https://github.com/gnutls/gnutls.git --GNU_LIBS_ADDL "dirent" "getopt-gnu" --CONFIG_CMD_ADDL "--with-included-unistring" --VC_PKGDEPS "gmp" "nettle" "brotli" "zstd" --PKG_CONFIG_MANUAL_ADD "gmp" --BUILD_ADDL_CFLAGS "-I../gl/"`
500+
`--BUILD_NAME gnutls --GitRepo https://github.com/gnutls/gnutls.git --GNU_LIBS_ADDL "dirent" "getopt-gnu" --CONFIG_CMD_ADDL "--with-included-unistring" "--with-included-libtasn1" --VC_PKGDEPS "gmp" "nettle" "brotli" "zstd" --PKG_CONFIG_MANUAL_ADD "gmp" --BUILD_ADDL_CFLAGS "-I../gl/"`
506501

507502
### Modifications
508503
At top after startcommon add: `BLD_CONFIG_GNU_LIBS_EXCLUDE=("${BLD_CONFIG_GNU_LIBS_DEFAULT[@]}")` have to wait until then as otherwise full template sub not done

build/f_gnutls_build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ set -e
44

55
BLD_CONFIG_BUILD_NAME="gnutls"
66
BLD_CONFIG_GNU_LIBS_ADDL=( "dirent" "getopt-gnu" )
7-
BLD_CONFIG_CONFIG_CMD_ADDL=( "--with-included-unistring" )
7+
BLD_CONFIG_CONFIG_CMD_ADDL=( "--with-included-unistring" "--with-included-libtasn1" )
88
BLD_CONFIG_VCPKG_DEPS=( "gmp" "nettle" "brotli" "zstd" )
99
BLD_CONFIG_PKG_CONFIG_MANUAL_ADD=( "gmp" )
1010
BLD_CONFIG_BUILD_ADDL_CFLAGS=( "-I../gl/" )

0 commit comments

Comments
 (0)