fix third party stuff

recipes/torchtext/meta.yaml

@@ -30,6 +30,7 @@ requirements:
     - sysroot_linux-64 2.17  # [linux64]
     - cmake
     - ninja
+    - pkg-config
   host:
     - python
     - pip
@@ -38,6 +39,7 @@ requirements:
     # from pytorch/text/tree/main/third_party
     - double-conversion
     - libsentencepiece
+    - libutf8proc
     - re2
   run:
     - python

recipes/torchtext/patches/0001-do-not-build-third_party-libs.patch

@@ -1,11 +1,12 @@
-From b530b275f1af85d2ae8da140e58796aa506186f8 Mon Sep 17 00:00:00 2001
+From e1ce5ea884009e5e1397e61b02933501c53aba19 Mon Sep 17 00:00:00 2001
 From: "H. Vetinari" <[email protected]>
 Date: Wed, 1 Dec 2021 21:07:42 +1100
 Subject: [PATCH 1/2] do not build third_party libs
 
 ---
- CMakeLists.txt | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
+ CMakeLists.txt                | 5 ++++-
+ torchtext/csrc/CMakeLists.txt | 8 --------
+ 2 files changed, 4 insertions(+), 9 deletions(-)
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
 index ed39e644..46312680 100644
@@ -21,6 +22,32 @@ index ed39e644..46312680 100644
 +find_package(sentencepiece REQUIRED)
 +
  add_subdirectory(torchtext/csrc)
+diff --git a/torchtext/csrc/CMakeLists.txt b/torchtext/csrc/CMakeLists.txt
+index 5d67bba8..699fa822 100644
+--- a/torchtext/csrc/CMakeLists.txt
++++ b/torchtext/csrc/CMakeLists.txt
+@@ -18,10 +18,6 @@ set(
+ set(
+   LIBTORCHTEXT_INCLUDE_DIRS
+   ${PROJECT_SOURCE_DIR}
+-  ${PROJECT_SOURCE_DIR}/third_party/sentencepiece/src
+-  $<TARGET_PROPERTY:re2,INCLUDE_DIRECTORIES>
+-  $<TARGET_PROPERTY:double-conversion,INCLUDE_DIRECTORIES>
+-  $<TARGET_PROPERTY:utf8proc,INCLUDE_DIRECTORIES>
+   ${TORCH_INSTALL_PREFIX}/include
+   ${TORCH_INSTALL_PREFIX}/include/torch/csrc/api/include
+   )
+@@ -119,10 +115,6 @@ if (BUILD_TORCHTEXT_PYTHON_EXTENSION)
+   set(
+     EXTENSION_INCLUDE_DIRS
+     ${PROJECT_SOURCE_DIR}
+-    ${PROJECT_SOURCE_DIR}/third_party/sentencepiece/src
+-    $<TARGET_PROPERTY:re2,INCLUDE_DIRECTORIES>
+-    $<TARGET_PROPERTY:double-conversion,INCLUDE_DIRECTORIES>
+-    $<TARGET_PROPERTY:utf8proc,INCLUDE_DIRECTORIES>
+     ${TORCH_INSTALL_PREFIX}/include
+     ${TORCH_INSTALL_PREFIX}/include/torch/csrc/api/include
+     )
 -- 
 2.38.1.windows.1
 

recipes/torchtext/patches/0002-fix-some-CMake-arguments-for-our-infrastructure.patch

@@ -1,4 +1,4 @@
-From b9711d40d1a4b3a6d152d11ca925c949a413c53a Mon Sep 17 00:00:00 2001
+From 24403f88e608cdc3f1939370df7ac361d648046e Mon Sep 17 00:00:00 2001
 From: "H. Vetinari" <[email protected]>
 Date: Wed, 18 Jan 2023 16:56:57 +1100
 Subject: [PATCH 2/2] fix some CMake arguments for our infrastructure