From 2eae92a35b1bd8e43aad1ba14ea522e18e3c114f Mon Sep 17 00:00:00 2001 From: Phil Carns Date: Sun, 22 Feb 2015 09:51:58 -0500 Subject: [PATCH] mv pkgconfig link options to Libs.private - this ensures that link-time instrumentation is only added to static executables in Cray environments. Reported by Kalyana Chadalavada. --- ChangeLog | 2 ++ darshan-runtime/lib/pkgconfig/darshan-runtime.pc.in | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index fa9950b..5c76d9c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -32,6 +32,8 @@ darshan-2.3.1-pre2 * update darshan-gen-fortran.pl and darshan-gen-cxx.pl to support new library naming conventions in MPICH 3.1.1 and higher * update documentation to reflect known issues with some versions of MPICH +* modify darshan-runtime so that link-time instrumentation options are only used + when statically linking via Libs.private. (reported by Kalyana Chadalavada) darshan-2.3.0 ============= diff --git a/darshan-runtime/lib/pkgconfig/darshan-runtime.pc.in b/darshan-runtime/lib/pkgconfig/darshan-runtime.pc.in index 204cafd..55c2e92 100644 --- a/darshan-runtime/lib/pkgconfig/darshan-runtime.pc.in +++ b/darshan-runtime/lib/pkgconfig/darshan-runtime.pc.in @@ -14,5 +14,5 @@ darshan_libdir= -L${darshan_prefix}/lib darshan_linkopts="-Wl,-u,MPI_Init,-u,MPI_Wtime,-u,__wrap_H5Fcreate,-u,__wrap_ncmpi_create,-wrap,write,-wrap,open,-wrap,creat,-wrap,creat64,-wrap,open64,-wrap,close,-wrap,read,-wrap,lseek,-wrap,lseek64,-wrap,pread,-wrap,pwrite,-wrap,readv,-wrap,writev,-wrap,__xstat,-wrap,__lxstat,-wrap,__fxstat,-wrap,__xstat64,-wrap,__lxstat64,-wrap,__fxstat64,-wrap,mmap,-wrap,mmap64,-wrap,fopen,-wrap,fclose,-wrap,fread,-wrap,fwrite,-wrap,fseek,-wrap,fopen64,-wrap,pread64,-wrap,pwrite64,-wrap,fsync,-wrap,fdatasync,-wrap,ncmpi_create,-wrap,ncmpi_open,-wrap,ncmpi_close,-wrap,H5Fcreate,-wrap,H5Fopen,-wrap,H5Fclose,-wrap,aio_write,-wrap,aio_write64,-wrap,aio_read,-wrap,aio_read64,-wrap,lio_listio,-wrap,lio_listio64,-wrap,aio_return,-wrap,aio_return64,-wrap,mkstemp,-wrap,mkostemp,-wrap,mkstemps,-wrap,mkostemps" Cflags: -Libs: ${darshan_linkopts} ${darshan_libdir} -lfmpich -lmpichcxx -Wl,--start-group -ldarshan-mpi-io -ldarshan-posix -ldarshan-stubs -Wl,--end-group -Libs.private: +Libs: +Libs.private: ${darshan_linkopts} ${darshan_libdir} -lfmpich -lmpichcxx -Wl,--start-group -ldarshan-mpi-io -ldarshan-posix -ldarshan-stubs -Wl,--end-group -- 2.26.2