Skip to content

Commit

Permalink
another patch to avoid asmlib on osx
Browse files Browse the repository at this point in the history
  • Loading branch information
kowallus committed Oct 7, 2024
1 parent 0c7c647 commit 33d88fa
Show file tree
Hide file tree
Showing 3 changed files with 88 additions and 284 deletions.
87 changes: 87 additions & 0 deletions recipes/mbgc/asmlib_off.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,87 @@
Subject: [PATCH] turned off asmlib for mac to avoid build problems
---
Index: mbgccoder/MBGC_Encoder.cpp
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/mbgccoder/MBGC_Encoder.cpp b/mbgccoder/MBGC_Encoder.cpp
--- a/mbgccoder/MBGC_Encoder.cpp (revision 3f75674bef8463fbfb38e5c13b2760001c82db2a)
+++ b/mbgccoder/MBGC_Encoder.cpp (date 1728298345981)
@@ -15,7 +15,7 @@
( params->checkIfDNAisWellFormed ? (seq->dnaLineLen == DNA_NOT_WELLFORMED ? 0 : seq->dnaLineLen ) \
: seq->maxLastDnaLineLen ) : 0)

-#if !defined(__arm__) && !defined(__aarch64__) && !defined(__ARM_ARCH)
+#if false
#include "../libs/asmlib.h"
#endif
#include "../coders/PropsLibrary.h"
Index: matching/SlidingWindowSparseEMMatcher.cpp
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/matching/SlidingWindowSparseEMMatcher.cpp b/matching/SlidingWindowSparseEMMatcher.cpp
--- a/matching/SlidingWindowSparseEMMatcher.cpp (revision 3f75674bef8463fbfb38e5c13b2760001c82db2a)
+++ b/matching/SlidingWindowSparseEMMatcher.cpp (date 1728298358675)
@@ -28,7 +28,7 @@
* ================================================================= */

#include "SlidingWindowSparseEMMatcher.h"
-#if !defined(__arm__) && !defined(__aarch64__) && !defined(__ARM_ARCH)
+#if false
#include "../libs/asmlib.h"
#endif
#include <algorithm>
Index: utils/helper.h
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/utils/helper.h b/utils/helper.h
--- a/utils/helper.h (revision 3f75674bef8463fbfb38e5c13b2760001c82db2a)
+++ b/utils/helper.h (date 1728298330332)
@@ -338,7 +338,7 @@

}

-#if defined(__arm__) || defined(__aarch64__) || defined(__ARM_ARCH)
+#if true

void A_memcpy(void *dest, const void *src, size_t n);

Index: utils/helper.cpp
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/utils/helper.cpp b/utils/helper.cpp
--- a/utils/helper.cpp (revision 3f75674bef8463fbfb38e5c13b2760001c82db2a)
+++ b/utils/helper.cpp (date 1728298338321)
@@ -582,7 +582,7 @@
#endif
}

-#if defined(__arm__) || defined(__aarch64__) || defined(__ARM_ARCH)
+#if true

void A_memcpy(void *dest, const void *src, size_t n) {
memcpy(dest, src, n);
Index: CMakeLists.txt
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/CMakeLists.txt b/CMakeLists.txt
--- a/CMakeLists.txt (revision 3f75674bef8463fbfb38e5c13b2760001c82db2a)
+++ b/CMakeLists.txt (date 1728298472911)
@@ -107,7 +107,7 @@
elseif(APPLE)
set(ASM_LIB ${CMAKE_SOURCE_DIR}/libs/libamac64.a)
endif()
- link_libraries(${ASM_LIB})
+# link_libraries(${ASM_LIB})
endif()

link_libraries(pthread)
Loading

0 comments on commit 33d88fa

Please sign in to comment.