julia/mpfr-looking-for-gmp-fix.patch

diff -ruN julia-1.10.3.orig/deps/mpfr.mk julia-1.10.3/deps/mpfr.mk
--- julia-1.10.3.orig/deps/mpfr.mk	2024-05-10 23:13:57.440776105 +0800
+++ julia-1.10.3/deps/mpfr.mk	2024-05-12 17:15:31.003123811 +0800
@@ -1,19 +1,15 @@
 ## MPFR ##
 include $(SRCDIR)/mpfr.version
 
-ifeq ($(USE_SYSTEM_GMP), 0)
 $(BUILDDIR)/mpfr-$(MPFR_VER)/build-configured: | $(build_prefix)/manifest/gmp
-endif
 
 ifneq ($(USE_BINARYBUILDER_MPFR),1)
 
 MPFR_CONFIGURE_OPTS := $(CONFIGURE_COMMON)
 MPFR_CONFIGURE_OPTS += --enable-thread-safe --enable-shared-cache --disable-float128 --disable-decimal-float
 MPFR_CONFIGURE_OPTS += --enable-shared --disable-static
-
-ifeq ($(USE_SYSTEM_GMP), 0)
-MPFR_CONFIGURE_OPTS += --with-gmp=$(abspath $(build_prefix))
-endif
+MPFR_CONFIGURE_OPTS += --with-gmp-lib=$(abspath $(build_prefix))/lib64
+MPFR_CONFIGURE_OPTS += --with-gmp-include=$(abspath $(build_prefix))/include
 
 ifeq ($(SANITIZE),1)
 # Force generic C build
Accepting request 1173660 from home:uncomfyhalomacro:branches:science - Update to version 1.10.3: * Fix outdated usage of scrubbing for log test failures * [REPL] Fix typo in using/import completion * Avoid compiler warning about redefining jl_globalref_t * yet more atomics & cache-line fixes on work-stealing queue * build: remove extra .a file * Bump CSL to 1.1.1 to fix libgomp bug * codegen: change tbaa of ptr_phi to tbaa_value * Default to the medium code model in x86 linux * Remove some duplicates from emitted compilation traces for Julia 1.10 * Add version string to sysimg triple * Add missing GC_POP() in emit_cfunction * typeintersect: fix UnionAll unaliasing bug caused by innervars * Apply backported changes - GC typo fix - Add inventory writing via DocumenterInventoryWritingBackport - Add mpfr-looking-for-gmp-fix.patch - Cleanup specfile - Limit to x86_64(-v3) architectures. aarch64 has libquadmath disabled - Tests are currently broken. Idk how upstream was able to have all their checks green despite I using the some bundled dependencies. Other issues are because of hardcoded libraries in the jll packages even though their versions are non-impactful to Julia. - Nghttp, Mbedtls, PCRE, LibGit2, LibSSH, gmp, mpfr, and DSFMT are now using the bundled dependencies. * now added to the globally defined _privatelibs * ./julia-hardcoded-libs.patch is now updated. * the only dependencies that do not require much intervention is libblastrampoline and openlibm OBS-URL: https://build.opensuse.org/request/show/1173660 OBS-URL: https://build.opensuse.org/package/show/science/julia?expand=0&rev=175 2024-05-15 02:18:59 +02:00			`diff -ruN julia-1.10.3.orig/deps/mpfr.mk julia-1.10.3/deps/mpfr.mk`
			`--- julia-1.10.3.orig/deps/mpfr.mk 2024-05-10 23:13:57.440776105 +0800`
			`+++ julia-1.10.3/deps/mpfr.mk 2024-05-12 17:15:31.003123811 +0800`
			`@@ -1,19 +1,15 @@`
			`## MPFR ##`
			`include $(SRCDIR)/mpfr.version`

			`-ifeq ($(USE_SYSTEM_GMP), 0)`
			`$(BUILDDIR)/mpfr-$(MPFR_VER)/build-configured: \| $(build_prefix)/manifest/gmp`
			`-endif`

			`ifneq ($(USE_BINARYBUILDER_MPFR),1)`

			`MPFR_CONFIGURE_OPTS := $(CONFIGURE_COMMON)`
			`MPFR_CONFIGURE_OPTS += --enable-thread-safe --enable-shared-cache --disable-float128 --disable-decimal-float`
			`MPFR_CONFIGURE_OPTS += --enable-shared --disable-static`
			`-`
			`-ifeq ($(USE_SYSTEM_GMP), 0)`
			`-MPFR_CONFIGURE_OPTS += --with-gmp=$(abspath $(build_prefix))`
			`-endif`
			`+MPFR_CONFIGURE_OPTS += --with-gmp-lib=$(abspath $(build_prefix))/lib64`
			`+MPFR_CONFIGURE_OPTS += --with-gmp-include=$(abspath $(build_prefix))/include`

			`ifeq ($(SANITIZE),1)`
			`# Force generic C build`