pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

simde: Add bl3 hisat2: Use simde to support non-x86 platforms



Module Name:	pkgsrc-wip
Committed By:	Jason Bacon <bacon%NetBSD.org@localhost>
Pushed By:	outpaddling
Date:		Wed Mar 16 18:26:07 2022 -0500
Changeset:	d77c690ec78aea33f54b15ba899474bfe87d3315

Modified Files:
	hisat2/Makefile
	hisat2/distinfo
	hisat2/patches/patch-aligner__sw.h
	hisat2/patches/patch-sse__util.h
Added Files:
	simde/buildlink3.mk

Log Message:
simde: Add bl3
hisat2: Use simde to support non-x86 platforms

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=d77c690ec78aea33f54b15ba899474bfe87d3315

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 hisat2/Makefile                    |  1 +
 hisat2/distinfo                    |  4 ++--
 hisat2/patches/patch-aligner__sw.h |  4 ++--
 hisat2/patches/patch-sse__util.h   |  4 ++--
 simde/buildlink3.mk                | 13 +++++++++++++
 5 files changed, 20 insertions(+), 6 deletions(-)

diffs:
diff --git a/hisat2/Makefile b/hisat2/Makefile
index 04a7146126..e07dba25ee 100644
--- a/hisat2/Makefile
+++ b/hisat2/Makefile
@@ -23,6 +23,7 @@ REPLACE_PYTHON=		*.py scripts/*.py hisat2-build hisat2-inspect
 PTHREAD_AUTO_VARS=	yes
 WRKSRC=			${WRKDIR}/hisat2-2.2.1
 
+.include "../../wip/simde/buildlink3.mk"
 .include "../../lang/python/application.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/hisat2/distinfo b/hisat2/distinfo
index 0f8f984978..0d4944bf69 100644
--- a/hisat2/distinfo
+++ b/hisat2/distinfo
@@ -4,7 +4,7 @@ BLAKE2s (hisat2-2.2.1.tar.gz) = 1cc424a10f1fcf25c70294bef3b21e67b07cebcb7b73e36c
 SHA512 (hisat2-2.2.1.tar.gz) = a5a688ad0ccfaf326b3ec6dc97206995306aa6f5b6e58223c2113adbca2745f1e8205b436fdf8e01f42da7a38718f9f3bf214b951fb5360d53247d99a0bdbf46
 Size (hisat2-2.2.1.tar.gz) = 6761242 bytes
 SHA1 (patch-Makefile) = e002806f8daa4e5c45b95b5f173de818a8737b43
-SHA1 (patch-aligner__sw.h) = bdd7e3a189b5c2886df85cc4252d4f41487f423f
+SHA1 (patch-aligner__sw.h) = 628c14bfd6b26185eada73013175e35de2b38227
 SHA1 (patch-hisat2) = 6010f5fcc1e7dfcb383a4defc4e3d9f06322370d
 SHA1 (patch-processor__support.h) = 56d9cd4ba18e37879acba521a0f431fe2b4290af
-SHA1 (patch-sse__util.h) = c1dd6bc593a14ef5617e1d67e211a2e7a96a6022
+SHA1 (patch-sse__util.h) = f0bbe72dfe3a2567e614683e3aecc10f3d6583ef
diff --git a/hisat2/patches/patch-aligner__sw.h b/hisat2/patches/patch-aligner__sw.h
index 7e1d534db6..7aba6299e5 100644
--- a/hisat2/patches/patch-aligner__sw.h
+++ b/hisat2/patches/patch-aligner__sw.h
@@ -10,13 +10,13 @@ $NetBSD$
  
 +#define	SIMDE_ENABLE_NATIVE_ALIASES
 +
-+// #include <simde/x86/sse2.h>
++#include <simde/x86/sse2.h>
  #include <stdint.h>
  #include <iostream>
  #include <limits>
  #include "threading.h"
 -#include <emmintrin.h>
-+#include <emmintrin.h>		// Replace this with simde when possible
++// #include <emmintrin.h>	// Replace this with simde when possible
  #include "aligner_sw_common.h"
  #include "aligner_sw_nuc.h"
  #include "ds.h"
diff --git a/hisat2/patches/patch-sse__util.h b/hisat2/patches/patch-sse__util.h
index 94df3199bb..22bbf22180 100644
--- a/hisat2/patches/patch-sse__util.h
+++ b/hisat2/patches/patch-sse__util.h
@@ -9,14 +9,14 @@ $NetBSD$
  #define SSE_UTIL_H_
  
 +#define SIMDE_ENABLE_NATIVE_ALIASES
-+//#include <simde/x86/sse2.h>
++#include <simde/x86/sse2.h>
 +
  #include "assert_helpers.h"
  #include "ds.h"
  #include "limit.h"
  #include <iostream>
 -#include <emmintrin.h>
-+#include <emmintrin.h>		// Replace with simde when possible
++// #include <emmintrin.h>		// Replace with simde when possible
  
  class EList_m128i {
  public:
diff --git a/simde/buildlink3.mk b/simde/buildlink3.mk
new file mode 100644
index 0000000000..8e042f795f
--- /dev/null
+++ b/simde/buildlink3.mk
@@ -0,0 +1,13 @@
+# $NetBSD$
+
+BUILDLINK_TREE+=	simde
+
+.if !defined(SIMDE_BUILDLINK3_MK)
+SIMDE_BUILDLINK3_MK:=
+
+BUILDLINK_API_DEPENDS.simde+=	simde>=0.7.2
+BUILDLINK_PKGSRCDIR.simde?=	../../wip/simde
+BUILDLINK_DEPMETHOD.simde?=	build
+.endif	# SIMDE_BUILDLINK3_MK
+
+BUILDLINK_TREE+=	-simde


Home | Main Index | Thread Index | Old Index