Skip to content

Commit 069b1b5

Browse files
jwpetersonjwpeterson
authored
Merge pull request #4348 from hugary1995/h5_link_fix
Patch hdf5.m4 so that -lhdf5 comes later
2 parents eb5796f + 44bb154 commit 069b1b5

113 files changed

Lines changed: 124 additions & 6 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎Makefile.in‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7504,6 +7504,7 @@ HAVE_GCOV_TOOLS = @HAVE_GCOV_TOOLS@
75047504
HDF5_CFLAGS = @HDF5_CFLAGS@
75057505
HDF5_CPPFLAGS = @HDF5_CPPFLAGS@
75067506
HDF5_DIR = @HDF5_DIR@
7507+
HDF5_LDFLAGS = @HDF5_LDFLAGS@
75077508
HDF5_LIBS = @HDF5_LIBS@
75087509
HDF5_PREFIX = @HDF5_PREFIX@
75097510
INSTALL = @INSTALL@

‎configure‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -740,6 +740,7 @@ LIBMESH_ENABLE_HDF5_FALSE
740740
LIBMESH_ENABLE_HDF5_TRUE
741741
HDF5_PREFIX
742742
HDF5_LIBS
743+
HDF5_LDFLAGS
743744
HDF5_CPPFLAGS
744745
HDF5_CFLAGS
745746
HDF5_DIR
@@ -61207,14 +61208,15 @@ then :
6120761208
if test -d "${HDF5_PREFIX}/lib"
6120861209
then :
6120961210

61210-
HDF5_LIBS="-L${HDF5_PREFIX}/lib -lhdf5"
61211+
HDF5_LDFLAGS="-L${HDF5_PREFIX}/lib"
61212+
HDF5_LIBS="-lhdf5"
6121161213

6121261214
fi
6121361215

6121461216
if test "x$RPATHFLAG" != "x" && test -d "${HDF5_PREFIX}/lib"
6121561217
then :
6121661218

61217-
HDF5_LIBS="${HDF5_LIBS} ${RPATHFLAG}${HDF5_PREFIX}/lib"
61219+
HDF5_LDFLAGS="${HDF5_LDFLAGS} ${RPATHFLAG}${HDF5_PREFIX}/lib"
6121861220

6121961221
fi
6122061222

@@ -61230,7 +61232,8 @@ fi
6123061232

6123161233
CFLAGS="${HDF5_CPPFLAGS} ${CFLAGS}"
6123261234
CPPFLAGS="${HDF5_CPPFLAGS} ${CPPFLAGS}"
61233-
LDFLAGS="${HDF5_LIBS} ${LDFLAGS}"
61235+
LDFLAGS="${HDF5_LDFLAGS} ${LDFLAGS}"
61236+
LIBS="${HDF5_LIBS} ${LIBS}"
6123461237
ac_ext=c
6123561238
ac_cpp='$CPP $CPPFLAGS'
6123661239
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -61433,6 +61436,7 @@ printf "%s\n" "#define HAVE_HDF5 1" >>confdefs.h
6143361436

6143461437

6143561438

61439+
6143661440
;;
6143761441
esac
6143861442
fi

‎contrib/Makefile.in‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -601,6 +601,7 @@ HAVE_GCOV_TOOLS = @HAVE_GCOV_TOOLS@
601601
HDF5_CFLAGS = @HDF5_CFLAGS@
602602
HDF5_CPPFLAGS = @HDF5_CPPFLAGS@
603603
HDF5_DIR = @HDF5_DIR@
604+
HDF5_LDFLAGS = @HDF5_LDFLAGS@
604605
HDF5_LIBS = @HDF5_LIBS@
605606
HDF5_PREFIX = @HDF5_PREFIX@
606607
INSTALL = @INSTALL@

‎contrib/capnproto/Makefile.in‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -450,6 +450,7 @@ HAVE_GCOV_TOOLS = @HAVE_GCOV_TOOLS@
450450
HDF5_CFLAGS = @HDF5_CFLAGS@
451451
HDF5_CPPFLAGS = @HDF5_CPPFLAGS@
452452
HDF5_DIR = @HDF5_DIR@
453+
HDF5_LDFLAGS = @HDF5_LDFLAGS@
453454
HDF5_LIBS = @HDF5_LIBS@
454455
HDF5_PREFIX = @HDF5_PREFIX@
455456
INSTALL = @INSTALL@

‎contrib/eigen/gitshim/Makefile.in‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -334,6 +334,7 @@ HAVE_GCOV_TOOLS = @HAVE_GCOV_TOOLS@
334334
HDF5_CFLAGS = @HDF5_CFLAGS@
335335
HDF5_CPPFLAGS = @HDF5_CPPFLAGS@
336336
HDF5_DIR = @HDF5_DIR@
337+
HDF5_LDFLAGS = @HDF5_LDFLAGS@
337338
HDF5_LIBS = @HDF5_LIBS@
338339
HDF5_PREFIX = @HDF5_PREFIX@
339340
INSTALL = @INSTALL@

‎contrib/exodusii/5.22b/exodus/Makefile.in‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3317,6 +3317,7 @@ HAVE_GCOV_TOOLS = @HAVE_GCOV_TOOLS@
33173317
HDF5_CFLAGS = @HDF5_CFLAGS@
33183318
HDF5_CPPFLAGS = @HDF5_CPPFLAGS@
33193319
HDF5_DIR = @HDF5_DIR@
3320+
HDF5_LDFLAGS = @HDF5_LDFLAGS@
33203321
HDF5_LIBS = @HDF5_LIBS@
33213322
HDF5_PREFIX = @HDF5_PREFIX@
33223323
INSTALL = @INSTALL@

‎contrib/exodusii/5.22b/nemesis/Makefile.in‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -396,6 +396,7 @@ HAVE_GCOV_TOOLS = @HAVE_GCOV_TOOLS@
396396
HDF5_CFLAGS = @HDF5_CFLAGS@
397397
HDF5_CPPFLAGS = @HDF5_CPPFLAGS@
398398
HDF5_DIR = @HDF5_DIR@
399+
HDF5_LDFLAGS = @HDF5_LDFLAGS@
399400
HDF5_LIBS = @HDF5_LIBS@
400401
HDF5_PREFIX = @HDF5_PREFIX@
401402
INSTALL = @INSTALL@

‎contrib/exodusii/Lib/Makefile.in‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1952,6 +1952,7 @@ HAVE_GCOV_TOOLS = @HAVE_GCOV_TOOLS@
19521952
HDF5_CFLAGS = @HDF5_CFLAGS@
19531953
HDF5_CPPFLAGS = @HDF5_CPPFLAGS@
19541954
HDF5_DIR = @HDF5_DIR@
1955+
HDF5_LDFLAGS = @HDF5_LDFLAGS@
19551956
HDF5_LIBS = @HDF5_LIBS@
19561957
HDF5_PREFIX = @HDF5_PREFIX@
19571958
INSTALL = @INSTALL@

‎contrib/exodusii/v8.11/exodus/Makefile.in‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4245,6 +4245,7 @@ HAVE_GCOV_TOOLS = @HAVE_GCOV_TOOLS@
42454245
HDF5_CFLAGS = @HDF5_CFLAGS@
42464246
HDF5_CPPFLAGS = @HDF5_CPPFLAGS@
42474247
HDF5_DIR = @HDF5_DIR@
4248+
HDF5_LDFLAGS = @HDF5_LDFLAGS@
42484249
HDF5_LIBS = @HDF5_LIBS@
42494250
HDF5_PREFIX = @HDF5_PREFIX@
42504251
INSTALL = @INSTALL@

‎contrib/exodusii/v8.11/nemesis/Makefile.in‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -406,6 +406,7 @@ HAVE_GCOV_TOOLS = @HAVE_GCOV_TOOLS@
406406
HDF5_CFLAGS = @HDF5_CFLAGS@
407407
HDF5_CPPFLAGS = @HDF5_CPPFLAGS@
408408
HDF5_DIR = @HDF5_DIR@
409+
HDF5_LDFLAGS = @HDF5_LDFLAGS@
409410
HDF5_LIBS = @HDF5_LIBS@
410411
HDF5_PREFIX = @HDF5_PREFIX@
411412
INSTALL = @INSTALL@

0 commit comments

Comments
 (0)