separate static window builds from depending on shared ones again

conda-forge · Sep 7, 2022 · 18c2008 · 18c2008
1 parent 62d849e
commit 18c2008
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 36 deletions.
diff --git a/recipe/meta.yaml b/recipe/meta.yaml
@@ -15,7 +15,6 @@ source:
     patches:
       - patches/0001-remove-Werror-from-test-flags.patch  # [ppc64le or aarch64]
       - patches/0002-use-consistent-cmake-location.patch
-      - patches/0003-set-import-lib-extension-on-windows.patch
       # This issue gets fixed and then reintroduced often
       # https://github.com/protocolbuffers/protobuf/issues/7567
       # - patches/issue-7567.patch
@@ -67,11 +66,10 @@ outputs:
         - test -f ${PREFIX}/lib/{{ each_lib }}.so                      # [linux]
         - test -f ${PREFIX}/lib/{{ each_lib }}.dylib                   # [osx]
         - if not exist %LIBRARY_BIN%\{{ each_lib }}.dll exit 1         # [win]
-        - if not exist %LIBRARY_LIB%\{{ each_lib }}-import.lib exit 1  # [win]
+        - if not exist %LIBRARY_LIB%\{{ each_lib }}.lib exit 1         # [win]
 
         # absence of static libraries
         - test ! -f ${PREFIX}/lib/{{ each_lib }}.a                     # [unix]
-        - if exist %LIBRARY_LIB%\{{ each_lib }}.lib exit 1             # [win]
         {% endfor %}
 
         # cmake (disabled on unix currently)
@@ -101,17 +99,24 @@ outputs:
         - ninja  # [win]
       host:
         - zlib
-        - {{ pin_subpackage('libprotobuf', exact=True) }}
+        - {{ pin_subpackage('libprotobuf', exact=True) }}  # [not win]
       run:
-        - {{ pin_subpackage('libprotobuf', exact=True) }}
+        - {{ pin_subpackage('libprotobuf', exact=True) }}  # [not win]
+      run_constrained:
+        - libprotobuf <0a0  # [win]
     test:
       commands:
         {% for each_lib in libraries %}
         # static libraries
         - test -f ${PREFIX}/lib/{{ each_lib }}.a                       # [unix]
         - if not exist %LIBRARY_LIB%\{{ each_lib }}.lib exit 1         # [win]
+        # absence of shared libraries
+        - if exist %LIBRARY_BIN%\{{ each_lib }}.dll exit 1             # [win]
         {% endfor %}
 
+        # binary
+        - protoc --help  # [win]
+
 about:
   home: https://developers.google.com/protocol-buffers/
   license: BSD-3-Clause

diff --git a/recipe/patches/0001-remove-Werror-from-test-flags.patch b/recipe/patches/0001-remove-Werror-from-test-flags.patch
@@ -1,7 +1,7 @@
 From d667a84c67f61e612017e253d84a0efa214413bd Mon Sep 17 00:00:00 2001
 From: Jonathan Helmus <jjhelmus@gmail.com>
 Date: Mon, 4 Jun 2018 17:06:30 -0400
-Subject: [PATCH 1/3] remove Werror from test flags
+Subject: [PATCH 1/2] remove Werror from test flags
 
 Remove -Werror from the CXXFLAGS used for `make check`
 ---

diff --git a/recipe/patches/0002-use-consistent-cmake-location.patch b/recipe/patches/0002-use-consistent-cmake-location.patch
@@ -1,7 +1,7 @@
 From 06928c896573b92c000e7c069a2ef6739d87c9e3 Mon Sep 17 00:00:00 2001
 From: "H. Vetinari" <h.vetinari@gmx.com>
 Date: Sat, 3 Sep 2022 19:48:04 +0200
-Subject: [PATCH 2/3] use consistent cmake location
+Subject: [PATCH 2/2] use consistent cmake location
 
 ---
  cmake/install.cmake | 9 ++-------

diff --git a/recipe/patches/0003-set-import-lib-extension-on-windows.patch b/recipe/patches/0003-set-import-lib-extension-on-windows.patch