Merge pull request #9314 from cms-sw/riscv-changes

Changes for RISC-V
cms-sw · Jul 25, 2024 · 4e6b81a · 4e6b81a
2 parents 5987ef2 + 76c0887
commit 4e6b81a
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 1 deletion.
diff --git a/mplsetup.patch b/mplsetup.patch
@@ -0,0 +1,5 @@
+--- /dev/null   2023-08-09 02:00:04.190000000 +0200
++++ a/mplsetup.cfg      2024-07-22 10:51:17.964075612 +0200
+@@ -0,0 +1,2 @@
++[libs]
++system_freetype = True
diff --git a/openmpi.spec b/openmpi.spec
@@ -45,7 +45,8 @@ Requires: zlib
   --with-xpmem=$XPMEM_ROOT \
   --without-x \
   --with-pic \
-  --with-gnu-ld
+  --with-gnu-ld \
+  --with-pmix=internal
 
 %build
 make %{makeprocesses} 

diff --git a/pip/matplotlib.file b/pip/matplotlib.file
@@ -1,4 +1,5 @@
 Requires: py3-numpy py3-pillow py3-pybind11
+Patch0: mplsetup
 %define PipPreBuild \
   export CFLAGS="-I${FREETYPE_ROOT}/include/freetype2 -I${LIBPNG_ROOT}/include/libpng16" \
   export LDFLAGS="-L${FREETYPE_ROOT}/lib -L${LIBPNG_ROOT}/lib" \

diff --git a/root.spec b/root.spec
@@ -26,6 +26,9 @@ Requires: dcap
 
 %prep
 %setup -n %{n}-%{realversion}
+%get_config_sub graf2d/asimage/src/libAfterImage/config.sub
+%get_config_guess graf2d/asimage/src/libAfterImage/config.guess
+chmod +x graf2d/asimage/src/libAfterImage/config.{sub,guess}
 
 %build
 rm -rf ../build