[Darshan-commits] [Git][darshan/darshan][dev-modular] reorganize ld-opts and fix cray/fortran bug
Shane Snyder
xgitlab at cels.anl.gov
Wed Feb 10 11:25:06 CST 2016
Shane Snyder pushed to branch dev-modular at darshan / darshan
Commits:
48fd8632 by Shane Snyder at 2016-02-10T11:24:37-06:00
reorganize ld-opts and fix cray/fortran bug
- - - - -
10 changed files:
- darshan-runtime/Makefile.in
- darshan-runtime/configure
- darshan-runtime/configure.in
- − darshan-runtime/darshan-base-ld-opts.in
- darshan-runtime/darshan-config.in
- darshan-runtime/lib/pkgconfig/darshan-runtime.pc.in
- + darshan-runtime/share/ld-opts/darshan-base-ld-opts.in
- darshan-runtime/darshan-hdf5-ld-opts → darshan-runtime/share/ld-opts/darshan-hdf5-ld-opts
- darshan-runtime/darshan-pnetcdf-ld-opts → darshan-runtime/share/ld-opts/darshan-pnetcdf-ld-opts
- darshan-runtime/darshan-posix-ld-opts → darshan-runtime/share/ld-opts/darshan-posix-ld-opts
Changes:
=====================================
darshan-runtime/Makefile.in
=====================================
--- a/darshan-runtime/Makefile.in
+++ b/darshan-runtime/Makefile.in
@@ -152,10 +152,11 @@ endif
install -m 755 share/mpi-profile/darshan-bg-cc.conf $(datarootdir)/mpi-profile/darshan-bg-cc.conf
install -m 755 share/mpi-profile/darshan-bg-cxx.conf $(datarootdir)/mpi-profile/darshan-bg-cxx.conf
install -m 755 share/mpi-profile/darshan-bg-f.conf $(datarootdir)/mpi-profile/darshan-bg-f.conf
- install -m 644 darshan-base-ld-opts $(datarootdir)/darshan-base-ld-opts
- install -m 644 $(srcdir)/darshan-posix-ld-opts $(datarootdir)/darshan-posix-ld-opts
- install -m 644 $(srcdir)/darshan-hdf5-ld-opts $(datarootdir)/darshan-hdf5-ld-opts
- install -m 644 $(srcdir)/darshan-pnetcdf-ld-opts $(datarootdir)/darshan-pnetcdf-ld-opts
+ install -d $(datarootdir)/ld-opts
+ install -m 644 share/ld-opts/darshan-base-ld-opts $(datarootdir)/ld-opts/darshan-base-ld-opts
+ install -m 644 share/ld-opts/darshan-posix-ld-opts $(datarootdir)/ld-opts/darshan-posix-ld-opts
+ install -m 644 share/ld-opts/darshan-hdf5-ld-opts $(datarootdir)/ld-opts/darshan-hdf5-ld-opts
+ install -m 644 share/ld-opts/darshan-pnetcdf-ld-opts $(datarootdir)/ld-opts/darshan-pnetcdf-ld-opts
install -d $(libdir)/pkgconfig
install -m 644 lib/pkgconfig/darshan-runtime.pc $(libdir)/pkgconfig/darshan-runtime.pc
=====================================
darshan-runtime/configure
=====================================
--- a/darshan-runtime/configure
+++ b/darshan-runtime/configure
@@ -4309,7 +4309,7 @@ DARSHAN_VERSION="3.0.0-pre3"
-ac_config_files="$ac_config_files Makefile darshan-mk-log-dirs.pl darshan-gen-cc.pl darshan-gen-cxx.pl darshan-gen-fortran.pl darshan-base-ld-opts darshan-config share/craype-1.x/darshan-module share/craype-2.x/darshan-module lib/pkgconfig/darshan-runtime.pc share/mpi-profile/darshan-cc.conf share/mpi-profile/darshan-cxx.conf share/mpi-profile/darshan-f.conf share/mpi-profile/darshan-bg-cc.conf share/mpi-profile/darshan-bg-cxx.conf share/mpi-profile/darshan-bg-f.conf"
+ac_config_files="$ac_config_files Makefile darshan-mk-log-dirs.pl darshan-gen-cc.pl darshan-gen-cxx.pl darshan-gen-fortran.pl darshan-config share/craype-1.x/darshan-module share/craype-2.x/darshan-module lib/pkgconfig/darshan-runtime.pc share/mpi-profile/darshan-cc.conf share/mpi-profile/darshan-cxx.conf share/mpi-profile/darshan-f.conf share/mpi-profile/darshan-bg-cc.conf share/mpi-profile/darshan-bg-cxx.conf share/mpi-profile/darshan-bg-f.conf share/ld-opts/darshan-base-ld-opts"
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
@@ -5008,7 +5008,6 @@ do
"darshan-gen-cc.pl") CONFIG_FILES="$CONFIG_FILES darshan-gen-cc.pl" ;;
"darshan-gen-cxx.pl") CONFIG_FILES="$CONFIG_FILES darshan-gen-cxx.pl" ;;
"darshan-gen-fortran.pl") CONFIG_FILES="$CONFIG_FILES darshan-gen-fortran.pl" ;;
- "darshan-base-ld-opts") CONFIG_FILES="$CONFIG_FILES darshan-base-ld-opts" ;;
"darshan-config") CONFIG_FILES="$CONFIG_FILES darshan-config" ;;
"share/craype-1.x/darshan-module") CONFIG_FILES="$CONFIG_FILES share/craype-1.x/darshan-module" ;;
"share/craype-2.x/darshan-module") CONFIG_FILES="$CONFIG_FILES share/craype-2.x/darshan-module" ;;
@@ -5019,6 +5018,7 @@ do
"share/mpi-profile/darshan-bg-cc.conf") CONFIG_FILES="$CONFIG_FILES share/mpi-profile/darshan-bg-cc.conf" ;;
"share/mpi-profile/darshan-bg-cxx.conf") CONFIG_FILES="$CONFIG_FILES share/mpi-profile/darshan-bg-cxx.conf" ;;
"share/mpi-profile/darshan-bg-f.conf") CONFIG_FILES="$CONFIG_FILES share/mpi-profile/darshan-bg-f.conf" ;;
+ "share/ld-opts/darshan-base-ld-opts") CONFIG_FILES="$CONFIG_FILES share/ld-opts/darshan-base-ld-opts" ;;
*) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
esac
=====================================
darshan-runtime/configure.in
=====================================
--- a/darshan-runtime/configure.in
+++ b/darshan-runtime/configure.in
@@ -325,7 +325,6 @@ darshan-mk-log-dirs.pl
darshan-gen-cc.pl
darshan-gen-cxx.pl
darshan-gen-fortran.pl
-darshan-base-ld-opts
darshan-config
share/craype-1.x/darshan-module
share/craype-2.x/darshan-module
@@ -336,4 +335,5 @@ share/mpi-profile/darshan-f.conf
share/mpi-profile/darshan-bg-cc.conf
share/mpi-profile/darshan-bg-cxx.conf
share/mpi-profile/darshan-bg-f.conf
+share/ld-opts/darshan-base-ld-opts
)
=====================================
darshan-runtime/darshan-base-ld-opts.in deleted
=====================================
--- a/darshan-runtime/darshan-base-ld-opts.in
+++ /dev/null
@@ -1,5 +0,0 @@
---undefined=MPI_Init
---undefined=MPI_Wtime
-@@darshan_share_path@/darshan-posix-ld-opts
-@@darshan_share_path@/darshan-hdf5-ld-opts
-@@darshan_share_path@/darshan-pnetcdf-ld-opts
=====================================
darshan-runtime/darshan-config.in
=====================================
--- a/darshan-runtime/darshan-config.in
+++ b/darshan-runtime/darshan-config.in
@@ -11,7 +11,7 @@ DARSHAN_LD_FLAGS="@LDFLAGS@"
# dependencies on PnetCDF and HDF5 symbols (if the app used a library which
# in turn used one of those HLLs).
-PRE_LD_FLAGS="-L$DARSHAN_LIB_PATH $DARSHAN_LD_FLAGS -ldarshan -lz -Wl,@$DARSHAN_SHARE_PATH/darshan-base-ld-opts"
+PRE_LD_FLAGS="-L$DARSHAN_LIB_PATH $DARSHAN_LD_FLAGS -ldarshan -lz -Wl,@$DARSHAN_SHARE_PATH/ld-opts/darshan-base-ld-opts"
POST_LD_FLAGS="-L$DARSHAN_LIB_PATH -ldarshan -lz -lrt -lpthread"
usage="\
=====================================
darshan-runtime/lib/pkgconfig/darshan-runtime.pc.in
=====================================
--- a/darshan-runtime/lib/pkgconfig/darshan-runtime.pc.in
+++ b/darshan-runtime/lib/pkgconfig/darshan-runtime.pc.in
@@ -12,7 +12,7 @@ darshan_prefix=@prefix@
darshan_share=@darshan_share_path@
darshan_includedir=
darshan_libdir= -L${darshan_prefix}/lib
-darshan_linkopts="-Wl,@${darshan_share}/darshan-base-ld-opts"
+darshan_linkopts="-Wl,@${darshan_share}/ld-opts/darshan-base-ld-opts"
Cflags:
Libs:
=====================================
darshan-runtime/share/ld-opts/darshan-base-ld-opts.in
=====================================
--- /dev/null
+++ b/darshan-runtime/share/ld-opts/darshan-base-ld-opts.in
@@ -0,0 +1,5 @@
+--undefined=MPI_Init
+--undefined=MPI_Wtime
+@@darshan_share_path@/ld-opts/darshan-posix-ld-opts
+@@darshan_share_path@/ld-opts/darshan-hdf5-ld-opts
+@@darshan_share_path@/ld-opts/darshan-pnetcdf-ld-opts
=====================================
darshan-runtime/darshan-hdf5-ld-opts → darshan-runtime/share/ld-opts/darshan-hdf5-ld-opts
=====================================
--- a/darshan-runtime/darshan-hdf5-ld-opts
+++ b/darshan-runtime/share/ld-opts/darshan-hdf5-ld-opts
=====================================
darshan-runtime/darshan-pnetcdf-ld-opts → darshan-runtime/share/ld-opts/darshan-pnetcdf-ld-opts
=====================================
--- a/darshan-runtime/darshan-pnetcdf-ld-opts
+++ b/darshan-runtime/share/ld-opts/darshan-pnetcdf-ld-opts
=====================================
darshan-runtime/darshan-posix-ld-opts → darshan-runtime/share/ld-opts/darshan-posix-ld-opts
=====================================
--- a/darshan-runtime/darshan-posix-ld-opts
+++ b/darshan-runtime/share/ld-opts/darshan-posix-ld-opts
View it on GitLab: https://xgitlab.cels.anl.gov/darshan/darshan/commit/48fd8632c311a5a57d92e50b000377f871928737
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.mcs.anl.gov/pipermail/darshan-commits/attachments/20160210/19a8821d/attachment.html>
More information about the Darshan-commits
mailing list