diff options
| -rw-r--r-- | patches/gnutls-3.6.2.local.patch | 14 | ||||
| -rw-r--r-- | vars/build.vars | 6 | ||||
| -rw-r--r-- | vars/gnutls.vars | 8 |
3 files changed, 27 insertions, 1 deletions
diff --git a/patches/gnutls-3.6.2.local.patch b/patches/gnutls-3.6.2.local.patch new file mode 100644 index 00000000..d36d75ee --- /dev/null +++ b/patches/gnutls-3.6.2.local.patch @@ -0,0 +1,14 @@ +diff -ru gnutls-3.6.2.orig/lib/random.c gnutls-3.6.2/lib/random.c +--- gnutls-3.6.2.orig/lib/random.c 2018-02-11 10:49:13.000000000 +0100 ++++ gnutls-3.6.2/lib/random.c 2018-04-05 00:48:31.928381221 +0200 +@@ -42,8 +42,8 @@ + #endif + + /* Per thread context of random generator, and a flag to indicate initialization */ +-static _Thread_local void *gnutls_rnd_ctx; +-static _Thread_local unsigned rnd_initialized = 0; ++static __thread void *gnutls_rnd_ctx; ++static __thread unsigned rnd_initialized = 0; + + struct rnd_ctx_list_st { + void *ctx; diff --git a/vars/build.vars b/vars/build.vars index 56f6218e..d4d07f5f 100644 --- a/vars/build.vars +++ b/vars/build.vars @@ -346,7 +346,7 @@ NATIVE_PACKAGES_DEPS_PACKAGES=" expat libxml2 alsa_lib apr apr_util bzip2 libdmtx libressl curl libz lmdb libpng libjpeg_turbo tiff giflib libffi gdbm geoip pcre glib gzip libarchive libatomic_ops libpipeline libevent libfetch libogg libvorbis libgpg_error libassuan libfirm -libgcrypt libksba libudns lua ncurses ncursestw ncursesw libnettle libreadline npth +libgcrypt libksba libudns lua ncurses ncursestw ncursesw libnettle gnutls libreadline npth popt shared_mime_info sqlite3 w32api w32lib xz cmake qrencode util_linux"; NATIVE_PACKAGES_DEPS_PREFIX="${PREFIX_NATIVE}"; NATIVE_PACKAGES_DEPS_PYTHON="${PREFIX}/bin/python"; @@ -501,6 +501,10 @@ NATIVE_PACKAGES_DEPS_PYTHON="${PREFIX}/bin/python"; : ${PKG_LIBNETTLE_VERSION:=3.4}; : ${PKG_LIBNETTLE_URL:=https://ftp.gnu.org/gnu/nettle/nettle-${PKG_LIBNETTLE_VERSION}.tar.gz}; : ${PKG_LIBNETTLE_CONFIGURE_ARGS_EXTRA:=--disable-assembler}; +: ${PKG_GNUTLS_SHA256SUM:=bcd5db7b234e02267f36b5d13cf5214baac232b7056a506252b7574ea7738d1f}; +: ${PKG_GNUTLS_VERSION:=3.6.2}; +: ${PKG_GNUTLS_URL:=https://www.gnupg.org/ftp/gcrypt/gnutls/v${PKG_GNUTLS_VERSION%.*}/gnutls-${PKG_GNUTLS_VERSION}.tar.xz}; +: ${PKG_GNUTLS_CONFIGURE_ARGS_EXTRA:="--disable-ssl3-support --disable-ssl2-support --disable-cxx --disable-tools --enable-local-libopts --with-included-libtasn1 --with-included-unistring --without-p11-kit --disable-hardware-acceleration"}; : ${PKG_LIBREADLINE_SHA256SUM:=750d437185286f40a369e1e4f4764eda932b9459b5ec9a731628393dd3d32334}; : ${PKG_LIBREADLINE_VERSION:=7.0}; : ${PKG_LIBREADLINE_URL:=ftp://ftp.gnu.org/gnu/readline/readline-${PKG_LIBREADLINE_VERSION}.tar.gz}; diff --git a/vars/gnutls.vars b/vars/gnutls.vars new file mode 100644 index 00000000..facb60a7 --- /dev/null +++ b/vars/gnutls.vars @@ -0,0 +1,8 @@ +# +# set -o errexit -o noglob are assumed. +# + +: ${PKG_GNUTLS_CONFIG_CACHE_EXTRA:=" +gl_cv_ld_output_def=no"}; + +# vim:filetype=sh |