diff options
| author | Maxim Cournoyer <[email protected]> | 2021-10-01 17:10:49 -0400 |
|---|---|---|
| committer | Maxim Cournoyer <[email protected]> | 2021-10-01 17:10:49 -0400 |
| commit | 2e65e4834a226c570866f2e8976ed7f252b45cd1 (patch) | |
| tree | 21d625bce8d03627680214df4a6622bf8eb79dc9 /gnu/packages/patches/minimap2-aarch64-support.patch | |
| parent | 9c68ecb24dd1660ce736cdcdea0422a73ec318a2 (diff) | |
| parent | f1a3c11407b52004e523ec5de20d326c5661681f (diff) | |
Merge remote-tracking branch 'origin/master' into staging
With resolved conflicts in:
gnu/packages/bittorrent.scm
gnu/packages/databases.scm
gnu/packages/geo.scm
gnu/packages/gnupg.scm
gnu/packages/gstreamer.scm
gnu/packages/gtk.scm
gnu/packages/linux.scm
gnu/packages/python-xyz.scm
gnu/packages/xorg.scm
guix/build/qt-utils.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 |