From e40207b6b506d12113e87d982ac509ba0a79be99 Mon Sep 17 00:00:00 2001 From: Hrvoje Jasak Date: Fri, 18 Sep 2015 11:59:39 +0100 Subject: [PATCH] Windows scotch decomposition build fix --- ThirdParty/mingwBuild/build.sh | 5 +++-- .../mingwBuild/x64/patches/scotch_6.0.4/src/Makefile.inc | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/ThirdParty/mingwBuild/build.sh b/ThirdParty/mingwBuild/build.sh index a10de7bf9..d095c5443 100644 --- a/ThirdParty/mingwBuild/build.sh +++ b/ThirdParty/mingwBuild/build.sh @@ -151,13 +151,14 @@ build_library() { system) cd $INSTALL_DIR - patch system + patch $PACKAGE ;; 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 unzip_dir $PACKAGE >> $LOG_FILE 2>&1 patch $PACKAGE + mv $PACKAGE $INSTALL_DIR ;; metis-5.1.0) @@ -222,7 +223,7 @@ build_library() { ;; 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 extract "$PACKAGE.tar.gz" gzip >> $LOG_FILE 2>&1 patch $PACKAGE diff --git a/ThirdParty/mingwBuild/x64/patches/scotch_6.0.4/src/Makefile.inc b/ThirdParty/mingwBuild/x64/patches/scotch_6.0.4/src/Makefile.inc index 69c4c02c0..bfb7e1ca4 100644 --- a/ThirdParty/mingwBuild/x64/patches/scotch_6.0.4/src/Makefile.inc +++ b/ThirdParty/mingwBuild/x64/patches/scotch_6.0.4/src/Makefile.inc @@ -46,7 +46,7 @@ LDFLAGS += -L$(MPI_ROOTDIR)/bin -lm -lmpi -lmpid #PTHREAD_ROOTDIR = $(PGMFILES)/pthread-win32 #CFLAGS_INC += -I$(PTHREAD_ROOTDIR)/include #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_ROOTDIR = $(PGMFILES)/zlib-1.2.3