Windows scotch decomposition build fix

This commit is contained in:
Hrvoje Jasak 2015-09-18 11:59:39 +01:00
parent 094e842fc0
commit e40207b6b5
2 changed files with 4 additions and 3 deletions

View file

@ -151,13 +151,14 @@ build_library() {
system) system)
cd $INSTALL_DIR cd $INSTALL_DIR
patch system patch $PACKAGE
;; ;;
pthreads-w32-2-9-1-release) pthreads-w32-2-9-1-release)
download $PACKAGE.zip ftp://sourceware.org/pub/pthreads-win32/pthreads-w32-2-9-1-release.zip > $LOG_FILE 2>&1 download $PACKAGE.zip ftp://sourceware.org/pub/pthreads-win32/pthreads-w32-2-9-1-release.zip > $LOG_FILE 2>&1
unzip_dir $PACKAGE >> $LOG_FILE 2>&1 unzip_dir $PACKAGE >> $LOG_FILE 2>&1
patch $PACKAGE patch $PACKAGE
mv $PACKAGE $INSTALL_DIR
;; ;;
metis-5.1.0) metis-5.1.0)
@ -222,7 +223,7 @@ build_library() {
;; ;;
scotch_6.0.4) scotch_6.0.4)
export PTHREADS_HOME=$BUILD_DIR/pthreads-w32-2-9-1-release export PTHREADS_HOME=$INSTALL_DIR/pthreads-w32-2-9-1-release
download $PACKAGE.tar.gz https://gforge.inria.fr/frs/download.php/34618 > $LOG_FILE 2>&1 download $PACKAGE.tar.gz https://gforge.inria.fr/frs/download.php/34618 > $LOG_FILE 2>&1
extract "$PACKAGE.tar.gz" gzip >> $LOG_FILE 2>&1 extract "$PACKAGE.tar.gz" gzip >> $LOG_FILE 2>&1
patch $PACKAGE patch $PACKAGE

View file

@ -46,7 +46,7 @@ LDFLAGS += -L$(MPI_ROOTDIR)/bin -lm -lmpi -lmpid
#PTHREAD_ROOTDIR = $(PGMFILES)/pthread-win32 #PTHREAD_ROOTDIR = $(PGMFILES)/pthread-win32
#CFLAGS_INC += -I$(PTHREAD_ROOTDIR)/include #CFLAGS_INC += -I$(PTHREAD_ROOTDIR)/include
#CLIBFLAGS = #CLIBFLAGS =
LDFLAGS += -L$(PTHREADS_HOME)/Pre-built.2/lib/x64 -lpthread LDFLAGS += -L$(PTHREADS_HOME)/Pre-built.2/lib/x64 -lpthreadGC2
#--- zlib: Uncomment for compressed files #--- zlib: Uncomment for compressed files
#ZLIB_ROOTDIR = $(PGMFILES)/zlib-1.2.3 #ZLIB_ROOTDIR = $(PGMFILES)/zlib-1.2.3