From nobody Mon May 8 08:26:48 2023 X-Original-To: dev-commits-ports-main@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 4QFDsh61ZWz49ZGM; Mon, 8 May 2023 08:26:48 +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 4QFDsh588dz3nN9; Mon, 8 May 2023 08:26:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683534408; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rWMRfi2ewMvlTeRjwfzYY2WpvdhqW4jgsS3UKASUft8=; b=D+BrBGy7ii/9WlEAzjpXlPCgVF1ASwlg3wX5c0zURW3qf7zCmdZ9mrhlloC2iG4D6qM3/x Yl8LEah0F7Frf6+U/fOmi0EqQkC+4/XHoAOb87iYGlcIQrHIe7USS2i1nwfl5sXECtBjBY B9iis5ptpSXMy7WEdqx3aAU758OnzksZwIef3xZUnYbsLy1fROgQwTQG9Ev+YhZeba2Adk ckSdEY7fEvT5UjFEqh7i2tTsP2+OmoDKl3kxsR26zf0YTNWtHSQbDdA9gVggu/S3BL5xvp ekoUxclvxJ2Be0It+hsConCVSpX/e3yF4pJR/mPIFoaOfnSqCosL8D7UNqe5Ug== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683534408; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rWMRfi2ewMvlTeRjwfzYY2WpvdhqW4jgsS3UKASUft8=; b=Ddr4lotgj/Ac4LcKpXDLYu2g0Ydt/ePRrSvMAQgqVDIye4c6PZXD3EnV7CBcYTulICv+7m PrCUo6IlDNKuyp/4flZyLmOZuybgq0v68SeFiV/95+lMYKRHoX3DWRhoyOaKFpgswm6Uzl xYJ7GWA/vFhEw5psb/MKwM9XY1GRxJ0Eb8v8nB3PzzofJ5icNqZoTvn7FQFPpJNl6wzSV2 /YFkhTME2FnBve5v/i76ykEgUL7IXlUbOgOoknuQKX+YOWlIbOYXFmkif2j6Lidd1B7EMe 2hMZeRLv5vlNr3ur9E2755pp/qPYOphcJBRy5PXSii0D3PaWf5Ag4ctRVeJRAQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683534408; a=rsa-sha256; cv=none; b=kUF8kNy272A+SlV9ECJbjREdZuqHbi5jgUAwjOIg3JgfbruPaBKf/asLoN8S9CARtpr1g7 ByR5W7Iq7w4ddSeQpRMagz54cvDlABBlNsOX7Tge/biREn4P/fbYwDMiOsdUsJ+XJWKwpG TJkJ2c0u0PTYLGhl4yu4l6y8LZGI/jG2t1QuONxqKUxYK/dVa6X3sRuDLnkHa5cRvb9kKF APMhCg5leaNFlDcyViDXPgUmjI+vravwIGs2k9LUr4NQTBvTIFVXFyg3pFHxZWuacwmhhA 2zz9rqXvzK7hfbaZBb4nXUSxDIID/J+2zIVjh3r+tkHhUlGrMjrw2oun6nG/Vg== 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 4QFDsh4BByztLf; Mon, 8 May 2023 08:26:48 +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 3488QmHD051126; Mon, 8 May 2023 08:26:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3488QmfP051125; Mon, 8 May 2023 08:26:48 GMT (envelope-from git) Date: Mon, 8 May 2023 08:26:48 GMT Message-Id: <202305080826.3488QmfP051125@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Robert Clausecker Subject: git: 8e2ec289a2d8 - main - biology/phyml: fix build on non-x86 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fuz X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8e2ec289a2d8891c9bd3c549319baa9c94cfda27 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/ports/commit/?id=8e2ec289a2d8891c9bd3c549319baa9c94cfda27 commit 8e2ec289a2d8891c9bd3c549319baa9c94cfda27 Author: Robert Clausecker AuthorDate: 2023-05-07 20:57:10 +0000 Commit: Robert Clausecker CommitDate: 2023-05-08 08:25:50 +0000 biology/phyml: fix build on non-x86 - only initialise x86-only fields on x86. - make code compatible with platforms where char is unsigned Obtained from: https://github.com/stephaneguindon/phyml/commit/9c55b683c875fb9923e7cb2a1092596f72040882 MFH: 2023Q2 --- biology/phyml/Makefile | 4 +-- biology/phyml/files/patch-src_io.c | 41 ++++++++++++++++++++++++++++ biology/phyml/files/patch-src_utilities.c | 44 +++++++++++++++++++++++++++++++ biology/phyml/files/patch-src_utilities.h | 13 +++++++++ 4 files changed, 100 insertions(+), 2 deletions(-) diff --git a/biology/phyml/Makefile b/biology/phyml/Makefile index fc4d36b518b9..b5feff3eaae3 100644 --- a/biology/phyml/Makefile +++ b/biology/phyml/Makefile @@ -1,6 +1,7 @@ PORTNAME= phyml DISTVERSIONPREFIX= v DISTVERSION= 3.3.20220408 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= biology @@ -42,11 +43,10 @@ CONFIGURE_ARGS+= --disable-mpi BIN_SUFFIX= # none .endif -post-patch: .if ${ARCH} != amd64 && ${ARCH} != i386 +post-patch: @${REINPLACE_CMD} -e 's|VECTOR_FLAG=-march=native|dnl &|' ${WRKSRC}/configure.ac .endif - @${REINPLACE_CMD} -e 's|malloc.h|stdlib.h|' ${WRKSRC}/src/utilities.h post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} diff --git a/biology/phyml/files/patch-src_io.c b/biology/phyml/files/patch-src_io.c new file mode 100644 index 000000000000..6085f3541ebe --- /dev/null +++ b/biology/phyml/files/patch-src_io.c @@ -0,0 +1,41 @@ +--- src/io.c.orig 2023-05-07 20:50:29 UTC ++++ src/io.c +@@ -1157,7 +1157,7 @@ void Get_Nexus_Data(FILE *fp, option *io) + + int Get_Token(FILE *fp, char *token) + { +- char c; ++ int c; + + c = ' '; + +@@ -1518,7 +1518,8 @@ align **Read_Seq_Interleaved(option *io) + + int Read_One_Line_Seq(align ***data, int num_otu, FILE *in) + { +- char c = ' '; ++ char c_; ++ int c = ' '; + int nchar = 0; + + while(1) +@@ -1552,7 +1553,9 @@ int Read_One_Line_Seq(align ***data, int num_otu, FILE + } + + nchar++; +- Uppercase(&c); ++ c_ = c; ++ Uppercase(&c_); ++ c = c_; + + if(c == '.') + { +@@ -1617,7 +1620,7 @@ char *Return_Tree_String_Phylip(FILE *fp_input_tree) + { + char *line; + int i; +- char c; ++ int c; + int open,maxopen; + + if(fp_input_tree == NULL) diff --git a/biology/phyml/files/patch-src_utilities.c b/biology/phyml/files/patch-src_utilities.c new file mode 100644 index 000000000000..2f95b278dd6a --- /dev/null +++ b/biology/phyml/files/patch-src_utilities.c @@ -0,0 +1,44 @@ +--- src/utilities.c.orig 2022-04-08 15:01:10 UTC ++++ src/utilities.c +@@ -3209,18 +3209,20 @@ void Bootstrap(t_tree *tree) + boot_tree->io->print_json_trace = NO; + boot_tree->n_root = NULL; + boot_tree->e_root = NULL; ++ boot_tree->l_ev = tree->l_ev; ++ boot_tree->p_lk_left_pi = tree->p_lk_left_pi; ++ ++#if (defined(__AVX__) || defined(__AVX2__) || defined(__SSE__) || defined(__SSE2__) || defined(__SSE3__)) + boot_tree->_tPij1 = tree->_tPij1; + boot_tree->_tPij2 = tree->_tPij2; + boot_tree->_pmat1plk1 = tree->_pmat1plk1; + boot_tree->_pmat2plk2 = tree->_pmat2plk2; + boot_tree->_plk0 = tree->_plk0; +- boot_tree->l_ev = tree->l_ev; +- boot_tree->p_lk_left_pi = tree->p_lk_left_pi; + boot_tree->_l_ev = tree->_l_ev; + boot_tree->_r_ev = tree->_r_ev; + boot_tree->_prod_left = tree->_prod_left; + boot_tree->_prod_rght = tree->_prod_rght; +- ++#endif + + Set_Both_Sides(YES,boot_tree); + +@@ -8902,7 +8904,7 @@ t_edge *Find_Root_Edge(FILE *fp_input_tree, t_tree *tr + int l_r, r_l; + int score; + char *line; +- char c; ++ int c; + t_edge *root_edge; + + line = (char *)mCalloc(T_MAX_LINE,sizeof(char)); +@@ -9206,7 +9208,7 @@ void Translate_Tax_Names(char **tax_names, t_tree *tre + void Skip_Comment(FILE *fp) + { + int in_comment; +- char c; ++ int c; + + in_comment = 1; + do diff --git a/biology/phyml/files/patch-src_utilities.h b/biology/phyml/files/patch-src_utilities.h new file mode 100644 index 000000000000..6edbbcb01460 --- /dev/null +++ b/biology/phyml/files/patch-src_utilities.h @@ -0,0 +1,13 @@ +--- src/utilities.h.orig 2022-04-08 15:01:10 UTC ++++ src/utilities.h +@@ -31,8 +31,8 @@ the GNU public licence. See http://www.opensource.org + #include + #include + #include +-/* #include */ +-/* #include */ ++/* #include */ ++/* #include */ + + #if (defined(__AVX__) || defined(__AVX2__)) + #include