Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
darshan
darshan
Commits
48fd8632
Commit
48fd8632
authored
Feb 10, 2016
by
Shane Snyder
Browse files
reorganize ld-opts and fix cray/fortran bug
parent
75bd3020
Changes
10
Hide whitespace changes
Inline
Side-by-side
darshan-runtime/Makefile.in
View file @
48fd8632
...
...
@@ -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
View file @
48fd8632
...
...
@@ -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
View file @
48fd8632
...
...
@@ -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
100644 → 0
View file @
75bd3020
--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
View file @
48fd8632
...
...
@@ -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
View file @
48fd8632
...
...
@@ -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
0 → 100644
View file @
48fd8632
--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
View file @
48fd8632
File moved
darshan-runtime/darshan-pnetcdf-ld-opts
→
darshan-runtime/
share/ld-opts/
darshan-pnetcdf-ld-opts
View file @
48fd8632
File moved
darshan-runtime/darshan-posix-ld-opts
→
darshan-runtime/
share/ld-opts/
darshan-posix-ld-opts
View file @
48fd8632
File moved
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment