From 791a10f9128e07b9ad1f44e9f0c3f11a62adfcb4 Mon Sep 17 00:00:00 2001 From: Zilong-Li Date: Sat, 2 Dec 2023 11:32:55 +0100 Subject: [PATCH] undef simd for windows --- .github/workflows/check-release.yaml | 1 + src/Makevars.win | 2 +- src/htslib-1.18/Makefile.win | 2 +- src/htslib-1.18/config.flags.h | 5 +++++ 4 files changed, 8 insertions(+), 2 deletions(-) create mode 100644 src/htslib-1.18/config.flags.h diff --git a/.github/workflows/check-release.yaml b/.github/workflows/check-release.yaml index 2b9ac77..273979b 100644 --- a/.github/workflows/check-release.yaml +++ b/.github/workflows/check-release.yaml @@ -21,6 +21,7 @@ jobs: config: - {os: macos-latest, r: 'release'} - {os: windows-latest, r: 'release'} + - {os: ubuntu-latest, r: 'release'} - {os: ubuntu-latest, r: 'devel', http-user-agent: 'release'} env: diff --git a/src/Makevars.win b/src/Makevars.win index 68a4e34..a1b570d 100644 --- a/src/Makevars.win +++ b/src/Makevars.win @@ -14,7 +14,7 @@ $(SHLIB) : HTSLIB # LDFLAGS=$(shell "R CMD config LDFLAGS") HTSLIB: - (cd ${HTSLIB_DIR} && ./configure && cp -f htscodecs.vcfppR htscodecs.mk && $(MAKE) -f Makefile.win libhts.a && cd ..) + (cd ${HTSLIB_DIR} && ./configure && cat config.flags.h >> config.h && $(MAKE) -f Makefile.win libhts.a && cd ..) clean: diff --git a/src/htslib-1.18/Makefile.win b/src/htslib-1.18/Makefile.win index fcdf8fd..418311b 100644 --- a/src/htslib-1.18/Makefile.win +++ b/src/htslib-1.18/Makefile.win @@ -145,7 +145,7 @@ HTS_BUILD_POPCNT = HTS_BUILD_SSE4_1 = include htslib_vars.mk -include htscodecs_bundled.mk +include htscodecs.mk # If not using GNU make, you need to copy the version number from version.sh # into here. diff --git a/src/htslib-1.18/config.flags.h b/src/htslib-1.18/config.flags.h new file mode 100644 index 0000000..e798d90 --- /dev/null +++ b/src/htslib-1.18/config.flags.h @@ -0,0 +1,5 @@ +#undef HAVE_POPCNT +#undef HAVE_AVX2 +#undef HAVE_AVX512 +#undef HAVE_SSE4_1 +#undef HAVE_SSSE3