diff options
| -rw-r--r-- | patches/libnettle-3.4.1.local.patch (renamed from patches/libnettle-3.4.local.patch) | 0 | ||||
| -rw-r--r-- | patches/libnettle/nettle-conf-fix.patch | 26 | ||||
| -rw-r--r-- | vars/build.vars | 15 |
3 files changed, 34 insertions, 7 deletions
diff --git a/patches/libnettle-3.4.local.patch b/patches/libnettle-3.4.1.local.patch index 651aed5d..651aed5d 100644 --- a/patches/libnettle-3.4.local.patch +++ b/patches/libnettle-3.4.1.local.patch diff --git a/patches/libnettle/nettle-conf-fix.patch b/patches/libnettle/nettle-conf-fix.patch new file mode 100644 index 00000000..1e031668 --- /dev/null +++ b/patches/libnettle/nettle-conf-fix.patch @@ -0,0 +1,26 @@ +diff -ru nettle-3.4.1.orig/configure nettle-3.4.1/configure +--- nettle-3.4.1.orig/configure 2018-12-04 21:56:06.000000000 +0100 ++++ nettle-3.4.1/configure 2019-01-31 11:41:23.385784666 +0100 +@@ -7188,6 +7188,22 @@ + LIBHOGWEED_LIBS='-Wl,--no-whole-archive $(LIBS) libnettle.dll.a' + IF_DLL='' + ;; ++ midipix*) ++ if test "x$ABI" = x64 ; then ++ W64_ABI=yes ++ fi ++ LIBNETTLE_FORLINK=libnettle.so ++ LIBNETTLE_SONAME='$(LIBNETTLE_FORLINK).$(LIBNETTLE_MAJOR)' ++ LIBNETTLE_FILE='$(LIBNETTLE_SONAME).$(LIBNETTLE_MINOR)' ++ LIBNETTLE_LINK='$(CC) $(CFLAGS) $(LDFLAGS) -shared -Wl,--out-dsolib=libnettle.lib.a -Wl,-soname=$(LIBNETTLE_SONAME)' ++ LIBNETTLE_LIBS='' ++ ++ LIBHOGWEED_FORLINK=libhogweed.so ++ LIBHOGWEED_SONAME='$(LIBHOGWEED_FORLINK).$(LIBHOGWEED_MAJOR)' ++ LIBHOGWEED_FILE='$(LIBHOGWEED_SONAME).$(LIBHOGWEED_MINOR)' ++ LIBHOGWEED_LINK='$(CC) $(CFLAGS) $(LDFLAGS) -shared -Wl,--out-dsolib=libhogweed.lib.a -Wl,-soname=$(LIBHOGWEED_SONAME)' ++ LIBHOGWEED_LIBS='$(LIBS) libnettle.lib.a' ++ ;; + darwin*) + LIBNETTLE_FORLINK=libnettle.dylib + LIBNETTLE_SONAME='libnettle.$(LIBNETTLE_MAJOR).dylib' diff --git a/vars/build.vars b/vars/build.vars index bf617bd7..06066a5c 100644 --- a/vars/build.vars +++ b/vars/build.vars @@ -101,8 +101,8 @@ HOST_TOOLCHAIN_DEPS_CONFIGURE_ARGS="--disable-nls --host=${DEFAULT_TARGET} --pre HOST_TOOLCHAIN_DEPS_PACKAGES=" gmp_host mpfr_host mpc_host psxtypes_host"; HOST_TOOLCHAIN_DEPS_PREFIX="${PREFIX_CROSS}"; -: ${PKG_GMP_HOST_SHA256SUM:=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160}; -: ${PKG_GMP_HOST_VERSION:=5.1.3}; +: ${PKG_GMP_HOST_SHA256SUM:=5275bb04f4863a13516b2f39392ac5e272f5e1bb8057b18aec1c9b79d73d8fb2}; +: ${PKG_GMP_HOST_VERSION:=6.1.2}; : ${PKG_GMP_HOST_URL:=https://gmplib.org/download/gmp/gmp-${PKG_GMP_HOST_VERSION}.tar.bz2}; : ${PKG_GMP_HOST_CONFIGURE_ARGS_EXTRA:=--disable-assembly}; : ${PKG_GMP_HOST_PATCHES_EXTRA:="${BUILD_WORKDIR}/chainport/gmp-${PKG_GMP_HOST_VERSION}.midipix.patch"}; @@ -245,8 +245,8 @@ NATIVE_TOOLCHAIN_DEPS_CONFIGURE_ARGS="--disable-nls --host=${DEFAULT_TARGET} --p NATIVE_TOOLCHAIN_DEPS_PACKAGES=" gmp libelf mpfr mpc"; NATIVE_TOOLCHAIN_DEPS_PREFIX="${PREFIX_NATIVE}"; -: ${PKG_GMP_SHA256SUM:=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160}; -: ${PKG_GMP_VERSION:=5.1.3}; +: ${PKG_GMP_SHA256SUM:=5275bb04f4863a13516b2f39392ac5e272f5e1bb8057b18aec1c9b79d73d8fb2}; +: ${PKG_GMP_VERSION:=6.1.2}; : ${PKG_GMP_URL:=https://gmplib.org/download/gmp/gmp-${PKG_GMP_VERSION}.tar.bz2}; : ${PKG_GMP_CONFIGURE_ARGS_EXTRA:=--disable-assembly}; : ${PKG_GMP_PATCHES_EXTRA:="${BUILD_WORKDIR}/chainport/gmp-${PKG_GMP_VERSION}.midipix.patch"}; @@ -517,10 +517,11 @@ NATIVE_PACKAGES_DEPS_PYTHON="${PREFIX}/bin/python2"; : ${PKG_LIBRESSL_URL:=http://ftp.eu.openbsd.org/pub/OpenBSD/LibreSSL/libressl-${PKG_LIBRESSL_VERSION}.tar.gz}; : ${PKG_LIBRESSL_CFLAGS_CONFIGURE_EXTRA:=-D__MIDIPIX}; : ${PKG_LIBRESSL_CONFIGURE_ARGS_EXTRA:=--disable-asm --enable-nc}; -: ${PKG_LIBNETTLE_SHA256SUM:=ae7a42df026550b85daca8389b6a60ba6313b0567f374392e54918588a411e94}; -: ${PKG_LIBNETTLE_VERSION:=3.4}; +: ${PKG_LIBNETTLE_SHA256SUM:=f941cf1535cd5d1819be5ccae5babef01f6db611f9b5a777bae9c7604b8a92ad}; +: ${PKG_LIBNETTLE_VERSION:=3.4.1}; : ${PKG_LIBNETTLE_URL:=https://ftp.gnu.org/gnu/nettle/nettle-${PKG_LIBNETTLE_VERSION}.tar.gz}; -: ${PKG_LIBNETTLE_CONFIGURE_ARGS_EXTRA:=--disable-assembler}; +: ${PKG_LIBNETTLE_CONFIGURE_ARGS_EXTRA:="nettle_cv_asm_underscore=no --disable-static"}; +: ${PKG_LIBNETTLE_CFLAGS_CONFIGURE_EXTRA:=-std=gnu99}; : ${PKG_LIBUNISTRING_SHA256SUM:=a4d993ecfce16cf503ff7579f5da64619cee66226fb3b998dafb706190d9a833}; : ${PKG_LIBUNISTRING_VERSION:=0.9.9}; : ${PKG_LIBUNISTRING_URL:=https://ftp.gnu.org/gnu/libunistring/libunistring-${PKG_LIBUNISTRING_VERSION}.tar.xz}; |