From nobody Fri Oct 08 01:27:13 2021 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 06C4D12DD2B7; Fri, 8 Oct 2021 01:27:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4HQVst1Vqxz4c70; Fri, 8 Oct 2021 01:27:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 7A1201DCF6; Fri, 8 Oct 2021 01:27:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1981RDv5024478; Fri, 8 Oct 2021 01:27:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1981RD6S024477; Fri, 8 Oct 2021 01:27:13 GMT (envelope-from git) Date: Fri, 8 Oct 2021 01:27:13 GMT Message-Id: <202110080127.1981RD6S024477@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Piotr Kubaj Subject: git: 535243e68823 - main - science/dynare: fix build on non-amd64 64-bit architectures List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: pkubaj X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 535243e68823658e76d55c6120d11d6e1a8c2552 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by pkubaj: URL: https://cgit.FreeBSD.org/ports/commit/?id=535243e68823658e76d55c6120d11d6e1a8c2552 commit 535243e68823658e76d55c6120d11d6e1a8c2552 Author: Piotr Kubaj AuthorDate: 2021-10-08 01:25:19 +0000 Commit: Piotr Kubaj CommitDate: 2021-10-08 01:25:19 +0000 science/dynare: fix build on non-amd64 64-bit architectures The current Makefile checks only for amd64. Tested for no breakage on amd64. --- science/dynare/files/patch-Makefile.am | 20 ++++++++++++++++++++ science/dynare/files/patch-Makefile.in | 20 ++++++++++++++++++++ 2 files changed, 40 insertions(+) diff --git a/science/dynare/files/patch-Makefile.am b/science/dynare/files/patch-Makefile.am new file mode 100644 index 000000000000..e111480f3b87 --- /dev/null +++ b/science/dynare/files/patch-Makefile.am @@ -0,0 +1,20 @@ +--- Makefile.am.orig 2021-10-07 22:16:41 UTC ++++ Makefile.am +@@ -28,7 +28,7 @@ EXTRA_DIST = \ + .dir-locals.el + + all-local: preprocessor/src/dynare_m$(EXEEXT) +- if file preprocessor/src/dynare_m$(EXEEXT) | grep -q x86.64; then \ ++ if file preprocessor/src/dynare_m$(EXEEXT) | grep -q 64-bit; then \ + ARCH="64"; \ + else \ + ARCH="32"; \ +@@ -54,7 +54,7 @@ install-exec-local: + cp -r matlab $(DESTDIR)$(pkglibdir) + find $(DESTDIR)$(pkglibdir) -name LICENSE.md -delete + rm -rf $(DESTDIR)$(pkglibdir)/matlab/preprocessor* +- if file preprocessor/src/dynare_m | grep -q x86.64; then \ ++ if file preprocessor/src/dynare_m | grep -q 64-bit; then \ + ARCH="64"; \ + else \ + ARCH="32"; \ diff --git a/science/dynare/files/patch-Makefile.in b/science/dynare/files/patch-Makefile.in new file mode 100644 index 000000000000..1c019819f32d --- /dev/null +++ b/science/dynare/files/patch-Makefile.in @@ -0,0 +1,20 @@ +--- Makefile.in.orig 2021-10-07 22:16:41 UTC ++++ Makefile.in +@@ -28,7 +28,7 @@ EXTRA_DIST = \ + .dir-locals.el + + all-local: preprocessor/src/dynare_m$(EXEEXT) +- if file preprocessor/src/dynare_m$(EXEEXT) | grep -q x86.64; then \ ++ if file preprocessor/src/dynare_m$(EXEEXT) | grep -q 64-bit; then \ + ARCH="64"; \ + else \ + ARCH="32"; \ +@@ -54,7 +54,7 @@ install-exec-local: + cp -r matlab $(DESTDIR)$(pkglibdir) + find $(DESTDIR)$(pkglibdir) -name LICENSE.md -delete + rm -rf $(DESTDIR)$(pkglibdir)/matlab/preprocessor* +- if file preprocessor/src/dynare_m | grep -q x86.64; then \ ++ if file preprocessor/src/dynare_m | grep -q 64-bit; then \ + ARCH="64"; \ + else \ + ARCH="32"; \