From 9a8a4852bc5211fd8b45b750ced545c162708c9e Mon Sep 17 00:00:00 2001 From: Mark Olesen Date: Fri, 7 Aug 2020 13:47:05 +0200 Subject: [PATCH] CONFIG: remove libz dependency for scotch (issue #55) - reduces ThirdParty inter-dependency. Only useful for reading in graph files, which are not used internally by OpenFOAM. - Was already removed for Mingw compilation. --- etc/makeFiles/scotch/Makefile.inc.OpenFOAM-Darwin.shlib | 4 ++-- etc/makeFiles/scotch/Makefile.inc.OpenFOAM-Linux.shlib | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/etc/makeFiles/scotch/Makefile.inc.OpenFOAM-Darwin.shlib b/etc/makeFiles/scotch/Makefile.inc.OpenFOAM-Darwin.shlib index 575c71d..75d75a2 100644 --- a/etc/makeFiles/scotch/Makefile.inc.OpenFOAM-Darwin.shlib +++ b/etc/makeFiles/scotch/Makefile.inc.OpenFOAM-Darwin.shlib @@ -29,7 +29,7 @@ CCS ?= $(CC) CCP ?= mpicc CCD = $(CCP) CFLAGS = $(WM_CFLAGS) -fPIC -O3 \ - -DCOMMON_FILE_COMPRESS_GZ \ + -UCOMMON_FILE_COMPRESS \ -DCOMMON_RANDOM_FIXED_SEED \ -DSCOTCH_DETERMINISTIC \ -DSCOTCH_RENAME \ @@ -41,7 +41,7 @@ CFLAGS += -DINTSIZE64 endif CLIBFLAGS = -LDFLAGS = $(WM_LDFLAGS) -lz -lm +LDFLAGS = $(WM_LDFLAGS) -lm MAKE = make CP = cp diff --git a/etc/makeFiles/scotch/Makefile.inc.OpenFOAM-Linux.shlib b/etc/makeFiles/scotch/Makefile.inc.OpenFOAM-Linux.shlib index c6ba241..6a3eef1 100644 --- a/etc/makeFiles/scotch/Makefile.inc.OpenFOAM-Linux.shlib +++ b/etc/makeFiles/scotch/Makefile.inc.OpenFOAM-Linux.shlib @@ -29,7 +29,7 @@ CCS ?= $(CC) CCP ?= mpicc CCD = $(CCP) CFLAGS = $(WM_CFLAGS) -fPIC -O3 \ - -DCOMMON_FILE_COMPRESS_GZ \ + -UCOMMON_FILE_COMPRESS \ -DCOMMON_RANDOM_FIXED_SEED \ -DSCOTCH_DETERMINISTIC \ -DSCOTCH_RENAME \ @@ -41,7 +41,7 @@ CFLAGS += -DINTSIZE64 endif CLIBFLAGS = -shared -LDFLAGS = -Xlinker --no-as-needed $(WM_LDFLAGS) -lz -lm -lrt +LDFLAGS = -Xlinker --no-as-needed $(WM_LDFLAGS) -lm -lrt MAKE = make CP = cp