From patchwork Thu May 4 08:04:53 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: reza X-Patchwork-Id: 49780 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 7DD7D27BBE9; Thu, 4 May 2023 09:07:22 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,PDS_BAD_THREAD_QP_64,RCVD_IN_MSPIKE_H2, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id A3E2527BBEC for ; Thu, 4 May 2023 09:07:15 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1puTyd-0007sX-IH; Thu, 04 May 2023 04:06:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1puTyV-0007re-87 for guix-patches@gnu.org; Thu, 04 May 2023 04:06:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1puTyU-0007rh-R9 for guix-patches@gnu.org; Thu, 04 May 2023 04:06:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1puTyU-0000FK-JG for guix-patches@gnu.org; Thu, 04 May 2023 04:06:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#62473] [PATCH v3 2/4] gnu: utfcpp: Update to 3.2.3. Resent-From: reza Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 04 May 2023 08:06:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 62473 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 62473@debbugs.gnu.org <62473@debbugs.gnu.org> Cc: reza Received: via spool by 62473-submit@debbugs.gnu.org id=B62473.1683187507831 (code B ref 62473); Thu, 04 May 2023 08:06:02 +0000 Received: (at 62473) by debbugs.gnu.org; 4 May 2023 08:05:07 +0000 Received: from localhost ([127.0.0.1]:48384 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1puTxa-0000DL-Q8 for submit@debbugs.gnu.org; Thu, 04 May 2023 04:05:07 -0400 Received: from a2-4.smtp-out.eu-west-1.amazonses.com ([54.240.2.4]:40607) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <01020187e5cae983-f60ddab8-ce12-47ac-a996-173359880e77-000000@mail.housseini.me>) id 1puTxY-0000CI-M1 for 62473@debbugs.gnu.org; Thu, 04 May 2023 04:05:06 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/simple; s=solmzk3ljecfoypi3q6x2mqs3bucnhjw; d=housseini.me; t=1683187493; h=Subject:From:To:Cc:Date:Mime-Version:Content-Type:Content-Transfer-Encoding:In-Reply-To:References:Message-Id; bh=wefS4YhUcykYN7sJLEOu2Kd7gS2noOCuwdKii/BWrnQ=; b=VRuBdE6KDtxSMyYd0ZFsC098FQfjuTFi41Fp3wAfyNJGKrBOKA/GYG1VU1U0cKEx atOPt6HmdoFjVXMr9hG2GBFUfnPoxuizW9RKy4jxP9rL05HKJCoMuAHTEOx8HNA3PGL WiPgRZ+T8z108CQWpMOohnFYZcjGXJQcPuDR33qI= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/simple; s=shh3fegwg5fppqsuzphvschd53n6ihuv; d=amazonses.com; t=1683187493; h=Subject:From:To:Cc:Date:Mime-Version:Content-Type:Content-Transfer-Encoding:In-Reply-To:References:Message-Id:Feedback-ID; bh=wefS4YhUcykYN7sJLEOu2Kd7gS2noOCuwdKii/BWrnQ=; b=TnGosXHEErMV7YDs1j9oMVK/D7YNSU8GrjpOW0SOMJoaytaQkuNvPCqm9BtQNGlO 9hCE4XsE6v1iJfI42Rq/6KzUzr+QaiXpaPXuLuXZnBM7iXVO+qie3iyOYmcplMYQtnH xzaau+ueX/AkMHxTIiOVfDWWryfVQE74ozgSDfqE= Date: Thu, 4 May 2023 08:04:53 +0000 Mime-Version: 1.0 In-Reply-To: References: <2b6a4965ceb4f835b949e4d9a03f51b0facf54f9.1683187409.git.reza@housseini.me> X-Mailer: Amazon WorkMail Thread-Index: AQHZfl8YhuiJ8xHPRs2VCThywNL+UQAAAKel Thread-Topic: [PATCH v3 2/4] gnu: utfcpp: Update to 3.2.3. X-Wm-Sent-Timestamp: 1683187492 X-Original-Mailer: git-send-email 2.39.2 Message-ID: <01020187e5cae983-f60ddab8-ce12-47ac-a996-173359880e77-000000@eu-west-1.amazonses.com> Feedback-ID: 1.eu-west-1.b24dn6frgCi6dh20skzbuMRr7UL8M6Soir/3ogtEjHQ=:AmazonSES X-SES-Outgoing: 2023.05.04-54.240.2.4 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: reza X-ACL-Warn: , reza via Guix-patches X-Patchwork-Original-From: reza via Guix-patches via From: reza Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/textutils.scm (utfcpp): Update to 3.2.3. --- gnu/packages/textutils.scm | 35 +++++++++++++++++++---------------- 1 file changed, 19 insertions(+), 16 deletions(-) -- 2.39.2 diff --git a/gnu/packages/textutils.scm b/gnu/packages/textutils.scm index d7cb217e17..40a5c01242 100644 --- a/gnu/packages/textutils.scm +++ b/gnu/packages/textutils.scm @@ -25,6 +25,7 @@ ;;; Copyright © 2021 Felix Gruber ;;; Copyright © 2021 Bonface Munyoki Kilyungi ;;; Copyright © 2022 Gabriel Wicki +;;; Copyright © 2023 Reza Housseini ;;; ;;; This file is part of GNU Guix. ;;; @@ -57,6 +58,7 @@ (define-module (gnu packages textutils) #:use-module (gnu packages) #:use-module (gnu packages autotools) #:use-module (gnu packages base) + #:use-module (gnu packages check) #:use-module (gnu packages compression) #:use-module (gnu packages gcc) #:use-module (gnu packages golang) @@ -685,30 +687,31 @@ (define-public catdoc (define-public utfcpp (package (name "utfcpp") - (version "2.3.5") + (version "3.2.3") (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/nemtrif/utfcpp") - (commit (string-append "v" version)))) + (url "https://github.com/nemtrif/utfcpp") + (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 (base32 - "1gr98d826z6wa58r1s5i7rz7q2x3r31v7zj0pjjlrc7gfxwklr4s")))) + "00hzh39iddbc6nxg13813qd6d55g2kccwjf5dr96wykfhway9wbr")) + (modules '((guix build utils))) + (snippet '(begin + ;; delete bundled dependencies + (delete-file-recursively "extern") + (substitute* (list "tests/apitests.cpp" + "tests/noexceptionstests.cpp" + "tests/test_cpp11.cpp" + "tests/test_cpp17.cpp") + (("\"\\.\\./extern/ftest/ftest.h\"") + "")))))) (build-system cmake-build-system) + (native-inputs (list ftest)) (arguments - `(#:out-of-source? #f - #:phases - (modify-phases %standard-phases - (replace 'install ; no install target - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (include (string-append out "/include")) - (doc (string-append out "/share/doc/" ,name))) - (copy-recursively "source" include) - (install-file "README.md" doc) - #t)))))) - (home-page "https://github.com/nemtrif/utfcpp") + `(#:build-type "Release")) + (home-page "https://utfcpp.sourceforge.net") (synopsis "Portable C++ library for handling UTF-8") (description "UTF8-CPP is a C++ library for handling UTF-8 encoded text in a portable way.") From patchwork Thu May 4 08:04:56 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: reza X-Patchwork-Id: 49778 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 452AA27BBE9; Thu, 4 May 2023 09:07:12 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 700E027BBE2 for ; Thu, 4 May 2023 09:07:07 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1puTyh-0007tp-0M; Thu, 04 May 2023 04:06:15 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1puTyV-0007rf-El for guix-patches@gnu.org; Thu, 04 May 2023 04:06:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1puTyV-0007rn-3U for guix-patches@gnu.org; Thu, 04 May 2023 04:06:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1puTyU-0000FR-Uz for guix-patches@gnu.org; Thu, 04 May 2023 04:06:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#62473] [PATCH v3 3/4] gnu: Add openfoam-org. Deprecate openfoam. Resent-From: reza Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 04 May 2023 08:06:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 62473 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 62473@debbugs.gnu.org <62473@debbugs.gnu.org> Cc: reza Received: via spool by 62473-submit@debbugs.gnu.org id=B62473.1683187513856 (code B ref 62473); Thu, 04 May 2023 08:06:02 +0000 Received: (at 62473) by debbugs.gnu.org; 4 May 2023 08:05:13 +0000 Received: from localhost ([127.0.0.1]:48388 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1puTxf-0000Di-B1 for submit@debbugs.gnu.org; Thu, 04 May 2023 04:05:12 -0400 Received: from a51-79.smtp-out.eu-west-1.amazonses.com ([54.240.51.79]:45511) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <01020187e5caf4cb-b0cd88aa-8fd4-4a3a-9982-01df7133fbe2-000000@mail.housseini.me>) id 1puTxb-0000Ch-BN for 62473@debbugs.gnu.org; Thu, 04 May 2023 04:05:09 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/simple; s=solmzk3ljecfoypi3q6x2mqs3bucnhjw; d=housseini.me; t=1683187496; h=Subject:From:To:Cc:Date:Mime-Version:Content-Type:Content-Transfer-Encoding:In-Reply-To:References:Message-Id; bh=d5ALCPfZAZoQwOMjyjRAiFVGsuXt8E3hyAPQSQNrw7Q=; b=Z1roXXFC2LC1vHpM+T3FGK+TYKytRZjU92Cx8Ws/3+JECDzLpsWSpKOslK9KttFM HCSs7fd4g3XCAcvzY/rO5zf3DCyBspk2uxjTYbWe2ezMJOqpELz12Tp2b3SeJALQB9I gPD8rYz2WN9leRhKhuAkZnblJKfr6VvlNbSUueF4= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/simple; s=shh3fegwg5fppqsuzphvschd53n6ihuv; d=amazonses.com; t=1683187496; h=Subject:From:To:Cc:Date:Mime-Version:Content-Type:Content-Transfer-Encoding:In-Reply-To:References:Message-Id:Feedback-ID; bh=d5ALCPfZAZoQwOMjyjRAiFVGsuXt8E3hyAPQSQNrw7Q=; b=G2iXSFzskps8HVWHH9qeCsMEp54KN74vOfPOsIbPH/pWY/18J8E0Lzf6V98lWA+1 wCcbwOT2UprVrtqCpyNmlX/ZbVeUoc78I2FX3OO9rCBoIxY/oeO4579xFxhJDcqfejO pBZPEHTNOuk+4rvH3sPaMdbZLWaGy9/pBOaDQzRo= Date: Thu, 4 May 2023 08:04:56 +0000 Mime-Version: 1.0 In-Reply-To: References: X-Mailer: Amazon WorkMail Thread-Index: AQHZfl8YhuiJ8xHPRs2VCThywNL+UQAAARHg Thread-Topic: [PATCH v3 3/4] gnu: Add openfoam-org. Deprecate openfoam. X-Wm-Sent-Timestamp: 1683187495 X-Original-Mailer: git-send-email 2.39.2 Message-ID: <01020187e5caf4cb-b0cd88aa-8fd4-4a3a-9982-01df7133fbe2-000000@eu-west-1.amazonses.com> Feedback-ID: 1.eu-west-1.b24dn6frgCi6dh20skzbuMRr7UL8M6Soir/3ogtEjHQ=:AmazonSES X-SES-Outgoing: 2023.05.04-54.240.51.79 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: reza X-ACL-Warn: , reza via Guix-patches X-Patchwork-Original-From: reza via Guix-patches via From: reza Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/local.mk: Remove mention of openfoam patch file. * gnu/packages/patches/openfoam-4.1-cleanup.patch: Delete file. * gnu/packages/simulation.scm (openfoam-org): New variable. * gnu/packages/simulation.scm (openfoam): Deprecate variable. --- gnu/local.mk | 1 - .../patches/openfoam-4.1-cleanup.patch | 243 ----------- gnu/packages/simulation.scm | 405 ++++++++++++------ 3 files changed, 265 insertions(+), 384 deletions(-) delete mode 100644 gnu/packages/patches/openfoam-4.1-cleanup.patch -- 2.39.2 diff --git a/gnu/local.mk b/gnu/local.mk index 4305bee89c..c262f6cb85 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1635,7 +1635,6 @@ dist_patch_DATA = \ %D%/packages/patches/openboardview-use-system-mpc.patch \ %D%/packages/patches/openbox-python3.patch \ %D%/packages/patches/opencolorio-fix-build-with-gcc11.patch \ - %D%/packages/patches/openfoam-4.1-cleanup.patch \ %D%/packages/patches/openjdk-9-pointer-comparison.patch \ %D%/packages/patches/openjdk-9-setsignalhandler.patch \ %D%/packages/patches/openjdk-10-idlj-reproducibility.patch \ diff --git a/gnu/packages/patches/openfoam-4.1-cleanup.patch b/gnu/packages/patches/openfoam-4.1-cleanup.patch deleted file mode 100644 index 37effa5c9c..0000000000 --- a/gnu/packages/patches/openfoam-4.1-cleanup.patch +++ /dev/null @@ -1,243 +0,0 @@ -# This patch removes all need for the ThirdParty files of OpenFOAM. - -# Derived from EasyBuild patch by Ward Poelmans . -# Modified for GNU Guix by Paul Garlick . - -diff -ur OpenFOAM-4.x-version-4.1.org/applications/utilities/mesh/manipulation/setSet/Allwmake OpenFOAM-4.x-version-4.1/applications/utilities/mesh/manipulation/setSet/Allwmake ---- OpenFOAM-4.x-version-4.1.org/applications/utilities/mesh/manipulation/setSet/Allwmake -+++ OpenFOAM-4.x-version-4.1/applications/utilities/mesh/manipulation/setSet/Allwmake -@@ -9,7 +9,7 @@ - # - # use readline if available - # --if [ -f /usr/include/readline/readline.h ] -+if true - then - echo "Found -- enabling readline support." - export COMP_FLAGS="-DHAS_READLINE" -diff -ur OpenFOAM-4.x-version-4.1.org/etc/bashrc OpenFOAM-4.x-version-4.1/etc/bashrc ---- OpenFOAM-4.x-version-4.1.org/etc/bashrc -+++ OpenFOAM-4.x-version-4.1/etc/bashrc -@@ -43,8 +43,10 @@ - # Please set to the appropriate path if the default is not correct. - # - [ $BASH_SOURCE ] && \ --export FOAM_INST_DIR=$(cd ${BASH_SOURCE%/*/*/*} && pwd -P) || \ -+export FOAM_INST_DIR=$(cd $(dirname $BASH_SOURCE)/../.. && pwd -P) || \ - export FOAM_INST_DIR=$HOME/$WM_PROJECT -+# For GNU Guix: set initially for build then re-set at runtime -+# - # export FOAM_INST_DIR=~$WM_PROJECT - # export FOAM_INST_DIR=/opt/$WM_PROJECT - # export FOAM_INST_DIR=/usr/local/$WM_PROJECT -diff -ur OpenFOAM-4.x-version-4.1.org/etc/config.sh/CGAL OpenFOAM-4.x-version-4.1/etc/config.sh/CGAL ---- OpenFOAM-4.x-version-4.1.org/etc/config.sh/CGAL -+++ OpenFOAM-4.x-version-4.1/etc/config.sh/CGAL -@@ -36,37 +36,7 @@ - # - #------------------------------------------------------------------------------ - --boost_version=boost-system --cgal_version=cgal-system --#cgal_version=CGAL-4.8 -- --if [ -z "$SOURCE_CGAL_VERSIONS_ONLY" ] --then -- -- common_path=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER -- -- export BOOST_ARCH_PATH=$common_path/$boost_version -- export CGAL_ARCH_PATH=$common_path/$cgal_version -- -- if [ "$FOAM_VERBOSE" -a "$PS1" ] -- then -- echo "Using CGAL and boost" 1>&2 -- echo " $cgal_version at $CGAL_ARCH_PATH" 1>&2 -- echo " $boost_version at $BOOST_ARCH_PATH" 1>&2 -- fi -- -- if [ -d "$CGAL_ARCH_PATH" -a "$cgal_version" != "cgal-system" ] -- then -- _foamAddLib $CGAL_ARCH_PATH/lib -- fi -- -- if [ -d "$BOOST_ARCH_PATH" -a "$boost_version" != "boost-system" ] -- then -- _foamAddLib $BOOST_ARCH_PATH/lib -- fi -- -- unset boost_version cgal_version common_path -- --fi -+export CGAL_ARCH_PATH=$CGAL_ROOT -+export BOOST_ARCH_PATH=$BOOST_ROOT - - #------------------------------------------------------------------------------ -diff -ur OpenFOAM-4.x-version-4.1.org/etc/config.sh/gperftools OpenFOAM-4.x-version-4.1/etc/config.sh/gperftools ---- OpenFOAM-4.x-version-4.1.org/etc/config.sh/gperftools -+++ OpenFOAM-4.x-version-4.1/etc/config.sh/gperftools -@@ -29,13 +29,5 @@ - # - #------------------------------------------------------------------------------ - --version=svn --gperftools_install=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER -- --GPERFTOOLS_VERSION=gperftools-$version --GPERFTOOLS_ARCH_PATH=$gperftools_install/$GPERFTOOLS_VERSION -- --export PATH=$GPERFTOOLS_ARCH_PATH/bin:$PATH --export LD_LIBRARY_PATH=$GPERFTOOLS_ARCH_PATH/lib:$LD_LIBRARY_PATH - - #------------------------------------------------------------------------------ -diff -ur OpenFOAM-4.x-version-4.1.org/etc/config.sh/metis OpenFOAM-4.x-version-4.1/etc/config.sh/metis ---- OpenFOAM-4.x-version-4.1.org/etc/config.sh/metis -+++ OpenFOAM-4.x-version-4.1/etc/config.sh/metis -@@ -34,7 +34,7 @@ - # - #------------------------------------------------------------------------------ - --export METIS_VERSION=metis-5.1.0 --export METIS_ARCH_PATH=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER$WM_PRECISION_OPTION$WM_LABEL_OPTION/$METIS_VERSION -+export METIS_VERSION=metis-$METISVERSION -+export METIS_ARCH_PATH=$METIS_ROOT - - #------------------------------------------------------------------------------ -diff -ur OpenFOAM-4.x-version-4.1.org/etc/config.sh/scotch OpenFOAM-4.x-version-4.1/etc/config.sh/scotch ---- OpenFOAM-4.x-version-4.1.org/etc/config.sh/scotch -+++ OpenFOAM-4.x-version-4.1/etc/config.sh/scotch -@@ -37,7 +37,7 @@ - # - #------------------------------------------------------------------------------ - --export SCOTCH_VERSION=scotch_6.0.3 --export SCOTCH_ARCH_PATH=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER$WM_PRECISION_OPTION$WM_LABEL_OPTION/$SCOTCH_VERSION -+export SCOTCH_VERSION=scotch_$SCOTCHVERSION -+export SCOTCH_ARCH_PATH=$SCOTCH_ROOT - - #------------------------------------------------------------------------------ -diff -ur OpenFOAM-4.x-version-4.1.org/etc/config.sh/settings OpenFOAM-4.x-version-4.1/etc/config.sh/settings ---- OpenFOAM-4.x-version-4.1.org/etc/config.sh/settings -+++ OpenFOAM-4.x-version-4.1/etc/config.sh/settings -@@ -279,6 +279,9 @@ - ;; - system) - # Use system compiler -+ # Use system GMP and MPFR packages -+ export GMP_ARCH_PATH=$GMP_ROOT -+ export MPFR_ARCH_PATH=$MPFR_ROOT - ;; - *) - echo "Warn: WM_COMPILER_TYPE='$WM_COMPILER_TYPE' is unsupported" 1>&2 -diff -ur OpenFOAM-4.x-version-4.1.org/src/parallel/decompose/ptscotchDecomp/Make/options OpenFOAM-4.x-version-4.1/src/parallel/decompose/ptscotchDecomp/Make/options ---- OpenFOAM-4.x-version-4.1.org/src/parallel/decompose/ptscotchDecomp/Make/options -+++ OpenFOAM-4.x-version-4.1/src/parallel/decompose/ptscotchDecomp/Make/options -@@ -5,8 +5,7 @@ - $(PFLAGS) $(PINC) \ - -I$(SCOTCH_ROOT)/include \ - -I$(SCOTCH_ARCH_PATH)/include/$(FOAM_MPI) \ -- -I/usr/include/scotch \ - -I../decompositionMethods/lnInclude - - LIB_LIBS = \ -- -L$(SCOTCH_ROOT)/lib -L$(FOAM_EXT_LIBBIN)/$(FOAM_MPI) -lptscotch -lptscotcherrexit -lscotch ${LINK_FLAGS} -lrt -+ -L$(SCOTCH_ROOT)/lib -L$(MPI_ARCH_PATH)/lib -lptscotch -lptscotcherrexit -lscotch ${LINK_FLAGS} -lrt -diff -ur OpenFOAM-4.x-version-4.1.org/src/parallel/decompose/scotchDecomp/Make/options OpenFOAM-4.x-version-4.1/src/parallel/decompose/scotchDecomp/Make/options ---- OpenFOAM-4.x-version-4.1.org/src/parallel/decompose/scotchDecomp/Make/options -+++ OpenFOAM-4.x-version-4.1/src/parallel/decompose/scotchDecomp/Make/options -@@ -9,8 +9,7 @@ - $(PFLAGS) $(PINC) \ - -I$(SCOTCH_ROOT)/include \ - -I$(SCOTCH_ARCH_PATH)/include \ -- -I/usr/include/scotch \ - -I../decompositionMethods/lnInclude - - LIB_LIBS = \ -- -L$(SCOTCH_ROOT)/lib -L$(FOAM_EXT_LIBBIN) -lscotch -lscotcherrexit -lrt -+ -L$(SCOTCH_ROOT)/lib -lscotch -lscotcherrexit -lrt -diff -ur OpenFOAM-4.x-version-4.1.org/wmake/makefiles/general OpenFOAM-4.x-version-4.1/wmake/makefiles/general ---- OpenFOAM-4.x-version-4.1.org/wmake/makefiles/general -+++ OpenFOAM-4.x-version-4.1/wmake/makefiles/general -@@ -33,7 +33,6 @@ - # The Makefile uses a POSIX shell - #------------------------------------------------------------------------------ - --SHELL = /bin/sh - - - #------------------------------------------------------------------------------ -diff -ur OpenFOAM-4.x-version-4.1.org/wmake/wmake OpenFOAM-4.x-version-4.1/wmake/wmake ---- OpenFOAM-4.x-version-4.1.org/wmake/wmake -+++ OpenFOAM-4.x-version-4.1/wmake/wmake -@@ -163,7 +163,7 @@ - then - if [ "$WM_NCOMPPROCS" -gt 1 -a ! "$MAKEFLAGS" ] - then -- lockDir=$HOME/.$WM_PROJECT/.wmake -+ lockDir=$(cd $(dirname $BASH_SOURCE)/../.. && pwd -P)/.$WM_PROJECT/.wmake - - if [ -d $lockDir ] - then -diff -ur OpenFOAM-4.x-version-4.1.org/wmake/wmakeScheduler OpenFOAM-4.x-version-4.1/wmake/wmakeScheduler ---- OpenFOAM-4.x-version-4.1.org/wmake/wmakeScheduler -+++ OpenFOAM-4.x-version-4.1/wmake/wmakeScheduler -@@ -53,7 +53,7 @@ - # csh sets HOST, bash sets HOSTNAME - : ${HOST:=$HOSTNAME} - --lockDir=$HOME/.$WM_PROJECT/.wmake -+lockDir=$(cd $(dirname $BASH_SOURCE)/../.. && pwd -P)/.$WM_PROJECT/.wmake - - # Fallback - 1 core on current host - : ${WM_HOSTS:=$HOST:1} -diff -ur OpenFOAM-4.x-version-4.1.org/wmake/wmakeSchedulerUptime OpenFOAM-4.x-version-4.1/wmake/wmakeSchedulerUptime ---- OpenFOAM-4.x-version-4.1.org/wmake/wmakeSchedulerUptime -+++ OpenFOAM-4.x-version-4.1/wmake/wmakeSchedulerUptime -@@ -53,7 +53,7 @@ - # csh sets HOST, bash sets HOSTNAME - : ${HOST:=$HOSTNAME} - --lockDir=$HOME/.$WM_PROJECT/.wmake -+lockDir=$(cd $(dirname $BASH_SOURCE)/../.. && pwd -P)/.$WM_PROJECT/.wmake - # Fallback - 1 core on current host - : ${WM_HOSTS:=$HOST:1} - -diff -ur OpenFOAM-4.x-version-4.1.org/src/parallel/decompose/metisDecomp/metisDecomp.C OpenFOAM-4.x-version-4.1/src/parallel/decompose/metisDecomp/metisDecomp.C ---- OpenFOAM-4.x-version-4.1.org/src/parallel/decompose/metisDecomp/metisDecomp.C -+++ OpenFOAM-4.x-version-4.1/src/parallel/decompose/metisDecomp/metisDecomp.C -@@ -67,7 +67,7 @@ - - // Processor weights initialised with no size, only used if specified in - // a file -- Field processorWeights; -+ Field processorWeights; - - // Cell weights (so on the vertices of the dual) - List