comp-chem/NWChem
1
0
Fork 0
mirror of https://github.com/nwchemgit/nwchem.git synced 2026-07-28 14:15:30 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

remove INTERIX

Browse source
This commit is contained in:
Jeff Hammond 2018-08-10 10:23:43 -07:00
parent 64aee9051e
commit ce2ffc48bd
8 changed files with 6 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

6
contrib/distro-tools/build_nwchem
View file

@ -1743,12 +1743,6 @@ if [ ${#NWCHEM_OS} -eq 0 ] ; then
# There is no CYGNUS64 target so set NWCHEM_TARGET here
export NWCHEM_TARGET=${NWCHEM_OS}
fi
elif [ `expr match ${NWCHEM_OS} INTERIX` != "0" ] ; then
export NWCHEM_OS=INTERIX
if [ ${#NWCHEM_TARGET} -eq 0 ] ; then
# There is no INTERIX64 target so set NWCHEM_TARGET here
export NWCHEM_TARGET=${NWCHEM_OS}
fi
fi
fi
fi

2
contrib/distro-tools/build_nwchem_src_distro
View file

@ -54,8 +54,6 @@ if [ ${#NWCHEM_TARGET} -eq 0 ] ; then
export NWCHEM_TARGET=CYGWIN
elif [ `expr match ${NWCHEM_OS} CYGNUS` != "0" ] ; then
export NWCHEM_TARGET=CYGNUS
elif [ `expr match ${NWCHEM_OS} INTERIX` != "0" ] ; then
export NWCHEM_TARGET=INTERIX
else
export NWCHEM_TARGET=LINUX64
fi

2
src/config/makefile.h
View file

@ -1277,7 +1277,7 @@ endif
endif
ifeq ($(TARGET),$(findstring $(TARGET),LINUX CYGNUS CYGWIN INTERIX))
ifeq ($(TARGET),$(findstring $(TARGET),LINUX CYGNUS CYGWIN))
#
#
# Linux or Cygwin under Windows running on an x86 using g77

2
src/peigs/DEFS
View file

@ -614,7 +614,7 @@ peigs_FC += -DSTD_DBL -D$(peigs_COMM) -Ovector2
endif
endif
ifeq ($(peigs_TARGET),$(findstring $(peigs_TARGET),LINUX INTERIX CYGWIN CYGNUS))
ifeq ($(peigs_TARGET),$(findstring $(peigs_TARGET),LINUX CYGWIN CYGNUS))
#
# Linux running on an x86 using f77 on f2c
#

2
src/peigs/comm/GNUmakefile
View file

@ -3,7 +3,7 @@
#
include ../../config/makefile.h
include ../DEFS
NOCASENS = CYGNUS MACX64 MACX CYGWIN CYGWIN64 INTERIX
NOCASENS = CYGNUS MACX64 MACX CYGWIN CYGWIN64
ifneq ($(peigs_TARGET),$(findstring $(peigs_TARGET), $(NOCASENS)))
REMOVESF=TRUE
endif

2
src/peigs/src/f77/GNUmakefile
View file

@ -4,7 +4,7 @@
include ../../../config/makefile.h
include ../../DEFS
NOCASENS = CYGNUS MACX64 MACX CYGWIN CYGWIN64 INTERIX
NOCASENS = CYGNUS MACX64 MACX CYGWIN CYGWIN64
ifneq ($(peigs_TARGET),$(findstring $(peigs_TARGET), $(NOCASENS)))
REMOVESF=TRUE
endif

4
src/selci/cputm.c
View file

@ -24,11 +24,7 @@ int *ai;
#ifndef WIN32
/* !!! Comment out function for WIN32 just so we can keep going */
struct timeval tp;
#ifdef __INTERIX
char tzp[10];
#else
struct timezone tzp;
#endif
int i;
gettimeofday(&tp,&tzp);

9
src/util/GNUmakefile
View file

@ -104,12 +104,10 @@ ifdef NO_MPIF
LIB_DEFINES += -DNO_MPIF
endif
ifeq ($(TARGET),$(findstring $(TARGET),BGL BGP BGQ LINUX CYGWIN CYGWIN64 CYGNUS INTERIX LINUX64 MACX MACX64))
ifeq ($(TARGET),$(findstring $(TARGET),BGL BGP BGQ LINUX CYGWIN CYGWIN64 CYGNUS LINUX64 MACX MACX64))
EXTRA_OBJ = linux_cpu.o linux_shift.o linux_random.o erfc.o linux_printaff.o
ifeq ($(LINUXCPU),x86)
ifneq ($(TARGET),INTERIX)
EXTRA_OBJ += linux_setfpucw.o
endif
EXTRA_OBJ += linux_setfpucw.o
endif
LIB_DEFINES += -DBYTE_SHORT_PACKING
ifeq ($(FC),ifc)
@ -253,9 +251,6 @@ ifdef SPEECH
OBJ += udp.o
endif
ifeq ($(TARGET),INTERIX)
DEFINES += -DNOSOCKLEN
endif
ifeq ($(TARGET),LINUX)
DEFINES += -DNEED_LOC
endif