Skip to content

Commit

Permalink
update builds for 5.6.2
Browse files Browse the repository at this point in the history
- make allshared, remove shared-build patches
- handle soname on mac
  • Loading branch information
minrk committed Dec 12, 2023
1 parent b4d98da commit b4dfb24
Show file tree
Hide file tree
Showing 6 changed files with 25 additions and 12 deletions.
2 changes: 1 addition & 1 deletion recipe/Makefile.conda.PAR
Original file line number Diff line number Diff line change
Expand Up @@ -61,5 +61,5 @@ OPTC = -O
#End Optimized options

INCS = $(INCPAR)
LIBS = $(LIBPAR)
LIBS = $(LIBPAR) $(LIBBLAS)
LIBSEQNEEDED =
2 changes: 1 addition & 1 deletion recipe/Makefile.conda.SEQ
Original file line number Diff line number Diff line change
Expand Up @@ -62,5 +62,5 @@ OPTL = -O
OPTC = -O
#End Optimized options
INCS = $(INCSEQ)
LIBS = $(LIBSEQ)
LIBS = $(LIBSEQ) $(LIBBLAS)
LIBSEQNEEDED = libseqneeded
8 changes: 5 additions & 3 deletions recipe/build-mpi.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
8 changes: 5 additions & 3 deletions recipe/build-seq.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
6 changes: 2 additions & 4 deletions recipe/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
11 changes: 11 additions & 0 deletions recipe/sonamecomma.patch
Original file line number Diff line number Diff line change
@@ -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)$@ $?

0 comments on commit b4dfb24

Please sign in to comment.