From nobody Tue Apr 18 21:55:56 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 4Q1HmX72k0z45kdQ; Tue, 18 Apr 2023 21:55:56 +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 4Q1HmX5fStz4JtW; Tue, 18 Apr 2023 21:55:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681854956; 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=9wJHP3wkqPFCeiMOPEtpxYeM2mXRJpLHl5u2A4otol0=; b=TwhfAy4M9m1nJQ/+8hEmUJ1axzvL87DMa0zL+p47/aThLvpXSoZRn6/qOqOlqZs+ge7vo0 0mt39WZQ+TLpZNOwrZpdlB3xPtWJXBfGCP4yoDtShzoRxsbGPO6kA4bLOVUapoweLYLxoG vFw2RZIyBOGjXssmYr95irb3KMvC9/BvBfUcEkXudzaeNDQ0XiTHKbUNwvze+xOm1l0NaY Jyxq1J4NkwAt72Dt2VvgSTf9dO+G5gH3chO78IMjLlgQQ9L80wYdjJgtyZ/LyU6ebTHlub 2PoaTXJuW2YY4Hj9lF3Xxa09aN/mte0dqYo69xxINd35xs2R6fz/m8d7UXklSA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681854956; 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=9wJHP3wkqPFCeiMOPEtpxYeM2mXRJpLHl5u2A4otol0=; b=QKUF+FfYPohkai/Q9KFgUTyzpN/NBFhnwVl3MjmlsA37TQY51jbzvUKhBavoqXOrafyat1 meg8wekPfJ4RbhawwwAV6evmgDgLCtpZ9/XOeiTGXi1xQJ3t2J3aR7XCr/dFHn/tFA8ePs ukWTZtnPOmkMpuIQbIKYfaKTyln51iD+UuIyWqskerSUyD41SxfkHaaI8UIypqLCko+Bw8 h6MbHrjmpBHWEgNh/L9++wh6c6xevmH2NZriCXyg74blAIb7Y+1W4u4pL1126g8oQIuvpn M1jVyJUr7iwllb51+wt94ObxQ07aSfgO628imjnDLtGbhdN5C4JzxgOY9eMXYg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681854956; a=rsa-sha256; cv=none; b=ZpRuwa5YCqKd+6RRb476YLiZf0zXuPq1JiPSRUVzqD0gDR+XRR0u64J/uT4J4L1OLZ6ecs TFAsEx/UTHIcjZVaPqITGp1wlt79g5WRfJVVv3clRCZhhV8VAN2Ntf73xRDnBCzfQnOU37 HXCQK8pyyV0R6WiVXqqkOrQtq2T9CCT0qj7vZudWAFWTmwi+xvi42FM5Zu7h9UDGBtEk2b aSnx55Ca+E1RLWIDRU/RF/mcLny6Zf4wujdD6Cb+9rNSLmD+J94uYTJJPy3WotLyCKdWVW 0B9KgBnuE5KW0xH6EFh8jUyqTu5XFs/5dpGKDBC2GNirNYZXVlLrEb7d/Kg8Vg== 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 4Q1HmX2JHCzTrv; Tue, 18 Apr 2023 21:55:56 +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 33ILtuCk062731; Tue, 18 Apr 2023 21:55:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33ILtuop062730; Tue, 18 Apr 2023 21:55:56 GMT (envelope-from git) Date: Tue, 18 Apr 2023 21:55:56 GMT Message-Id: <202304182155.33ILtuop062730@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: bba4910f8cf9 - main - biology/htslib: fix build on armv7 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: bba4910f8cf9cb77e587343c7fc81c5341ae52f9 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/ports/commit/?id=bba4910f8cf9cb77e587343c7fc81c5341ae52f9 commit bba4910f8cf9cb77e587343c7fc81c5341ae52f9 Author: Robert Clausecker AuthorDate: 2023-04-17 21:18:56 +0000 Commit: Robert Clausecker CommitDate: 2023-04-18 21:55:29 +0000 biology/htslib: fix build on armv7 This project includes some SIMD-enhanced functions for ARM NEON. Unfortunately the code uses a bunch of intrinsics only available on aarch64. Disable the use of NEON on armv6 and armv7 to fix the build on these platforms. See also: https://github.com/samtools/htslib/issues/1603 Approved by: portmgr (build fix blanket) --- biology/htslib/Makefile | 3 +++ .../patch-htscodecs_htscodecs_rANS__static32x16pr__neon.c | 11 +++++++++++ .../files/patch-htscodecs_htscodecs_rANS__static4x16pr.c | 11 +++++++++++ 3 files changed, 25 insertions(+) diff --git a/biology/htslib/Makefile b/biology/htslib/Makefile index 9f85da45917a..6a6e6a616d1c 100644 --- a/biology/htslib/Makefile +++ b/biology/htslib/Makefile @@ -20,6 +20,9 @@ USE_PERL5= test USE_LDCONFIG= yes GNU_CONFIGURE= yes +MAKE_ARGS_armv6= HTS_HAVE_NEON= +MAKE_ARGS_armv7= HTS_HAVE_NEON= +MAKE_ARGS= $(MAKE_ARGS_$(ARCH)) PATHFIX_MAKEFILEIN= Makefile SHEBANG_FILES= test/*.pl diff --git a/biology/htslib/files/patch-htscodecs_htscodecs_rANS__static32x16pr__neon.c b/biology/htslib/files/patch-htscodecs_htscodecs_rANS__static32x16pr__neon.c new file mode 100644 index 000000000000..577a3d651321 --- /dev/null +++ b/biology/htslib/files/patch-htscodecs_htscodecs_rANS__static32x16pr__neon.c @@ -0,0 +1,11 @@ +--- htscodecs/htscodecs/rANS_static32x16pr_neon.c.orig 2023-04-17 21:11:08 UTC ++++ htscodecs/htscodecs/rANS_static32x16pr_neon.c +@@ -32,7 +32,7 @@ + */ + + #include "config.h" +-#ifdef __ARM_NEON ++#if defined(__ARM_NEON) && defined(__aarch64__) + #include + + #include diff --git a/biology/htslib/files/patch-htscodecs_htscodecs_rANS__static4x16pr.c b/biology/htslib/files/patch-htscodecs_htscodecs_rANS__static4x16pr.c new file mode 100644 index 000000000000..8f3e883eec42 --- /dev/null +++ b/biology/htslib/files/patch-htscodecs_htscodecs_rANS__static4x16pr.c @@ -0,0 +1,11 @@ +--- htscodecs/htscodecs/rANS_static4x16pr.c.orig 2023-04-17 21:13:50 UTC ++++ htscodecs/htscodecs/rANS_static4x16pr.c +@@ -1006,7 +1006,7 @@ unsigned char *(*rans_dec_func(int do_simd, int order) + } + } + +-#elif defined(__ARM_NEON) ++#elif defined(__ARM_NEON) && defined(__aarch64__) + + #if defined(__linux__) || defined(__FreeBSD__) + #include