diff options
| author | Marius Bakke <marius@gnu.org> | 2021-06-06 21:16:32 +0200 |
|---|---|---|
| committer | Marius Bakke <marius@gnu.org> | 2021-06-06 21:16:32 +0200 |
| commit | 8d59c262ada2e2167196a8fb8cbebd9c329a79dd (patch) | |
| tree | 85a74de8cc23a2f0179c0b9f0adfa4c274449a0c /gnu/packages/patches/minimap2-aarch64-support.patch | |
| parent | e7f0835b07d868fd447aa64c873174fa385e1699 (diff) | |
| parent | a068ed6a5f5b3535fce49ac4eca1fec82edd6fdc (diff) | |
| download | guix-patches-8d59c262ada2e2167196a8fb8cbebd9c329a79dd.tar guix-patches-8d59c262ada2e2167196a8fb8cbebd9c329a79dd.tar.gz | |
Merge branch 'master' into core-updates
Conflicts:
gnu/local.mk
gnu/packages/algebra.scm
gnu/packages/bioinformatics.scm
gnu/packages/curl.scm
gnu/packages/docbook.scm
gnu/packages/emacs-xyz.scm
gnu/packages/maths.scm
gnu/packages/plotutils.scm
gnu/packages/python-web.scm
gnu/packages/python-xyz.scm
gnu/packages/radio.scm
gnu/packages/readline.scm
gnu/packages/tls.scm
gnu/packages/xml.scm
gnu/packages/xorg.scm
Diffstat (limited to 'gnu/packages/patches/minimap2-aarch64-support.patch')
| -rw-r--r-- | gnu/packages/patches/minimap2-aarch64-support.patch | 52 |
1 files changed, 0 insertions, 52 deletions
diff --git a/gnu/packages/patches/minimap2-aarch64-support.patch b/gnu/packages/patches/minimap2-aarch64-support.patch deleted file mode 100644 index 95db8579d6..0000000000 --- a/gnu/packages/patches/minimap2-aarch64-support.patch +++ /dev/null @@ -1,52 +0,0 @@ -This patch should be removed with the next release. There is WIP upstream -support for proper support of more architectures, including aarch64 and powerpc64le. - -diff --git a/Makefile b/Makefile -index ed341f6..94dbd85 100644 ---- a/Makefile -+++ b/Makefile -@@ -6,20 +6,18 @@ PROG= minimap2 - PROG_EXTRA= sdust minimap2-lite - LIBS= -lm -lz -lpthread - --ifeq ($(arm_neon),) # if arm_neon is not defined --ifeq ($(sse2only),) # if sse2only is not defined -- OBJS+=ksw2_extz2_sse41.o ksw2_extd2_sse41.o ksw2_exts2_sse41.o ksw2_extz2_sse2.o ksw2_extd2_sse2.o ksw2_exts2_sse2.o ksw2_dispatch.o --else # if sse2only is defined -- OBJS+=ksw2_extz2_sse.o ksw2_extd2_sse.o ksw2_exts2_sse.o --endif --else # if arm_neon is defined -+ifneq ($(arm_neon),) # if arm_neon is defined - OBJS+=ksw2_extz2_neon.o ksw2_extd2_neon.o ksw2_exts2_neon.o -- INCLUDES+=-Isse2neon --ifeq ($(aarch64),) #if aarch64 is not defined - CFLAGS+=-D_FILE_OFFSET_BITS=64 -mfpu=neon -fsigned-char --else #if aarch64 is defined -+ INCLUDES+=-Isse2neon -+else ifneq ($(aarch64),) #if aarch64 is defined -+ OBJS+=ksw2_extz2_neon.o ksw2_extd2_neon.o ksw2_exts2_neon.o - CFLAGS+=-D_FILE_OFFSET_BITS=64 -fsigned-char --endif -+ INCLUDES+=-Isse2neon -+else ifneq ($(sse2only),) # if sse2only is defined -+ OBJS+=ksw2_extz2_sse.o ksw2_extd2_sse.o ksw2_exts2_sse.o -+else # none of the above -+ OBJS+=ksw2_extz2_sse41.o ksw2_extd2_sse41.o ksw2_exts2_sse41.o ksw2_extz2_sse2.o ksw2_extd2_sse2.o ksw2_exts2_sse2.o ksw2_dispatch.o - endif - - .PHONY:all extra clean depend -@@ -46,9 +44,12 @@ sdust:sdust.c kalloc.o kalloc.h kdq.h kvec.h kseq.h ketopt.h sdust.h - - # SSE-specific targets on x86/x86_64 - --ifeq ($(arm_neon),) # if arm_neon is defined, compile this target with the default setting (i.e. no -msse2) -+ifneq ($(arm_neon),) # if arm_neon is defined, compile this target with the default setting (i.e. no -msse2) -+ksw2_ll_sse.o:ksw2_ll_sse.c ksw2.h kalloc.h -+else ifneq ($(aarch64),) - ksw2_ll_sse.o:ksw2_ll_sse.c ksw2.h kalloc.h -- $(CC) -c $(CFLAGS) -msse2 $(CPPFLAGS) $(INCLUDES) $< -o $@ -+else -+ $(CC) -c $(CFLAGS) -msse2 $(CPPFLAGS) $(INCLUDES) $< -o $@ - endif - - ksw2_extz2_sse41.o:ksw2_extz2_sse.c ksw2.h kalloc.h |