From nobody Mon May 8 08:27:45 2023 X-Original-To: dev-commits-ports-branches@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 4QFDtp5Ydsz49ZCp; Mon, 8 May 2023 08:27:46 +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 4QFDtp177lz3pHl; Mon, 8 May 2023 08:27:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683534466; 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=5iBOQeVntkCUU8wvildbrv+5DSuIJXtOC3zrW+j09b4=; b=YkNU0Th4IjTr143ZPFkV+VdMcfddzEAmkvrMO+VBa9h7u26UbrLGi3X2YFWLxSPaO1l1jN UovO+xb+qMNBg54wN+FGsdwU2teO1A5aH2C4A7kBgJc7CDdLdueqAj6QUkR9HTAyS7m2Ok 73qEFkRfx3u4TBlFHLdirjonRdv+vAYH6IFkjgkou7ufIwuCghreCBzZvYBpe6HmRJ6mfD EHArj6xqtJYI3RSactqFkTDQkqETBNfKsF+Bv8fSxDqDRM6CaoGWztHgOiMxkRW/SEOqu3 7LJmcq7XSxSQ9c3/2jvLhMJwcK833l0HvXfY2vyDglaFo5y5IOpACedzp2Qvbw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683534466; 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=5iBOQeVntkCUU8wvildbrv+5DSuIJXtOC3zrW+j09b4=; b=x1eZt8zdw3s1x+DNNAAVd+CPtyu/04wUBjk0TP0TcjgoJtJYfcFiV0C3i/ti8rSRlX+jJm 6XVnqlyQEyClELA3ltWM8Wbdf/r5ODUfyyoZmDENTi8IJjszNRplyAR4gkjfokUc5eZVHO POFNi+htL0/H16dZSRAI4kvgiHcBJJtqRb7V4D+4Dh9aio5kpOGjCwtIH8MxsGThQ6qtjc aLnp4uRsppxfc3t+YG172ZRqvmxzSk8Whtiq3yhzGr6JwohSQ79ew2Z5NYCSF1zPFbvgdI kxoTWRtdDs5BddZUwk7ICg/yWanTRWbBdHrANCDr6KjN/NqY+/qWKQnltnONHA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683534466; a=rsa-sha256; cv=none; b=d/17lKa82psueDmkTiukQT6RI9WGpgXcwF7z7+/N9RNxoMDQaNbM6Gmb0GM4ggIh6UnglT W6f1kh3pdnJ2YHG8peCHyhJVJUJ/mjV+gii4AVwRSg75bKkGusOhbgHLHEixlDx5R93qy6 yUH+Y9eKfpRExZnvMN7boY2C7LmAm5LFJCUnrCA95KkktlbzsA28Gv2swGuNgPnNpZ4dIs a7nj415+CUAGJNSa2gXnTAWNlz9JxX1p65g7kTsiVYse2vsk5pA4bIZB6xuhwhnRvRwgxs rlyslndRzgObndmMZhuFgVGWqz0O5ZKtIRMWbMUDoEziQQY/FzyskUfxtBZ3Lg== 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 4QFDtn6vJ5zt6l; Mon, 8 May 2023 08:27:45 +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 3488RjjE051709; Mon, 8 May 2023 08:27:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3488RjXv051708; Mon, 8 May 2023 08:27:45 GMT (envelope-from git) Date: Mon, 8 May 2023 08:27:45 GMT Message-Id: <202305080827.3488RjXv051708@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Robert Clausecker Subject: git: 4b5a6fc56419 - 2023Q2 - biology/phyml: fix build on non-x86 List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@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/2023Q2 X-Git-Reftype: branch X-Git-Commit: 4b5a6fc564197e1f786469375317dd06884fa1f0 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2023Q2 has been updated by fuz: URL: https://cgit.FreeBSD.org/ports/commit/?id=4b5a6fc564197e1f786469375317dd06884fa1f0 commit 4b5a6fc564197e1f786469375317dd06884fa1f0 Author: Robert Clausecker AuthorDate: 2023-05-07 20:57:10 +0000 Commit: Robert Clausecker CommitDate: 2023-05-08 08:27:29 +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 (cherry picked from commit 8e2ec289a2d8891c9bd3c549319baa9c94cfda27) --- 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