diff --git a/recipe/Makefile.conda.PAR b/recipe/Makefile.conda.PAR index c008da2..37d0597 100644 --- a/recipe/Makefile.conda.PAR +++ b/recipe/Makefile.conda.PAR @@ -61,5 +61,5 @@ OPTC = -O #End Optimized options INCS = $(INCPAR) -LIBS = $(LIBPAR) +LIBS = $(LIBPAR) $(LIBBLAS) LIBSEQNEEDED = diff --git a/recipe/Makefile.conda.SEQ b/recipe/Makefile.conda.SEQ index 6c88489..4ecb6f8 100755 --- a/recipe/Makefile.conda.SEQ +++ b/recipe/Makefile.conda.SEQ @@ -62,5 +62,5 @@ OPTL = -O OPTC = -O #End Optimized options INCS = $(INCSEQ) -LIBS = $(LIBSEQ) +LIBS = $(LIBSEQ) $(LIBBLAS) LIBSEQNEEDED = libseqneeded diff --git a/recipe/build-mpi.sh b/recipe/build-mpi.sh index cde8ebd..f209077 100755 --- a/recipe/build-mpi.sh +++ b/recipe/build-mpi.sh @@ -20,15 +20,17 @@ if [[ "$CONDA_BUILD_CROSS_COMPILATION" == "1" ]]; then fi if [[ "$(uname)" == "Darwin" ]]; then - export SONAME="-Wl,-install_name,@rpath/" + export SONAME="-install_name,@rpath/" export LDFLAGS="${LDFLAGS} -headerpad_max_install_names" else - export SONAME="-Wl,-soname," + export SONAME="-soname" fi export CC=mpicc export FC=mpifort -make all +export LIBEXT_SHARED=${SHLIB_EXT} + +make allshared cp -av lib/*${SHLIB_EXT} ${PREFIX}/lib diff --git a/recipe/build-seq.sh b/recipe/build-seq.sh index b8fa0ae..52042d1 100755 --- a/recipe/build-seq.sh +++ b/recipe/build-seq.sh @@ -21,13 +21,15 @@ if [[ "$CONDA_BUILD_CROSS_COMPILATION" == "1" ]]; then fi if [[ "$(uname)" == "Darwin" ]]; then - export SONAME="-Wl,-install_name,@rpath/" + export SONAME="-install_name,@rpath/" export LDFLAGS="${LDFLAGS} -headerpad_max_install_names" else - export SONAME="-Wl,-soname," + export SONAME="-soname" fi -make all PLAT=_seq +export LIBEXT_SHARED=${SHLIB_EXT} + +make allshared PLAT=_seq mkdir -p "${PREFIX}/lib" mkdir -p "${PREFIX}/include/mumps_seq" diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 388d27e..e8a5b89 100755 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -11,10 +11,8 @@ source: url: https://graal.ens-lyon.fr/MUMPS/MUMPS_{{ version }}.tar.gz sha256: {{ sha256 }} patches: - - shared-pord.patch - - shared-mumps.patch - - shared-libseq.patch - - examples-mpilibs.patch + - sonamecomma.patch # [osx] + # - examples-mpilibs.patch - flang-support.patch - mumps_support_only_metis_5_1_1.patch diff --git a/recipe/sonamecomma.patch b/recipe/sonamecomma.patch new file mode 100644 index 0000000..0eac725 --- /dev/null +++ b/recipe/sonamecomma.patch @@ -0,0 +1,11 @@ +--- a/src/Makefile 2023-12-12 09:23:44 ++++ b/src/Makefile 2023-12-12 09:24:06 +@@ -214,7 +214,7 @@ + $(RANLIB) $@ + + $(libdir)/libmumps_common$(PLAT)$(LIBEXT_SHARED): $(OBJS_COMMON_MOD) $(OBJS_COMMON_OTHER) +- $(FC) $(OPTL) -shared $^ -Wl,$(SONAME),libmumps_common$(PLAT)$(LIBEXT_SHARED) -L$(libdir) $(RPATH_OPT) $(LORDERINGS) $(LIBS) $(LIBOTHERS) -o $@ ++ $(FC) $(OPTL) -shared $^ -Wl,$(SONAME)libmumps_common$(PLAT)$(LIBEXT_SHARED) -L$(libdir) $(RPATH_OPT) $(LORDERINGS) $(LIBS) $(LIBOTHERS) -o $@ + + $(libdir)/lib$(ARITH)mumps$(PLAT)$(LIBEXT): $(OBJS_MOD) $(OBJS_OTHER) + $(AR)$@ $?