Commit d23d9597 authored by Philip Carns's avatar Philip Carns
Browse files

revert hll dummy function changes


git-svn-id: https://svn.mcs.anl.gov/repos/darshan/trunk@722 3b7491f3-a168-0410-bf4b-c445ed680a29
parent 9661cfd4
...@@ -2,12 +2,6 @@ ...@@ -2,12 +2,6 @@
Darshan Release Change Log Darshan Release Change Log
-------------------------- --------------------------
darshan-2.2.7-pre1
=============
* made darshan libraries less sensitive to link order by adding dummy
implementations of hdf5 and pnetcdf functions that can be used when hdf5 and
pnetcdf libraries are not present
darshan-2.2.6 darshan-2.2.6
============= =============
* Bug fixes: * Bug fixes:
......
...@@ -48,18 +48,12 @@ lib/darshan-mpi-init-finalize.po: lib/darshan-mpi-init-finalize.c darshan.h dars ...@@ -48,18 +48,12 @@ lib/darshan-mpi-init-finalize.po: lib/darshan-mpi-init-finalize.c darshan.h dars
lib/darshan-pnetcdf.o: lib/darshan-pnetcdf.c darshan.h $(DARSHAN_LOG_FORMAT) | lib lib/darshan-pnetcdf.o: lib/darshan-pnetcdf.c darshan.h $(DARSHAN_LOG_FORMAT) | lib
$(CC) $(CFLAGS) -c $< -o $@ $(CC) $(CFLAGS) -c $< -o $@
lib/darshan-pnetcdf-dummy.o: lib/darshan-pnetcdf-dummy.c darshan.h $(DARSHAN_LOG_FORMAT) | lib
$(CC) $(CFLAGS) -c $< -o $@
lib/darshan-pnetcdf.po: lib/darshan-pnetcdf.c darshan.h $(DARSHAN_LOG_FORMAT) | lib lib/darshan-pnetcdf.po: lib/darshan-pnetcdf.c darshan.h $(DARSHAN_LOG_FORMAT) | lib
$(CC) $(CFLAGS_SHARED) -c $< -o $@ $(CC) $(CFLAGS_SHARED) -c $< -o $@
lib/darshan-hdf5.o: lib/darshan-hdf5.c darshan.h $(DARSHAN_LOG_FORMAT) | lib lib/darshan-hdf5.o: lib/darshan-hdf5.c darshan.h $(DARSHAN_LOG_FORMAT) | lib
$(CC) $(CFLAGS) -c $< -o $@ $(CC) $(CFLAGS) -c $< -o $@
lib/darshan-hdf5-dummy.o: lib/darshan-hdf5-dummy.c darshan.h $(DARSHAN_LOG_FORMAT) | lib
$(CC) $(CFLAGS) -c $< -o $@
lib/darshan-hdf5.po: lib/darshan-hdf5.c darshan.h $(DARSHAN_LOG_FORMAT) | lib lib/darshan-hdf5.po: lib/darshan-hdf5.c darshan.h $(DARSHAN_LOG_FORMAT) | lib
$(CC) $(CFLAGS_SHARED) -c $< -o $@ $(CC) $(CFLAGS_SHARED) -c $< -o $@
...@@ -84,7 +78,7 @@ lib/lookup8.po: lib/lookup8.c ...@@ -84,7 +78,7 @@ lib/lookup8.po: lib/lookup8.c
%.i: %.c %.i: %.c
$(CC) -E $(CFLAGS) -c $< -o $@ $(CC) -E $(CFLAGS) -c $< -o $@
lib/libdarshan-mpi-io.a: lib/darshan-mpi-io.o lib/darshan-mpi-init-finalize.o lib/darshan-pnetcdf.o lib/darshan-hdf5.o lib/darshan-hdf5-dummy.o lib/darshan-pnetcdf-dummy.o lib/libdarshan-mpi-io.a: lib/darshan-mpi-io.o lib/darshan-mpi-init-finalize.o lib/darshan-pnetcdf.o lib/darshan-hdf5.o
ar rcs $@ $^ ar rcs $@ $^
lib/libdarshan-posix.a: lib/darshan-posix.o lib/lookup3.o lib/lookup8.o lib/libdarshan-posix.a: lib/darshan-posix.o lib/lookup3.o lib/lookup8.o
......
#! /bin/sh #! /bin/sh
# Guess values for system-dependent variables and create Makefiles. # Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.69 for darshan-runtime 2.2.7-pre1. # Generated by GNU Autoconf 2.69 for darshan-runtime 2.2.6.
# #
# #
# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
...@@ -577,8 +577,8 @@ MAKEFLAGS= ...@@ -577,8 +577,8 @@ MAKEFLAGS=
# Identity of this package. # Identity of this package.
PACKAGE_NAME='darshan-runtime' PACKAGE_NAME='darshan-runtime'
PACKAGE_TARNAME='darshan-runtime' PACKAGE_TARNAME='darshan-runtime'
PACKAGE_VERSION='2.2.7-pre1' PACKAGE_VERSION='2.2.6'
PACKAGE_STRING='darshan-runtime 2.2.7-pre1' PACKAGE_STRING='darshan-runtime 2.2.6'
PACKAGE_BUGREPORT='' PACKAGE_BUGREPORT=''
PACKAGE_URL='' PACKAGE_URL=''
...@@ -1243,7 +1243,7 @@ if test "$ac_init_help" = "long"; then ...@@ -1243,7 +1243,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing. # Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh. # This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF cat <<_ACEOF
\`configure' configures darshan-runtime 2.2.7-pre1 to adapt to many kinds of systems. \`configure' configures darshan-runtime 2.2.6 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]... Usage: $0 [OPTION]... [VAR=VALUE]...
...@@ -1304,7 +1304,7 @@ fi ...@@ -1304,7 +1304,7 @@ fi
if test -n "$ac_init_help"; then if test -n "$ac_init_help"; then
case $ac_init_help in case $ac_init_help in
short | recursive ) echo "Configuration of darshan-runtime 2.2.7-pre1:";; short | recursive ) echo "Configuration of darshan-runtime 2.2.6:";;
esac esac
cat <<\_ACEOF cat <<\_ACEOF
...@@ -1408,7 +1408,7 @@ fi ...@@ -1408,7 +1408,7 @@ fi
test -n "$ac_init_help" && exit $ac_status test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then if $ac_init_version; then
cat <<\_ACEOF cat <<\_ACEOF
darshan-runtime configure 2.2.7-pre1 darshan-runtime configure 2.2.6
generated by GNU Autoconf 2.69 generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc. Copyright (C) 2012 Free Software Foundation, Inc.
...@@ -1760,7 +1760,7 @@ cat >config.log <<_ACEOF ...@@ -1760,7 +1760,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake. running configure, to aid debugging if configure makes a mistake.
It was created by darshan-runtime $as_me 2.2.7-pre1, which was It was created by darshan-runtime $as_me 2.2.6, which was
generated by GNU Autoconf 2.69. Invocation command line was generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@ $ $0 $@
...@@ -4227,7 +4227,7 @@ $as_echo "#define __D_MPI_REQUEST MPI_Request" >>confdefs.h ...@@ -4227,7 +4227,7 @@ $as_echo "#define __D_MPI_REQUEST MPI_Request" >>confdefs.h
fi fi
DARSHAN_VERSION="2.2.7-pre1" DARSHAN_VERSION="2.2.6"
...@@ -4745,7 +4745,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 ...@@ -4745,7 +4745,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their # report actual input values of CONFIG_FILES etc. instead of their
# values after options handling. # values after options handling.
ac_log=" ac_log="
This file was extended by darshan-runtime $as_me 2.2.7-pre1, which was This file was extended by darshan-runtime $as_me 2.2.6, which was
generated by GNU Autoconf 2.69. Invocation command line was generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES CONFIG_FILES = $CONFIG_FILES
...@@ -4807,7 +4807,7 @@ _ACEOF ...@@ -4807,7 +4807,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\ ac_cs_version="\\
darshan-runtime config.status 2.2.7-pre1 darshan-runtime config.status 2.2.6
configured by $0, generated by GNU Autoconf 2.69, configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\" with options \\"\$ac_cs_config\\"
......
...@@ -5,7 +5,7 @@ dnl Process this file with autoconf to produce a configure script. ...@@ -5,7 +5,7 @@ dnl Process this file with autoconf to produce a configure script.
dnl You may need to use autoheader as well if changing any DEFINEs dnl You may need to use autoheader as well if changing any DEFINEs
dnl sanity checks, output header, location of scripts used here dnl sanity checks, output header, location of scripts used here
AC_INIT([darshan-runtime], [2.2.7-pre1]) AC_INIT([darshan-runtime], [2.2.6])
AC_CONFIG_SRCDIR([darshan.h]) AC_CONFIG_SRCDIR([darshan.h])
AC_CONFIG_AUX_DIR(../maint/config) AC_CONFIG_AUX_DIR(../maint/config)
AC_CONFIG_HEADER(darshan-runtime-config.h) AC_CONFIG_HEADER(darshan-runtime-config.h)
......
/*
* (C) 2009 by Argonne National Laboratory.
* See COPYRIGHT in top-level directory.
*/
#include "darshan-runtime-config.h"
#include <stdio.h>
#include <pthread.h>
#include <string.h>
#include "mpi.h"
#include "darshan.h"
/* hope this doesn't change any time soon */
typedef int hid_t;
typedef int herr_t;
#ifndef DARSHAN_PRELOAD
hid_t __real_H5Fcreate(const char *filename, unsigned flags, hid_t create_plist, hid_t access_plist)
{
return -1;
}
hid_t __real_H5Fopen(const char *filename, unsigned flags, hid_t access_plist)
{
return -1;
}
herr_t __real_H5Fclose(hid_t file_id)
{
return -1;
}
#endif
/*
* Local variables:
* c-indent-level: 4
* c-basic-offset: 4
* End:
*
* vim: ts=8 sts=4 sw=4 expandtab
*/
/*
* (C) 2009 by Argonne National Laboratory.
* See COPYRIGHT in top-level directory.
*/
#include "darshan-runtime-config.h"
#include <stdio.h>
#include <pthread.h>
#include <string.h>
#include "mpi.h"
#include "darshan.h"
#ifndef DARSHAN_PRELOAD
int __real_ncmpi_create(MPI_Comm comm, const char *path, int cmode, MPI_Info info, int *ncidp)
{
return -1;
}
int __real_ncmpi_open(MPI_Comm comm, const char *path, int omode, MPI_Info info, int *ncidp)
{
return -1;
}
int __real_ncmpi_close(int ncid)
{
return -1;
}
#endif
/*
* Local variables:
* c-indent-level: 4
* c-basic-offset: 4
* End:
*
* vim: ts=8 sts=4 sw=4 expandtab
*/
#! /bin/sh #! /bin/sh
# Guess values for system-dependent variables and create Makefiles. # Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.69 for darshan-util 2.2.7-pre1. # Generated by GNU Autoconf 2.69 for darshan-util 2.2.6.
# #
# #
# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
...@@ -577,8 +577,8 @@ MAKEFLAGS= ...@@ -577,8 +577,8 @@ MAKEFLAGS=
# Identity of this package. # Identity of this package.
PACKAGE_NAME='darshan-util' PACKAGE_NAME='darshan-util'
PACKAGE_TARNAME='darshan-util' PACKAGE_TARNAME='darshan-util'
PACKAGE_VERSION='2.2.7-pre1' PACKAGE_VERSION='2.2.6'
PACKAGE_STRING='darshan-util 2.2.7-pre1' PACKAGE_STRING='darshan-util 2.2.6'
PACKAGE_BUGREPORT='' PACKAGE_BUGREPORT=''
PACKAGE_URL='' PACKAGE_URL=''
...@@ -1232,7 +1232,7 @@ if test "$ac_init_help" = "long"; then ...@@ -1232,7 +1232,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing. # Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh. # This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF cat <<_ACEOF
\`configure' configures darshan-util 2.2.7-pre1 to adapt to many kinds of systems. \`configure' configures darshan-util 2.2.6 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]... Usage: $0 [OPTION]... [VAR=VALUE]...
...@@ -1293,7 +1293,7 @@ fi ...@@ -1293,7 +1293,7 @@ fi
if test -n "$ac_init_help"; then if test -n "$ac_init_help"; then
case $ac_init_help in case $ac_init_help in
short | recursive ) echo "Configuration of darshan-util 2.2.7-pre1:";; short | recursive ) echo "Configuration of darshan-util 2.2.6:";;
esac esac
cat <<\_ACEOF cat <<\_ACEOF
...@@ -1383,7 +1383,7 @@ fi ...@@ -1383,7 +1383,7 @@ fi
test -n "$ac_init_help" && exit $ac_status test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then if $ac_init_version; then
cat <<\_ACEOF cat <<\_ACEOF
darshan-util configure 2.2.7-pre1 darshan-util configure 2.2.6
generated by GNU Autoconf 2.69 generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc. Copyright (C) 2012 Free Software Foundation, Inc.
...@@ -1748,7 +1748,7 @@ cat >config.log <<_ACEOF ...@@ -1748,7 +1748,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake. running configure, to aid debugging if configure makes a mistake.
It was created by darshan-util $as_me 2.2.7-pre1, which was It was created by darshan-util $as_me 2.2.6, which was
generated by GNU Autoconf 2.69. Invocation command line was generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@ $ $0 $@
...@@ -4605,7 +4605,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 ...@@ -4605,7 +4605,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their # report actual input values of CONFIG_FILES etc. instead of their
# values after options handling. # values after options handling.
ac_log=" ac_log="
This file was extended by darshan-util $as_me 2.2.7-pre1, which was This file was extended by darshan-util $as_me 2.2.6, which was
generated by GNU Autoconf 2.69. Invocation command line was generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES CONFIG_FILES = $CONFIG_FILES
...@@ -4667,7 +4667,7 @@ _ACEOF ...@@ -4667,7 +4667,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\ ac_cs_version="\\
darshan-util config.status 2.2.7-pre1 darshan-util config.status 2.2.6
configured by $0, generated by GNU Autoconf 2.69, configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\" with options \\"\$ac_cs_config\\"
......
...@@ -5,7 +5,7 @@ dnl Process this file with autoconf to produce a configure script. ...@@ -5,7 +5,7 @@ dnl Process this file with autoconf to produce a configure script.
dnl You may need to use autoheader as well if changing any DEFINEs dnl You may need to use autoheader as well if changing any DEFINEs
dnl sanity checks, output header, location of scripts used here dnl sanity checks, output header, location of scripts used here
AC_INIT([darshan-util], [2.2.7-pre1]) AC_INIT([darshan-util], [2.2.6])
AC_CONFIG_SRCDIR([darshan-logutils.h]) AC_CONFIG_SRCDIR([darshan-logutils.h])
AC_CONFIG_AUX_DIR(../maint/config) AC_CONFIG_AUX_DIR(../maint/config)
AC_CONFIG_HEADER(darshan-util-config.h) AC_CONFIG_HEADER(darshan-util-config.h)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment