From df2d4bfd9d4036e33fbe4b9b5caf7bf8e60dff2c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ant=C3=B4nio=20Camargo?= Date: Thu, 5 Dec 2024 11:29:39 -0800 Subject: [PATCH 1/3] Remove `-march=native` from MUSCLE's compile script --- recipes/muscle/vcxproj_make.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes/muscle/vcxproj_make.py b/recipes/muscle/vcxproj_make.py index 739663b29c933..17fcc06712bb1 100644 --- a/recipes/muscle/vcxproj_make.py +++ b/recipes/muscle/vcxproj_make.py @@ -71,8 +71,8 @@ binary = ProjFileName.replace(".vcxproj", "") sys.stderr.write("binary=" + binary + "\n") -compiler_opts = " -ffast-math -march=native" -linker_opts = " -ffast-math -march=native" +compiler_opts = " -ffast-math" +linker_opts = " -ffast-math" if std: compiler_opts += " --std=" + std From f7055e6be22eca2bce80f4a472f06d2715ac1d20 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ant=C3=B4nio=20Camargo?= Date: Thu, 5 Dec 2024 11:32:22 -0800 Subject: [PATCH 2/3] Bump build --- recipes/muscle/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/muscle/meta.yaml b/recipes/muscle/meta.yaml index 1bd528fba686b..0c054561524b0 100644 --- a/recipes/muscle/meta.yaml +++ b/recipes/muscle/meta.yaml @@ -12,7 +12,7 @@ source: - support-linux-aarch64.patch build: - number: 0 + number: 1 run_exports: - {{ pin_subpackage(name, max_pin="x.x") }} From f87ada976436384b079cd30a2edadf6a27319edd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ant=C3=B4nio=20Camargo?= Date: Wed, 11 Dec 2024 11:03:04 -0800 Subject: [PATCH 3/3] Try to remove patch --- recipes/muscle/meta.yaml | 2 -- recipes/muscle/support-linux-aarch64.patch | 13 ------------- 2 files changed, 15 deletions(-) delete mode 100644 recipes/muscle/support-linux-aarch64.patch diff --git a/recipes/muscle/meta.yaml b/recipes/muscle/meta.yaml index 0c054561524b0..b350f1eaa09ac 100644 --- a/recipes/muscle/meta.yaml +++ b/recipes/muscle/meta.yaml @@ -8,8 +8,6 @@ package: source: url: https://github.com/rcedgar/muscle/archive/refs/tags/v{{ version }}.tar.gz sha256: 74b22a94e630b16015c2bd9ae83aa2be2c2048d3e41f560b2d4a954725c81968 - patches: - - support-linux-aarch64.patch build: number: 1 diff --git a/recipes/muscle/support-linux-aarch64.patch b/recipes/muscle/support-linux-aarch64.patch deleted file mode 100644 index f9c8e2081e8b8..0000000000000 --- a/recipes/muscle/support-linux-aarch64.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/myutils.h b/src/myutils.h -index a5d8a58..fbf6f9f 100644 ---- a/src/myutils.h -+++ b/src/myutils.h -@@ -10,7 +10,7 @@ - #include - #include "myalloc.h" - --#if defined(__x86_64__) || defined(_M_X64) || defined(__arm64__) -+#if defined(__x86_64__) || defined(_M_X64) || defined(__arm64__) || defined(__aarch64__) - #define BITS 64 - #else - #define BITS 32