Update patch

bioconda · Oct 8, 2024 · ba1f9be · ba1f9be
1 parent 081aaae
commit ba1f9be
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 60 deletions.
diff --git a/recipes/hictk/build.sh b/recipes/hictk/build.sh
@@ -32,10 +32,10 @@ mkdir -p "$CONAN_HOME/profiles/"
 ln -s "${RECIPE_DIR}/conan_profiles/$conan_profile" "$CONAN_HOME/profiles/$conan_profile"
 
 # Remove unnecessary dependencies from conanfile.py
-patch conanfile.py < "${RECIPE_DIR}/conanfile.py.patch"
+patch conanfile.Dockerfile.py < "${RECIPE_DIR}/conanfile.Dockerfile.py.patch"
 
 # Install header-only deps
-conan install conanfile.py \
+conan install conanfile.Dockerfile.py \
        --build="*" \
        -pr:b "$conan_profile" \
        -pr:h "$conan_profile" \

diff --git a/recipes/hictk/conanfile.py.patch → recipes/hictk/conanfile.Dockerfile.py.patch b/recipes/hictk/conanfile.py.patch → recipes/hictk/conanfile.Dockerfile.py.patch
@@ -1,19 +1,14 @@
-diff --git a/conanfile.py b/conanfile.py
-index 8952245..9ee3c58 100644
---- a/conanfile.py
-+++ b/conanfile.py
-@@ -35,31 +35,11 @@ class HictkConan(ConanFile):
-         return 17
+diff --git a/conanfile.Dockerfile.py b/conanfile.Dockerfile.py
+index 47c053d7..9ee3c58b 100644
+--- a/conanfile.Dockerfile.py
++++ b/conanfile.Dockerfile.py
+@@ -36,26 +36,10 @@ class HictkConan(ConanFile):
 
      def requirements(self):
--        self.requires("arrow/16.1.0#f484da4c4c27c1eb3ead5d61b70635cd")
--        self.requires("boost/1.85.0#d9ae7996a5b917e0cfd4b738aa976dee", force=True)
          self.requires("bshoshany-thread-pool/4.1.0#be1802a8768416a6c9b1393cf0ce5e9c")
 -        self.requires("bzip2/1.0.8#d00dac990f08d991998d624be81a9526")
--        self.requires("catch2/3.6.0#819bc5a82c2cb626916fc18ee1dbc45f")
 -        self.requires("cli11/2.4.2#1b431bda2fb2cd3efed633899abcd8cc")
          self.requires("concurrentqueue/1.0.4#1e48e1c712bcfd892087c9c622a51502")
--        self.requires("eigen/3.4.0#2e192482a8acff96fe34766adca2b24c")
 -        self.requires("fast_float/6.1.1#e29acaa3d0543dee343abe3f6815346e")
 -        self.requires("fmt/10.2.1#9199a7a0611866dea5c8849a77467b25")
 -        self.requires("hdf5/1.14.3#31ccd8d4de83844f5db48471df1944a1")
@@ -24,67 +19,21 @@ index 8952245..9ee3c58 100644
 -        self.requires("lzo/2.10#5725914235423c771cb1c6b607109b45")
 -        self.requires("nlohmann_json/3.11.3#45828be26eb619a2e04ca517bb7b828d")
          self.requires("parallel-hashmap/1.3.12#dc7755096d8a1fac7792fdd85760b6ca")
--        self.requires("pybind11/2.13.4#632601fe4e53c3046d616961ccee2c7b")
          self.requires("readerwriterqueue/1.0.6#aaa5ff6fac60c2aee591e9e51b063b83")
          self.requires("span-lite/0.11.0#519fd49fff711674cfed8cd17d4ed422")
 -        self.requires("spdlog/1.14.1#972bbf70be1da4bc57ea589af0efde03")
 -        self.requires("tomlplusplus/3.4.0#85dbfed71376fb8dc23cdcc0570e4727")
+-        self.requires("xz_utils/5.4.5#b885d1d79c9d30cff3803f7f551dbe66")
 -        self.requires("zstd/1.5.6#afefe79a309bc2a7b9f56c2093504c8b", force=True)
 -        self.requires("zlib/1.3.1#f52e03ae3d251dec704634230cd806a2")
 
      def validate(self):
          if self.settings.get_safe("compiler.cppstd"):
-@@ -68,80 +48,3 @@ class HictkConan(ConanFile):
+@@ -64,34 +48,3 @@ class HictkConan(ConanFile):
      def configure(self):
          if self.settings.compiler in ["clang", "gcc"]:
              self.settings.compiler.libcxx = "libstdc++11"
 -
--        self.options["arrow"].compute = True
--        self.options["arrow"].parquet = False
--        self.options["arrow"].with_boost = True
--        self.options["arrow"].with_re2 = True
--        self.options["arrow"].with_thrift = False
--        self.options["boost"].system_no_deprecated = True
--        self.options["boost"].asio_no_deprecated = True
--        self.options["boost"].filesystem_no_deprecated = True
--        self.options["boost"].filesystem_version = 4
--        self.options["boost"].zlib = False
--        self.options["boost"].bzip2 = False
--        self.options["boost"].lzma = False
--        self.options["boost"].zstd = False
--        self.options["boost"].without_atomic = False
--        self.options["boost"].without_charconv = True
--        self.options["boost"].without_chrono = True
--        self.options["boost"].without_container = True
--        self.options["boost"].without_context = True
--        self.options["boost"].without_contract = True
--        self.options["boost"].without_coroutine = True
--        self.options["boost"].without_date_time = True
--        self.options["boost"].without_exception = True
--        self.options["boost"].without_fiber = True
--        self.options["boost"].without_filesystem = False
--        self.options["boost"].without_graph = True
--        self.options["boost"].without_graph_parallel = True
--        self.options["boost"].without_iostreams = True
--        self.options["boost"].without_json = True
--        self.options["boost"].without_locale = True
--        self.options["boost"].without_log = True
--        self.options["boost"].without_math = True
--        self.options["boost"].without_mpi = True
--        self.options["boost"].without_nowide = True
--        self.options["boost"].without_program_options = True
--        self.options["boost"].without_python = True
--        self.options["boost"].without_random = True
--        self.options["boost"].without_regex = True
--        self.options["boost"].without_serialization = True
--        self.options["boost"].without_stacktrace = True
--        self.options["boost"].without_system = False
--        self.options["boost"].without_test = True
--        self.options["boost"].without_thread = True
--        self.options["boost"].without_timer = True
--        self.options["boost"].without_type_erasure = True
--        self.options["boost"].without_url = True
--        self.options["boost"].without_wave = True
 -        self.options["fmt"].header_only = True
 -        self.options["hdf5"].enable_cxx = False
 -        self.options["hdf5"].hl = False