clamav: Fix ncurses and pdcurses include options

It seems like we're detecting system-provided headers. If the system headers differ from our lib, we may end up with 'missing' symbols. This is to fix a build issue on macOS in GitHub Actions.
Cisco-Talos · Aug 31, 2024 · b1101ff · b1101ff
1 parent a72a973
commit b1101ff
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 20 deletions.
diff --git a/recipes/clamav-1.0.yaml b/recipes/clamav-1.0.yaml
@@ -48,7 +48,7 @@ platforms:
             -D LIBXML2_LIBRARY="{install}/lib/libxml2.dylib"          \
             -D PCRE2_INCLUDE_DIR="{install}/include"                  \
             -D PCRE2_LIBRARY="{install}/lib/libpcre2-8.dylib"         \
-            -D CURSES_INCLUDE_DIR="{install}/include"                 \
+            -D NCURSES_INCLUDE_DIR="{install}/include"                \
             -D CURSES_LIBRARY="{install}/lib/libncurses.a"            \
             -D ZLIB_INCLUDE_DIR="{install}/include"                   \
             -D ZLIB_LIBRARY="{install}/lib/libz.dylib"                \
@@ -105,7 +105,7 @@ platforms:
             -D JSONC_LIBRARY="{install}/lib/libjson-c.a"              \
             -D ENABLE_JSON_SHARED=OFF                                 \
             -D BZIP2_INCLUDE_DIR="{install}/include"                  \
-            -D BZIP2_LIBRARY_RELEASE="{install}/lib/libbz2.a"  \
+            -D BZIP2_LIBRARY_RELEASE="{install}/lib/libbz2.a"         \
             -D OPENSSL_ROOT_DIR="{install}"                           \
             -D OPENSSL_INCLUDE_DIR="{install}/include"                \
             -D OPENSSL_CRYPTO_LIBRARY="{install}/lib/libcrypto.a"     \
@@ -114,7 +114,7 @@ platforms:
             -D LIBXML2_LIBRARY="{install}/lib/libxml2.a"              \
             -D PCRE2_INCLUDE_DIR="{install}/include"                  \
             -D PCRE2_LIBRARY="{install}/lib/libpcre2-8.a"             \
-            -D CURSES_INCLUDE_DIR="{install}/include"                 \
+            -D NCURSES_INCLUDE_DIR="{install}/include"                \
             -D CURSES_LIBRARY="{install}/lib/libncurses.a"            \
             -D ZLIB_INCLUDE_DIR="{install}/include"                   \
             -D ZLIB_LIBRARY="{install}/lib/libz.a"                    \
@@ -182,7 +182,7 @@ platforms:
             -D LIBXML2_LIBRARY="{install}/lib/libxml2.so"          \
             -D PCRE2_INCLUDE_DIR="{install}/include"               \
             -D PCRE2_LIBRARY="{install}/lib/libpcre2-8.so"         \
-            -D CURSES_INCLUDE_DIR="{install}/include"              \
+            -D NCURSES_INCLUDE_DIR="{install}/include"             \
             -D CURSES_LIBRARY="{install}/lib/libncurses.a"         \
             -D ZLIB_INCLUDE_DIR="{install}/include"                \
             -D ZLIB_LIBRARY="{install}/lib/libz.so"                \
@@ -240,7 +240,7 @@ platforms:
             -D JSONC_LIBRARY="{install}/lib/libjson-c.a"              \
             -D ENABLE_JSON_SHARED=OFF                                 \
             -D BZIP2_INCLUDE_DIR="{install}/include"                  \
-            -D BZIP2_LIBRARY_RELEASE="{install}/lib/libbz2.a"  \
+            -D BZIP2_LIBRARY_RELEASE="{install}/lib/libbz2.a"         \
             -D OPENSSL_ROOT_DIR="{install}"                           \
             -D OPENSSL_INCLUDE_DIR="{install}/include"                \
             -D OPENSSL_CRYPTO_LIBRARY="{install}/lib/libcrypto.a"     \
@@ -249,7 +249,7 @@ platforms:
             -D LIBXML2_LIBRARY="{install}/lib/libxml2.a"              \
             -D PCRE2_INCLUDE_DIR="{install}/include"                  \
             -D PCRE2_LIBRARY="{install}/lib/libpcre2-8.a"             \
-            -D CURSES_INCLUDE_DIR="{install}/include"                 \
+            -D NCURSES_INCLUDE_DIR="{install}/include"                \
             -D CURSES_LIBRARY="{install}/lib/libncurses.a"            \
             -D ZLIB_INCLUDE_DIR="{install}/include"                   \
             -D ZLIB_LIBRARY="{install}/lib/libz.a"                    \
@@ -318,7 +318,7 @@ platforms:
             -D LIBXML2_LIBRARY="{install}/lib/libxml2.so"          \
             -D PCRE2_INCLUDE_DIR="{install}/include"               \
             -D PCRE2_LIBRARY="{install}/lib/libpcre2-8.so"         \
-            -D CURSES_INCLUDE_DIR="{install}/include"              \
+            -D NCURSES_INCLUDE_DIR="{install}/include"             \
             -D CURSES_LIBRARY="{install}/lib/libncurses.a"         \
             -D ZLIB_INCLUDE_DIR="{install}/include"                \
             -D ZLIB_LIBRARY="{install}/lib/libz.so"                \
@@ -376,7 +376,7 @@ platforms:
             -D JSONC_LIBRARY="{install}/lib/libjson-c.a"              \
             -D ENABLE_JSON_SHARED=OFF                                 \
             -D BZIP2_INCLUDE_DIR="{install}/include"                  \
-            -D BZIP2_LIBRARY_RELEASE="{install}/lib/libbz2.a"  \
+            -D BZIP2_LIBRARY_RELEASE="{install}/lib/libbz2.a"         \
             -D OPENSSL_ROOT_DIR="{install}"                           \
             -D OPENSSL_INCLUDE_DIR="{install}/include"                \
             -D OPENSSL_CRYPTO_LIBRARY="{install}/lib/libcrypto.a"     \
@@ -385,7 +385,7 @@ platforms:
             -D LIBXML2_LIBRARY="{install}/lib/libxml2.a"              \
             -D PCRE2_INCLUDE_DIR="{install}/include"                  \
             -D PCRE2_LIBRARY="{install}/lib/libpcre2-8.a"             \
-            -D CURSES_INCLUDE_DIR="{install}/include"                 \
+            -D NCURSES_INCLUDE_DIR="{install}/include"                \
             -D CURSES_LIBRARY="{install}/lib/libncurses.a"            \
             -D ZLIB_INCLUDE_DIR="{install}/include"                   \
             -D ZLIB_LIBRARY="{install}/lib/libz.a"                    \
@@ -451,7 +451,7 @@ platforms:
             -D LIBXML2_LIBRARY="{install}\lib\libxml2.lib"          \
             -D PCRE2_INCLUDE_DIR="{install}\include"                \
             -D PCRE2_LIBRARY="{install}\lib\pcre2-8.lib"            \
-            -D CURSES_INCLUDE_DIR="{install}\include"               \
+            -D PDCURSES_INCLUDE_DIR="{install}\include"             \
             -D CURSES_LIBRARY="{install}\lib\pdcurses.lib"          \
             -D PThreadW32_INCLUDE_DIR="{install}\include"           \
             -D PThreadW32_LIBRARY="{install}\lib\pthreadVC3.lib"    \
@@ -502,7 +502,7 @@ platforms:
             -D LIBXML2_LIBRARY="{install}\lib\libxml2.lib"          \
             -D PCRE2_INCLUDE_DIR="{install}\include"                \
             -D PCRE2_LIBRARY="{install}\lib\pcre2-8.lib"            \
-            -D CURSES_INCLUDE_DIR="{install}\include"               \
+            -D PDCURSES_INCLUDE_DIR="{install}\include"             \
             -D CURSES_LIBRARY="{install}\lib\pdcurses.lib"          \
             -D PThreadW32_INCLUDE_DIR="{install}\include"           \
             -D PThreadW32_LIBRARY="{install}\lib\pthreadVC3.lib"    \

diff --git a/recipes/clamav-1.5.yaml b/recipes/clamav-1.5.yaml
@@ -49,7 +49,7 @@ platforms:
             -D LIBXML2_LIBRARY="{install}/lib/libxml2.dylib"          \
             -D PCRE2_INCLUDE_DIR="{install}/include"                  \
             -D PCRE2_LIBRARY="{install}/lib/libpcre2-8.dylib"         \
-            -D CURSES_INCLUDE_DIR="{install}/include"                 \
+            -D NCURSES_INCLUDE_DIR="{install}/include"                \
             -D CURSES_LIBRARY="{install}/lib/libncurses.a"            \
             -D ZLIB_INCLUDE_DIR="{install}/include"                   \
             -D ZLIB_LIBRARY="{install}/lib/libz.dylib"                \
@@ -116,7 +116,7 @@ platforms:
             -D LIBXML2_LIBRARY="{install}/lib/libxml2.a"          \
             -D PCRE2_INCLUDE_DIR="{install}/include"              \
             -D PCRE2_LIBRARY="{install}/lib/libpcre2-8.a"         \
-            -D CURSES_INCLUDE_DIR="{install}/include"             \
+            -D NCURSES_INCLUDE_DIR="{install}/include"            \
             -D CURSES_LIBRARY="{install}/lib/libncurses.a"        \
             -D ZLIB_INCLUDE_DIR="{install}/include"               \
             -D ZLIB_LIBRARY="{install}/lib/libz.a"                \
@@ -185,7 +185,7 @@ platforms:
             -D LIBXML2_LIBRARY="{install}/lib/libxml2.so"          \
             -D PCRE2_INCLUDE_DIR="{install}/include"               \
             -D PCRE2_LIBRARY="{install}/lib/libpcre2-8.so"         \
-            -D CURSES_INCLUDE_DIR="{install}/include"              \
+            -D NCURSES_INCLUDE_DIR="{install}/include"             \
             -D CURSES_LIBRARY="{install}/lib/libncurses.a"         \
             -D ZLIB_INCLUDE_DIR="{install}/include"                \
             -D ZLIB_LIBRARY="{install}/lib/libz.so"                \
@@ -253,7 +253,7 @@ platforms:
             -D LIBXML2_LIBRARY="{install}/lib/libxml2.a"          \
             -D PCRE2_INCLUDE_DIR="{install}/include"              \
             -D PCRE2_LIBRARY="{install}/lib/libpcre2-8.a"         \
-            -D CURSES_INCLUDE_DIR="{install}/include"             \
+            -D NCURSES_INCLUDE_DIR="{install}/include"            \
             -D CURSES_LIBRARY="{install}/lib/libncurses.a"        \
             -D ZLIB_INCLUDE_DIR="{install}/include"               \
             -D ZLIB_LIBRARY="{install}/lib/libz.a"                \
@@ -323,7 +323,7 @@ platforms:
             -D LIBXML2_LIBRARY="{install}/lib/libxml2.so"          \
             -D PCRE2_INCLUDE_DIR="{install}/include"               \
             -D PCRE2_LIBRARY="{install}/lib/libpcre2-8.so"         \
-            -D CURSES_INCLUDE_DIR="{install}/include"              \
+            -D NCURSES_INCLUDE_DIR="{install}/include"             \
             -D CURSES_LIBRARY="{install}/lib/libncurses.a"         \
             -D ZLIB_INCLUDE_DIR="{install}/include"                \
             -D ZLIB_LIBRARY="{install}/lib/libz.so"                \
@@ -391,7 +391,7 @@ platforms:
             -D LIBXML2_LIBRARY="{install}/lib/libxml2.a"          \
             -D PCRE2_INCLUDE_DIR="{install}/include"              \
             -D PCRE2_LIBRARY="{install}/lib/libpcre2-8.a"         \
-            -D CURSES_INCLUDE_DIR="{install}/include"             \
+            -D NCURSES_INCLUDE_DIR="{install}/include"            \
             -D CURSES_LIBRARY="{install}/lib/libncurses.a"        \
             -D ZLIB_INCLUDE_DIR="{install}/include"               \
             -D ZLIB_LIBRARY="{install}/lib/libz.a"                \
@@ -466,7 +466,7 @@ platforms:
             -D LIBXML2_LIBRARY="{install}\lib\libxml2.lib"               \
             -D PCRE2_INCLUDE_DIR="{install}\include"                     \
             -D PCRE2_LIBRARY="{install}\lib\pcre2-8.lib"                 \
-            -D CURSES_INCLUDE_DIR="{install}\include"                    \
+            -D PDCURSES_INCLUDE_DIR="{install}\include"                  \
             -D CURSES_LIBRARY="{install}\lib\pdcurses.lib"               \
             -D PThreadW32_INCLUDE_DIR="{install}\include"                \
             -D PThreadW32_LIBRARY="{install}\lib\pthreadVC3.lib"         \
@@ -520,7 +520,7 @@ platforms:
             -D LIBXML2_LIBRARY="{install}\lib\libxml2.lib"             \
             -D PCRE2_INCLUDE_DIR="{install}\include"                   \
             -D PCRE2_LIBRARY="{install}\lib\pcre2-8.lib"               \
-            -D CURSES_INCLUDE_DIR="{install}\include"                  \
+            -D PDCURSES_INCLUDE_DIR="{install}\include"                \
             -D CURSES_LIBRARY="{install}\lib\pdcurses.lib"             \
             -D PThreadW32_INCLUDE_DIR="{install}\include"              \
             -D PThreadW32_LIBRARY="{install}\lib\pthreadVC3.lib"       \
@@ -571,7 +571,7 @@ platforms:
             -D LIBXML2_LIBRARY="{install}\lib\libxml2.lib"               \
             -D PCRE2_INCLUDE_DIR="{install}\include"                     \
             -D PCRE2_LIBRARY="{install}\lib\pcre2-8.lib"                 \
-            -D CURSES_INCLUDE_DIR="{install}\include"                    \
+            -D PDCURSES_INCLUDE_DIR="{install}\include"                  \
             -D CURSES_LIBRARY="{install}\lib\pdcurses.lib"               \
             -D PThreadW32_INCLUDE_DIR="{install}\include"                \
             -D PThreadW32_LIBRARY="{install}\lib\pthreadVC3.lib"         \