From ea76ee2c292695b07400cf9355d1c4885fa9e65c Mon Sep 17 00:00:00 2001 From: fuzzard Date: Sat, 9 Mar 2024 18:35:03 +1000 Subject: [tools/depends] LLVM15 support - reduce errors to warnings LLVM 15 raised some warning types to errors. For our purposes, just lower back to warnings. --- tools/depends/native/pkg-config/Makefile | 4 ++++ tools/depends/target/gnutls/Makefile | 4 ++++ tools/depends/target/openssl/Makefile | 2 ++ tools/depends/target/samba-gplv3/Makefile | 3 +++ 4 files changed, 13 insertions(+) diff --git a/tools/depends/native/pkg-config/Makefile b/tools/depends/native/pkg-config/Makefile index 1ba81b7a30..2973b69d89 100644 --- a/tools/depends/native/pkg-config/Makefile +++ b/tools/depends/native/pkg-config/Makefile @@ -17,6 +17,10 @@ ifeq ($(CROSS_COMPILING),no) PC_PATH:=$(PC_PATH):/usr/lib/pkgconfig:/usr/lib/$(HOST)/pkgconfig:/usr/share/pkgconfig endif +# LLVM 15 has raised this to error by default. drop back to warning +CFLAGS=$(NATIVE_CFLAGS) -Wno-error=int-conversion +export CFLAGS + # configuration settings CONFIGURE=./configure --prefix=$(PREFIX) --enable-indirect-deps --with-pc-path=$(PC_PATH) --with-internal-glib LIBDYLIB=$(PLATFORM)/pkg-config diff --git a/tools/depends/target/gnutls/Makefile b/tools/depends/target/gnutls/Makefile index 335667d32a..f60773dce9 100644 --- a/tools/depends/target/gnutls/Makefile +++ b/tools/depends/target/gnutls/Makefile @@ -34,6 +34,10 @@ CONFIGURE=./configure --prefix=$(PREFIX) \ --without-idn \ $(CONFIGURE_OPTIONS) +# LLVM 15 has raised this to error by default. drop back to warning +CFLAGS+= -Wno-error=implicit-int +export CFLAGS + LIBDYLIB=$(PLATFORM)/lib/.libs/lib$(LIBNAME).a all: .installed-$(PLATFORM) diff --git a/tools/depends/target/openssl/Makefile b/tools/depends/target/openssl/Makefile index 1a3dceb0b7..c03177e484 100644 --- a/tools/depends/target/openssl/Makefile +++ b/tools/depends/target/openssl/Makefile @@ -21,6 +21,8 @@ else endif endif ifeq ($(OS), darwin_embedded) + # LLVM 15 has raised this to error by default. drop back to warning + CFLAGS+= -Wno-error=implicit-int export SDKROOT CFLAGS OPENSSLPLATFORM=kodi-$(TARGET_PLATFORM)-$(CPU) ifeq ($(TARGET_PLATFORM),appletvos) diff --git a/tools/depends/target/samba-gplv3/Makefile b/tools/depends/target/samba-gplv3/Makefile index 9e1c623e75..20a77dfe42 100644 --- a/tools/depends/target/samba-gplv3/Makefile +++ b/tools/depends/target/samba-gplv3/Makefile @@ -52,6 +52,9 @@ else endif endif +# LLVM 15 has raised this to error by default. drop back to warning +CFLAGS+= -Wno-error=int-conversion + export PERL5LIB:=$(PERLMODULE):$(PERL5LIB) export CC CXX CPP AR RANLIB LD AS NM STRIP TOOLCHAIN -- cgit v1.2.3