commit: ebf8e7715880f0733487c2ff9331a362291fcb9d Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Wed May 14 04:32:06 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Wed May 14 04:32:46 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ebf8e771
dev-lang/julia: drop -Werror for mbedtls; respect AR/CC/CXX more Bug: https://bugs.gentoo.org/905448 Closes: https://bugs.gentoo.org/955903 Signed-off-by: Sam James <sam <AT> gentoo.org> dev-lang/julia/files/julia-1.8.5-no-werror-mbedtls.patch | 14 ++++++++++++++ dev-lang/julia/julia-1.8.3-r6.ebuild | 13 +++++++++---- dev-lang/julia/julia-1.8.5-r3.ebuild | 9 ++++++--- dev-lang/julia/julia-1.9.0-r2.ebuild | 9 ++++++--- dev-lang/julia/julia-1.9.4-r2.ebuild | 11 +++++++---- 5 files changed, 42 insertions(+), 14 deletions(-) diff --git a/dev-lang/julia/files/julia-1.8.5-no-werror-mbedtls.patch b/dev-lang/julia/files/julia-1.8.5-no-werror-mbedtls.patch new file mode 100644 index 000000000000..4e05f97a2d7d --- /dev/null +++ b/dev-lang/julia/files/julia-1.8.5-no-werror-mbedtls.patch @@ -0,0 +1,14 @@ +diff --git a/deps/mbedtls.mk b/deps/mbedtls.mk +index 07d8304..f17d5e3 100644 +--- a/deps/mbedtls.mk ++++ b/deps/mbedtls.mk +@@ -5,7 +5,8 @@ MBEDTLS_SRC = mbedtls-$(MBEDTLS_VER) + MBEDTLS_URL = https://github.com/ARMmbed/mbedtls/archive/v$(MBEDTLS_VER).tar.gz + + MBEDTLS_OPTS := $(CMAKE_COMMON) -DUSE_SHARED_MBEDTLS_LIBRARY=ON \ +- -DUSE_STATIC_MBEDTLS_LIBRARY=OFF -DENABLE_PROGRAMS=OFF -DCMAKE_BUILD_TYPE=Release ++ -DUSE_STATIC_MBEDTLS_LIBRARY=OFF -DENABLE_PROGRAMS=OFF -DCMAKE_BUILD_TYPE=Release \ ++ -DMBEDTLS_FATAL_WARNINGS=OFF + + MBEDTLS_OPTS += -DENABLE_ZLIB_SUPPORT=OFF + ifeq ($(BUILD_OS),WINNT) diff --git a/dev-lang/julia/julia-1.8.3-r6.ebuild b/dev-lang/julia/julia-1.8.3-r6.ebuild index 7ad90d997b27..a4c063ca7de6 100644 --- a/dev-lang/julia/julia-1.8.3-r6.ebuild +++ b/dev-lang/julia/julia-1.8.3-r6.ebuild @@ -50,7 +50,10 @@ BDEPEND=" virtual/pkgconfig " -PATCHES=( "${FILESDIR}"/${PN}-1.8.0-llvm-no-bindings.patch ) +PATCHES=( + "${FILESDIR}"/${PN}-1.8.0-llvm-no-bindings.patch + "${FILESDIR}"/${PN}-1.8.5-no-werror-mbedtls.patch +) # Huge thanks to Arch Linux developers for the patches. archlinux_uri="https://raw.githubusercontent.com/archlinux/svntogit-community/packages/julia/trunk/"; @@ -108,9 +111,8 @@ src_prepare() { } src_configure() { - # julia does not play well with the system versions of libuv - # Fails to compile with libpcre2 on split-usr, bug #893336 - # USE_SYSTEM_LIBM=0 implies using external openlibm + tc-export AR CC CXX + cat <<-EOF > Make.user LOCALBASE:="${EPREFIX}/usr" override prefix:="${EPREFIX}/usr" @@ -124,8 +126,10 @@ src_configure() { USE_SYSTEM_CSL:=1 USE_SYSTEM_LLVM:=0 USE_SYSTEM_LIBUNWIND:=1 + # Fails to compile with libpcre2 on split-usr, bug #893336 USE_SYSTEM_PCRE:=0 USE_SYSTEM_LIBM:=0 + # USE_SYSTEM_LIBM=0 implies using external openlibm USE_SYSTEM_OPENLIBM:=1 USE_SYSTEM_DSFMT:=1 USE_SYSTEM_BLAS:=1 @@ -134,6 +138,7 @@ src_configure() { USE_SYSTEM_GMP:=1 USE_SYSTEM_MPFR:=1 USE_SYSTEM_LIBSUITESPARSE:=1 + # julia does not play well with the system versions of libuv USE_SYSTEM_LIBUV:=0 USE_SYSTEM_UTF8PROC:=1 # Needs deprecated MD4 which we don't build our net-libs/mbedtls:0 diff --git a/dev-lang/julia/julia-1.8.5-r3.ebuild b/dev-lang/julia/julia-1.8.5-r3.ebuild index 7831c5c64367..2646545dd336 100644 --- a/dev-lang/julia/julia-1.8.5-r3.ebuild +++ b/dev-lang/julia/julia-1.8.5-r3.ebuild @@ -68,6 +68,7 @@ PATCHES=( "${FILESDIR}"/${PN}-1.8.5-cstdint-includes.patch "${FILESDIR}"/${PN}-1.8.0-llvm-no-bindings.patch "${FILESDIR}"/${PN}-1.8.3-gcc13.patch + "${FILESDIR}"/${PN}-1.8.5-no-werror-mbedtls.patch ) QA_FLAGS_IGNORED+='usr/.*/julia/sys.so' # Julia sysimage generated by bootstrapping. @@ -149,9 +150,8 @@ src_prepare() { } src_configure() { - # julia does not play well with the system versions of libuv - # Fails to compile with libpcre2 on split-usr, bug #893336 - # USE_SYSTEM_LIBM=0 implies using external openlibm + tc-export AR CC CXX + cat <<-EOF > Make.user LOCALBASE:=${EPREFIX}/usr override prefix:=${EPREFIX}/usr @@ -166,8 +166,10 @@ src_configure() { USE_SYSTEM_CSL:=1 USE_SYSTEM_LLVM:=0 USE_SYSTEM_LIBUNWIND:=1 + # Fails to compile with libpcre2 on split-usr, bug #893336 USE_SYSTEM_PCRE:=0 USE_SYSTEM_LIBM:=0 + # USE_SYSTEM_LIBM=0 implies using external openlibm USE_SYSTEM_OPENLIBM:=1 USE_SYSTEM_DSFMT:=1 USE_SYSTEM_BLAS:=1 @@ -176,6 +178,7 @@ src_configure() { USE_SYSTEM_GMP:=1 USE_SYSTEM_MPFR:=1 USE_SYSTEM_LIBSUITESPARSE:=1 + # julia does not play well with the system versions of libuv USE_SYSTEM_LIBUV:=0 USE_SYSTEM_UTF8PROC:=1 # Needs deprecated MD4 which we don't build our net-libs/mbedtls:0 diff --git a/dev-lang/julia/julia-1.9.0-r2.ebuild b/dev-lang/julia/julia-1.9.0-r2.ebuild index 3db5a73ad45b..00812696903f 100644 --- a/dev-lang/julia/julia-1.9.0-r2.ebuild +++ b/dev-lang/julia/julia-1.9.0-r2.ebuild @@ -59,6 +59,7 @@ BDEPEND=" CHECKREQS_DISK_BUILD="4G" PATCHES=( + "${FILESDIR}"/${PN}-1.8.5-no-werror-mbedtls.patch ) QA_FLAGS_IGNORED+='usr/.*/julia/sys.so' # Julia sysimage generated by bootstrapping. @@ -128,9 +129,8 @@ src_prepare() { } src_configure() { - # julia does not play well with the system versions of libuv - # Fails to compile with libpcre2 on split-usr, bug #893336 - # USE_SYSTEM_LIBM=0 implies using external openlibm + tc-export AR CC CXX + cat <<-EOF > Make.user LOCALBASE:=${EPREFIX}/usr override prefix:=${EPREFIX}/usr @@ -145,8 +145,10 @@ src_configure() { USE_SYSTEM_CSL:=1 USE_SYSTEM_LLVM:=0 USE_SYSTEM_LIBUNWIND:=1 + # Fails to compile with libpcre2 on split-usr, bug #893336 USE_SYSTEM_PCRE:=0 USE_SYSTEM_LIBM:=0 + # USE_SYSTEM_LIBM=0 implies using external openlibm USE_SYSTEM_OPENLIBM:=1 USE_SYSTEM_DSFMT:=1 USE_SYSTEM_BLAS:=1 @@ -155,6 +157,7 @@ src_configure() { USE_SYSTEM_GMP:=1 USE_SYSTEM_MPFR:=1 USE_SYSTEM_LIBSUITESPARSE:=1 + # julia does not play well with the system versions of libuv USE_SYSTEM_LIBUV:=0 USE_SYSTEM_UTF8PROC:=1 # Needs deprecated MD4 which we don't build our net-libs/mbedtls:0 diff --git a/dev-lang/julia/julia-1.9.4-r2.ebuild b/dev-lang/julia/julia-1.9.4-r2.ebuild index 8bb6d2d2ff69..0b88f1ded8c6 100644 --- a/dev-lang/julia/julia-1.9.4-r2.ebuild +++ b/dev-lang/julia/julia-1.9.4-r2.ebuild @@ -62,7 +62,8 @@ PATCHES=( "${FILESDIR}"/julia-1.8.0-llvm-no-bindings.patch "${FILESDIR}"/julia-1.9.4-no-doc-install.patch "${FILESDIR}"/julia-1.9.4-string-replace.patch - ) + "${FILESDIR}"/julia-1.8.5-no-werror-mbedtls.patch +) QA_FLAGS_IGNORED+='usr/.*/julia/sys.so' # Julia sysimage generated by bootstrapping. pkg_setup() { @@ -111,9 +112,8 @@ src_prepare() { } src_configure() { - # julia does not play well with the system versions of libuv - # Fails to compile with libpcre2 on split-usr, bug #893336 - # USE_SYSTEM_LIBM=0 implies using external openlibm + tc-export AR CC CXX + cat <<-EOF > Make.user LOCALBASE:=${EPREFIX}/usr override prefix:=${EPREFIX}/usr @@ -128,8 +128,10 @@ src_configure() { USE_SYSTEM_CSL:=1 USE_SYSTEM_LLVM:=0 USE_SYSTEM_LIBUNWIND:=1 + # Fails to compile with libpcre2 on split-usr, bug #893336 USE_SYSTEM_PCRE:=0 USE_SYSTEM_LIBM:=0 + # USE_SYSTEM_LIBM=0 implies using external openlibm USE_SYSTEM_OPENLIBM:=1 USE_SYSTEM_DSFMT:=1 USE_SYSTEM_BLAS:=1 @@ -138,6 +140,7 @@ src_configure() { USE_SYSTEM_GMP:=1 USE_SYSTEM_MPFR:=1 USE_SYSTEM_LIBSUITESPARSE:=1 + # julia does not play well with the system versions of libuv USE_SYSTEM_LIBUV:=0 USE_SYSTEM_UTF8PROC:=1 # Needs deprecated MD4 which we don't build our net-libs/mbedtls:0
