diff options
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/depends/target/config.site.in | 3 | ||||
| -rw-r--r-- | tools/depends/target/gnutls/01-macos-clang-accel.patch | 22 | ||||
| -rw-r--r-- | tools/depends/target/gnutls/GNUTLS-VERSION | 5 | ||||
| -rw-r--r-- | tools/depends/target/gnutls/Makefile | 33 | ||||
| -rw-r--r-- | tools/depends/target/gnutls/add-dl-as-private-lib.patch | 6 |
5 files changed, 25 insertions, 44 deletions
diff --git a/tools/depends/target/config.site.in b/tools/depends/target/config.site.in index 2034ac0151..f354b9b6f4 100644 --- a/tools/depends/target/config.site.in +++ b/tools/depends/target/config.site.in @@ -36,9 +36,6 @@ LD_LIBRARY_PATH=@prefix@/@tool_dir@/lib:$LD_LIBRARY_PATH PYTHON_VERSION=3.9 NATIVE_ROOT=@prefix@/@tool_dir@ -#libomxil-bellagio -ac_cv_func_malloc_0_nonnull=yes - #curl ac_cv_file__dev_urandom=yes ac_cv_lib_ssl_SSL_connect=yes diff --git a/tools/depends/target/gnutls/01-macos-clang-accel.patch b/tools/depends/target/gnutls/01-macos-clang-accel.patch deleted file mode 100644 index cf9647e940..0000000000 --- a/tools/depends/target/gnutls/01-macos-clang-accel.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- a/lib/accelerated/aarch64/Makefile.am -+++ b/lib/accelerated/aarch64/Makefile.am -@@ -34,7 +34,7 @@ - endif - - #ensure that we have all aarch64 instruction sets enabled for the assembler --AM_CCASFLAGS = -Wa,-march=all -+#AM_CCASFLAGS = -Wa,-march=all - - EXTRA_DIST = README - ---- a/lib/accelerated/aarch64/Makefile.in -+++ b/lib/accelerated/aarch64/Makefile.in -@@ -1634,7 +1634,7 @@ - -I$(srcdir)/../../ -I$(srcdir)/../ $(am__append_1) - - #ensure that we have all aarch64 instruction sets enabled for the assembler --AM_CCASFLAGS = -Wa,-march=all -+#AM_CCASFLAGS = -Wa,-march=all - EXTRA_DIST = README - noinst_LTLIBRARIES = libaarch64.la - libaarch64_la_SOURCES = aarch64-common.c aarch64-common.h \ diff --git a/tools/depends/target/gnutls/GNUTLS-VERSION b/tools/depends/target/gnutls/GNUTLS-VERSION new file mode 100644 index 0000000000..c374b38b59 --- /dev/null +++ b/tools/depends/target/gnutls/GNUTLS-VERSION @@ -0,0 +1,5 @@ +LIBNAME=gnutls +VERSION=3.7.8 +ARCHIVE=$(LIBNAME)-$(VERSION).tar.xz +SHA512=4199bcf7c9e3aab2f52266aadceefc563dfe2d938d0ea1f3ec3be95d66f4a8c8e5494d3a800c03dd02ad386dec1738bd63e1fe0d8b394a2ccfc7d6c6a0cc9359 + diff --git a/tools/depends/target/gnutls/Makefile b/tools/depends/target/gnutls/Makefile index 947b668837..25d2ad3e3e 100644 --- a/tools/depends/target/gnutls/Makefile +++ b/tools/depends/target/gnutls/Makefile @@ -1,15 +1,22 @@ -include ../../Makefile.include +include ../../Makefile.include GNUTLS-VERSION ../../download-files.include DEPS = ../../Makefile.include Makefile ../../download-files.include \ add-dl-as-private-lib.patch \ - 01-macos-clang-accel.patch 03-support-correct-cisdigit.patch - -# lib name, version -LIBNAME=gnutls -VERSION=3.6.16 -SOURCE=$(LIBNAME)-$(VERSION) -ARCHIVE=$(SOURCE).tar.xz -SHA512=72c78d7fcb024393c1d15f2a1856608ae4460ba43cc5bbbb4c29b80508cae6cb822df4638029de2363437d110187e0a3cc19a7288c3b2f44b2f648399a028438 -include ../../download-files.include + 03-support-correct-cisdigit.patch + +# disable rpl_malloc and rpl_realloc symbols in glib +# causes linking errors in libmicrohttpd and ffmpeg with missing symbols +# Undefined symbols for architecture arm64: +# "_rpl_realloc", referenced from: +# _gnutls_realloc in libgnutls.a(mem.o) +# _gnutls_realloc_zero in libgnutls.a(init.o) +# __asn1_realloc in libgnutls.a(parser_aux.o) +# __asn1_ordering_set_of in libgnutls.a(coding.o) +# __asn1_realloc in libgnutls.a(decoding.o) +# __gnutls_fread_file in libgnutls.a(read-file.o) +# _rpl_getdelim in libgnutls.a(getdelim.o) +# ... +CONFIGURE_OPTIONS+= ac_cv_func_malloc_0_nonnull=yes \ + ac_cv_func_realloc_0_nonnull=yes # configuration settings CONFIGURE=./configure --prefix=$(PREFIX) \ @@ -34,12 +41,6 @@ $(PLATFORM): $(DEPS) | $(TARBALLS_LOCATION)/$(ARCHIVE).$(HASH_TYPE) rm -rf $(PLATFORM)/*; mkdir -p $(PLATFORM) cd $(PLATFORM); $(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE) cd $(PLATFORM); patch -p1 -i ../add-dl-as-private-lib.patch -ifeq ($(findstring apple-darwin, $(HOST)), apple-darwin) - cd $(PLATFORM); patch -p1 -i ../01-macos-clang-accel.patch -endif -ifeq ($(OS),android) - cd $(PLATFORM); patch -p1 -i ../01-macos-clang-accel.patch -endif cd $(PLATFORM); patch -p1 -i ../03-support-correct-cisdigit.patch cd $(PLATFORM); $(AUTORECONF) -vif cd $(PLATFORM); $(CONFIGURE) diff --git a/tools/depends/target/gnutls/add-dl-as-private-lib.patch b/tools/depends/target/gnutls/add-dl-as-private-lib.patch index 8531ac9259..c77f2517a9 100644 --- a/tools/depends/target/gnutls/add-dl-as-private-lib.patch +++ b/tools/depends/target/gnutls/add-dl-as-private-lib.patch @@ -1,6 +1,6 @@ --- a/configure.ac +++ b/configure.ac -@@ -552,6 +552,9 @@ +@@ -586,6 +586,9 @@ AC_LIB_HAVE_LINKFLAGS(dl,, [#include <dlfcn.h>], [dladdr (0, 0);]) @@ -16,7 +16,7 @@ URL: https://www.gnutls.org/ Version: @VERSION@ Libs: -L${libdir} -lgnutls --Libs.private: @LIBINTL@ @LIBSOCKET@ @INET_PTON_LIB@ @LIBPTHREAD@ @LIB_SELECT@ @TSS_LIBS@ @GMP_LIBS@ @LIBUNISTRING@ @LIBATOMIC_LIBS@ @GNUTLS_LIBS_PRIVATE@ -+Libs.private: @LIBINTL@ @LIBSOCKET@ @INET_PTON_LIB@ @LIBPTHREAD@ @LIB_SELECT@ @TSS_LIBS@ @GMP_LIBS@ @LIBUNISTRING@ @LIBATOMIC_LIBS@ @GNUTLS_LIBS_PRIVATE@ @LIBDL@ +-Libs.private: @LIBZ_PC@ @LIBINTL@ @LIBSOCKET@ @INET_PTON_LIB@ @LIBPTHREAD@ @LIB_SELECT@ @TSS_LIBS@ @GMP_LIBS@ @LIBUNISTRING@ @LIBATOMIC_LIBS@ @GNUTLS_LIBS_PRIVATE@ ++Libs.private: @LIBZ_PC@ @LIBINTL@ @LIBSOCKET@ @INET_PTON_LIB@ @LIBPTHREAD@ @LIB_SELECT@ @TSS_LIBS@ @GMP_LIBS@ @LIBUNISTRING@ @LIBATOMIC_LIBS@ @GNUTLS_LIBS_PRIVATE@ @LIBDL@ @GNUTLS_REQUIRES_PRIVATE@ Cflags: -I${includedir} |