From faafc2dc94783161a5e2c777a99aed9198498b5e Mon Sep 17 00:00:00 2001 From: Micah Snyder Date: Fri, 9 Aug 2024 17:24:05 -0400 Subject: [PATCH 1/8] libcurl, Windows: disable libidn2 disable pkg-config Curl has an option to use libidn2 in version 8.9.0. Pkg-config may unexpectedly find it and use it. I encountered this on Windows because libidn2 was installed by Strawberry Perl, under C:\Strawberry. Pkg-config found that and tried to build it into Curl, which is problematic in part because we don't want to include or ship libidn2 with our software. But also problematic because libidn2 provided by Strawberry Perl used a different OpenSSL incompatible with the one we're compiling against. This commit explicitly disables pkg-config and libidn2 for libcurl builds. TODO: Perhaps disable pkg-config for all recipes and all platforms? Mussels builds should only draw from other mussels include/lib files. --- recipes/libcurl-8.yaml | 32 ++++++++++++++++++++++++-------- 1 file changed, 24 insertions(+), 8 deletions(-) diff --git a/recipes/libcurl-8.yaml b/recipes/libcurl-8.yaml index 1212b72..89ad71c 100644 --- a/recipes/libcurl-8.yaml +++ b/recipes/libcurl-8.yaml @@ -298,7 +298,9 @@ platforms: -D USE_NGHTTP2=ON \ -D NGHTTP2_INCLUDE_DIR="{includes}" \ -D NGHTTP2_LIBRARY="{libs}/nghttp2.lib" \ - -D BUILD_CURL_EXE=OFF + -D BUILD_CURL_EXE=OFF \ + -D USE_LIBIDN2=OFF \ + -D PKG_CONFIG_EXECUTABLE=none make: | cd build CALL cmake.exe --build . --config Release @@ -337,7 +339,9 @@ platforms: -D USE_NGHTTP2=ON \ -D NGHTTP2_INCLUDE_DIR="{includes}" \ -D NGHTTP2_LIBRARY="{libs}/nghttp2.lib" \ - -D BUILD_CURL_EXE=OFF + -D BUILD_CURL_EXE=OFF \ + -D USE_LIBIDN2=OFF \ + -D PKG_CONFIG_EXECUTABLE=none make: | cd build CALL cmake.exe --build . --config Release @@ -376,7 +380,9 @@ platforms: -D USE_NGHTTP2=ON \ -D NGHTTP2_INCLUDE_DIR="{includes}" \ -D NGHTTP2_LIBRARY="{libs}/nghttp2.lib" \ - -D BUILD_CURL_EXE=OFF + -D BUILD_CURL_EXE=OFF \ + -D USE_LIBIDN2=OFF \ + -D PKG_CONFIG_EXECUTABLE=none make: | cd build CALL cmake.exe --build . --config Release @@ -415,7 +421,9 @@ platforms: -D USE_NGHTTP2=ON \ -D NGHTTP2_INCLUDE_DIR="{includes}" \ -D NGHTTP2_LIBRARY="{libs}/nghttp2.lib" \ - -D BUILD_CURL_EXE=OFF + -D BUILD_CURL_EXE=OFF \ + -D USE_LIBIDN2=OFF \ + -D PKG_CONFIG_EXECUTABLE=none make: | cd build CALL cmake.exe --build . --config Release @@ -454,7 +462,9 @@ platforms: -D USE_NGHTTP2=ON \ -D NGHTTP2_INCLUDE_DIR="{includes}" \ -D NGHTTP2_LIBRARY="{libs}/nghttp2.lib" \ - -D BUILD_CURL_EXE=OFF + -D BUILD_CURL_EXE=OFF \ + -D USE_LIBIDN2=OFF \ + -D PKG_CONFIG_EXECUTABLE=none make: | cd build CALL cmake.exe --build . --config Debug @@ -493,7 +503,9 @@ platforms: -D USE_NGHTTP2=ON \ -D NGHTTP2_INCLUDE_DIR="{includes}" \ -D NGHTTP2_LIBRARY="{libs}/nghttp2.lib" \ - -D BUILD_CURL_EXE=OFF + -D BUILD_CURL_EXE=OFF \ + -D USE_LIBIDN2=OFF \ + -D PKG_CONFIG_EXECUTABLE=none make: | cd build CALL cmake.exe --build . --config Debug @@ -532,7 +544,9 @@ platforms: -D USE_NGHTTP2=ON \ -D NGHTTP2_INCLUDE_DIR="{includes}" \ -D NGHTTP2_LIBRARY="{libs}/nghttp2.lib" \ - -D BUILD_CURL_EXE=OFF + -D BUILD_CURL_EXE=OFF \ + -D USE_LIBIDN2=OFF \ + -D PKG_CONFIG_EXECUTABLE=none make: | cd build CALL cmake.exe --build . --config Debug @@ -571,7 +585,9 @@ platforms: -D USE_NGHTTP2=ON \ -D NGHTTP2_INCLUDE_DIR="{includes}" \ -D NGHTTP2_LIBRARY="{libs}/nghttp2.lib" \ - -D BUILD_CURL_EXE=OFF + -D BUILD_CURL_EXE=OFF \ + -D USE_LIBIDN2=OFF \ + -D PKG_CONFIG_EXECUTABLE=none make: | cd build CALL cmake.exe --build . --config Debug From cfeda2429f0624691a5df23f484e091a6a802e00 Mon Sep 17 00:00:00 2001 From: Micah Snyder Date: Sat, 31 Aug 2024 12:41:35 -0400 Subject: [PATCH 2/8] Bump versions for nghttp2, libxml2 nghttp2 -> 1.63.0 libxml2 -> 2.13.3 --- recipes/libnghttp2-1.yaml | 4 ++-- recipes/libxml2-2.10.yaml | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/recipes/libnghttp2-1.yaml b/recipes/libnghttp2-1.yaml index 79ef723..8af9fe0 100644 --- a/recipes/libnghttp2-1.yaml +++ b/recipes/libnghttp2-1.yaml @@ -13,8 +13,8 @@ # limitations under the License. name: libnghttp2 -version: "1.62.1" -url: https://github.com/nghttp2/nghttp2/archive/refs/tags/v1.62.1.zip +version: "1.63.0" +url: https://github.com/nghttp2/nghttp2/archive/refs/tags/v1.63.0.zip archive_name_change: - v - nghttp2- diff --git a/recipes/libxml2-2.10.yaml b/recipes/libxml2-2.10.yaml index e4342d6..94097a7 100644 --- a/recipes/libxml2-2.10.yaml +++ b/recipes/libxml2-2.10.yaml @@ -13,11 +13,11 @@ # limitations under the License. name: libxml2 -version: "2.12.8" -url: https://gitlab.gnome.org/GNOME/libxml2/-/archive/v2.12.8/libxml2-v2.12.8.tar.gz -archive_name_change: - - libxml2-v2.13.0-cdd2575f7fbab1d8162600f4048bc37503c80e28 - - libxml2-v2.12.8 +version: "2.13.3" +url: https://gitlab.gnome.org/GNOME/libxml2/-/archive/v2.13.3/libxml2-v2.13.3.tar.gz +# archive_name_change: +# - libxml2-v2.13.3-cdd2575f7fbab1d8162600f4048bc37503c80e28 +# - libxml2-v2.13.3 mussels_version: "0.3" type: recipe platforms: From f86ffaa3333ccc8e230f5ff569ac9af589e7db23 Mon Sep 17 00:00:00 2001 From: Micah Snyder Date: Sat, 31 Aug 2024 14:33:12 -0400 Subject: [PATCH 3/8] libcurl, Windows: copy DLL from bin to lib, instead of move Because of possible linking path issues --- recipes/libcurl-8.yaml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/recipes/libcurl-8.yaml b/recipes/libcurl-8.yaml index 89ad71c..3831d45 100644 --- a/recipes/libcurl-8.yaml +++ b/recipes/libcurl-8.yaml @@ -307,7 +307,7 @@ platforms: install: | cd build CALL cmake.exe --build . --config Release --target install - mv {install}/bin/libcurl.dll {install}/lib/ + cp {install}/bin/libcurl.dll {install}/lib/ dependencies: - libopenssl - libnghttp2>=1.0.0 @@ -348,7 +348,7 @@ platforms: install: | cd build CALL cmake.exe --build . --config Release --target install - mv {install}/bin/libcurl.dll {install}/lib/ + cp {install}/bin/libcurl.dll {install}/lib/ dependencies: - libopenssl - libnghttp2>=1.0.0 @@ -389,7 +389,7 @@ platforms: install: | cd build CALL cmake.exe --build . --config Release --target install - mv {install}/bin/libcurl.dll {install}/lib/ + cp {install}/bin/libcurl.dll {install}/lib/ dependencies: - libopenssl - libnghttp2>=1.0.0 @@ -430,7 +430,7 @@ platforms: install: | cd build CALL cmake.exe --build . --config Release --target install - mv {install}/bin/libcurl.dll {install}/lib/ + cp {install}/bin/libcurl.dll {install}/lib/ dependencies: - libopenssl - libnghttp2>=1.0.0 @@ -471,7 +471,7 @@ platforms: install: | cd build CALL cmake.exe --build . --config Debug --target install - mv {install}/bin/libcurl-d.dll {install}/lib/ + cp {install}/bin/libcurl-d.dll {install}/lib/ dependencies: - libopenssl - libnghttp2>=1.0.0 @@ -512,7 +512,7 @@ platforms: install: | cd build CALL cmake.exe --build . --config Debug --target install - mv {install}/bin/libcurl-d.dll {install}/lib/ + cp {install}/bin/libcurl-d.dll {install}/lib/ dependencies: - libopenssl - libnghttp2>=1.0.0 @@ -553,7 +553,7 @@ platforms: install: | cd build CALL cmake.exe --build . --config Debug --target install - mv {install}/bin/libcurl-d.dll {install}/lib/ + cp {install}/bin/libcurl-d.dll {install}/lib/ dependencies: - libopenssl - libnghttp2>=1.0.0 @@ -594,7 +594,7 @@ platforms: install: | cd build CALL cmake.exe --build . --config Debug --target install - mv {install}/bin/libcurl-d.dll {install}/lib/ + cp {install}/bin/libcurl-d.dll {install}/lib/ dependencies: - libopenssl - libnghttp2>=1.0.0 From 54e1af97c23f458c8acfbaa28b41502134e92a81 Mon Sep 17 00:00:00 2001 From: Micah Snyder Date: Sat, 31 Aug 2024 14:39:47 -0400 Subject: [PATCH 4/8] libnghttp2, macOS: fix compat issue with newer Xcode Xcode dropped support for 'buildsystem=1' option. Disable building docs on unix systems and ensure only building library. The docs build is what was failing the Xcode "new build system" build. --- recipes/libnghttp2-1.yaml | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/recipes/libnghttp2-1.yaml b/recipes/libnghttp2-1.yaml index 8af9fe0..dfa144f 100644 --- a/recipes/libnghttp2-1.yaml +++ b/recipes/libnghttp2-1.yaml @@ -28,7 +28,7 @@ platforms: mkdir build cd build cmake .. \ - -G Xcode -T buildsystem=1 \ + -G Xcode \ -D CMAKE_OSX_ARCHITECTURES="arm64;x86_64" \ -D OPENSSL_ROOT_DIR="{install}" \ -D OPENSSL_INCLUDE_DIRS="{includes}" \ @@ -41,7 +41,7 @@ platforms: -D ZLIB_LIBRARY="{libs}/libz.a" \ -D CMAKE_INSTALL_PREFIX="{install}" \ -D BUILD_SHARED_LIBS=ON -D BUILD_STATIC_LIBS=OFF \ - -D ENABLE_LIB_ONLY=ON -D BUILD_TESTING=OFF + -D ENABLE_LIB_ONLY=ON -D BUILD_TESTING=OFF -D ENABLE_DOC=OFF make: | cd build cmake --build . --config RelWithDebInfo @@ -66,7 +66,7 @@ platforms: mkdir build cd build cmake .. \ - -G Xcode -T buildsystem=1 \ + -G Xcode \ -D CMAKE_OSX_ARCHITECTURES="arm64;x86_64" \ -D OPENSSL_ROOT_DIR="{install}" \ -D OPENSSL_INCLUDE_DIRS="{includes}" \ @@ -79,7 +79,7 @@ platforms: -D ZLIB_LIBRARY="{libs}/libz.a" \ -D CMAKE_INSTALL_PREFIX="{install}" \ -D BUILD_SHARED_LIBS=OFF -D BUILD_STATIC_LIBS=ON \ - -D ENABLE_LIB_ONLY=ON -D BUILD_TESTING=OFF + -D ENABLE_LIB_ONLY=ON -D BUILD_TESTING=OFF -D ENABLE_DOC=OFF make: | cd build cmake --build . --config RelWithDebInfo @@ -106,6 +106,7 @@ platforms: cmake .. \ -D CMAKE_BUILD_TYPE=Release \ -D BUILD_SHARED_LIBS=ON \ + -D ENABLE_LIB_ONLY=ON -D BUILD_TESTING=OFF -D ENABLE_DOC=OFF \ -D OPENSSL_ROOT_DIR="{install}" \ -D OPENSSL_INCLUDE_DIRS="{includes}" \ -D OPENSSL_LIBRARIES="{libs}" \ @@ -144,7 +145,7 @@ platforms: -D CMAKE_BUILD_TYPE=Release \ -D BUILD_SHARED_LIBS=OFF \ -D BUILD_STATIC_LIBS=ON \ - -D BUILD_TESTING=OFF \ + -D ENABLE_LIB_ONLY=ON -D BUILD_TESTING=OFF -D ENABLE_DOC=OFF \ -D OPENSSL_ROOT_DIR="{install}" \ -D OPENSSL_INCLUDE_DIRS="{includes}" \ -D OPENSSL_LIBRARIES="{libs}" \ @@ -186,6 +187,7 @@ platforms: cmake .. \ -D CMAKE_BUILD_TYPE=Release \ -D BUILD_SHARED_LIBS=ON \ + -D ENABLE_LIB_ONLY=ON -D BUILD_TESTING=OFF -D ENABLE_DOC=OFF \ -D OPENSSL_ROOT_DIR="{install}" \ -D OPENSSL_INCLUDE_DIRS="{includes}" \ -D OPENSSL_LIBRARIES="{libs}" \ @@ -232,7 +234,7 @@ platforms: -D ZLIB_ROOT="{includes}" \ -D ZLIB_LIBRARY="{libs}/libz.a" \ -D CMAKE_INSTALL_PREFIX="{install}" \ - -D ENABLE_LIB_ONLY=ON \ + -D ENABLE_LIB_ONLY=ON -D BUILD_TESTING=OFF -D ENABLE_DOC=OFF \ -D ENABLE_STATIC_LIB=ON \ -D ENABLE_SHARED_LIB=OFF \ -D CMAKE_POSITION_INDEPENDENT_CODE=ON \ @@ -263,6 +265,7 @@ platforms: CALL cmake.exe .. -G "{visualstudio.cmake_generator}" -A ARM \ -D CMAKE_INSTALL_PREFIX="{install}" \ -D BUILD_SHARED_LIBS=ON \ + -D ENABLE_LIB_ONLY=ON \ -D OPENSSL_ROOT_DIR="{install}" \ -D OPENSSL_INCLUDE_DIR="{includes}" \ -D LIB_EAY_RELEASE="{libs}/libcrypto.lib" \ @@ -293,6 +296,7 @@ platforms: CALL cmake.exe .. -G "{visualstudio.cmake_generator}" -A ARM64 \ -D CMAKE_INSTALL_PREFIX="{install}" \ -D BUILD_SHARED_LIBS=ON \ + -D ENABLE_LIB_ONLY=ON \ -D OPENSSL_ROOT_DIR="{install}" \ -D OPENSSL_INCLUDE_DIRS="{includes}" \ -D LIB_EAY_RELEASE="{libs}/libcrypto.lib" \ @@ -323,6 +327,7 @@ platforms: CALL cmake.exe .. -G "{visualstudio.cmake_generator}" -A x64 \ -D CMAKE_INSTALL_PREFIX="{install}" \ -D BUILD_SHARED_LIBS=ON \ + -D ENABLE_LIB_ONLY=ON \ -D OPENSSL_ROOT_DIR="{install}" \ -D OPENSSL_INCLUDE_DIRS="{includes}" \ -D LIB_EAY_RELEASE="{libs}/libcrypto.lib" \ @@ -353,6 +358,7 @@ platforms: CALL cmake.exe .. -G "{visualstudio.cmake_generator}" -A Win32 \ -D CMAKE_INSTALL_PREFIX="{install}" \ -D BUILD_SHARED_LIBS=ON \ + -D ENABLE_LIB_ONLY=ON \ -D OPENSSL_ROOT_DIR="{install}" \ -D OPENSSL_INCLUDE_DIR="{includes}" \ -D LIB_EAY_RELEASE="{libs}/libcrypto.lib" \ @@ -383,6 +389,7 @@ platforms: CALL cmake.exe .. -G "{visualstudio.cmake_generator}" -A ARM \ -D CMAKE_INSTALL_PREFIX="{install}" \ -D BUILD_SHARED_LIBS=ON \ + -D ENABLE_LIB_ONLY=ON \ -D OPENSSL_ROOT_DIR="{install}" \ -D OPENSSL_INCLUDE_DIR="{includes}" \ -D LIB_EAY_RELEASE="{libs}/libcrypto.lib" \ @@ -413,6 +420,7 @@ platforms: CALL cmake.exe .. -G "{visualstudio.cmake_generator}" -A ARM64 \ -D CMAKE_INSTALL_PREFIX="{install}" \ -D BUILD_SHARED_LIBS=ON \ + -D ENABLE_LIB_ONLY=ON \ -D OPENSSL_ROOT_DIR="{install}" \ -D OPENSSL_INCLUDE_DIRS="{includes}" \ -D LIB_EAY_RELEASE="{libs}/libcrypto.lib" \ @@ -443,6 +451,7 @@ platforms: CALL cmake.exe .. -G "{visualstudio.cmake_generator}" -A x64 \ -D CMAKE_INSTALL_PREFIX="{install}" \ -D BUILD_SHARED_LIBS=ON \ + -D ENABLE_LIB_ONLY=ON \ -D OPENSSL_ROOT_DIR="{install}" \ -D OPENSSL_INCLUDE_DIRS="{includes}" \ -D LIB_EAY_RELEASE="{libs}/libcrypto.lib" \ @@ -473,6 +482,7 @@ platforms: CALL cmake.exe .. -G "{visualstudio.cmake_generator}" -A Win32 \ -D CMAKE_INSTALL_PREFIX="{install}" \ -D BUILD_SHARED_LIBS=ON \ + -D ENABLE_LIB_ONLY=ON \ -D OPENSSL_ROOT_DIR="{install}" \ -D OPENSSL_INCLUDE_DIR="{includes}" \ -D LIB_EAY_RELEASE="{libs}/libcrypto.lib" \ From 05f4d0a68fff743adf5f07c1b03f0f9efd28001f Mon Sep 17 00:00:00 2001 From: Micah Snyder Date: Sat, 31 Aug 2024 13:36:30 -0400 Subject: [PATCH 5/8] Add GitHub Workflows to test changes --- .github/workflows/build.yml | 177 ++++++ collections/clamav_deps-1.1.yaml | 109 ---- ...mav_deps-1.2.yaml => clamav_deps-1.5.yaml} | 2 +- ..._deps-1.1.yaml => libclamav_deps-1.5.yaml} | 2 +- recipes/clamav-1.0.yaml | 2 +- recipes/clamav-1.1.yaml | 532 ------------------ recipes/{clamav-1.2.yaml => clamav-1.5.yaml} | 317 +++++++---- 7 files changed, 373 insertions(+), 768 deletions(-) create mode 100644 .github/workflows/build.yml delete mode 100644 collections/clamav_deps-1.1.yaml rename collections/{clamav_deps-1.2.yaml => clamav_deps-1.5.yaml} (99%) rename collections/{libclamav_deps-1.1.yaml => libclamav_deps-1.5.yaml} (99%) delete mode 100644 recipes/clamav-1.1.yaml rename recipes/{clamav-1.2.yaml => clamav-1.5.yaml} (82%) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml new file mode 100644 index 0000000..9da66f2 --- /dev/null +++ b/.github/workflows/build.yml @@ -0,0 +1,177 @@ +name: ClamAV Build Test + +on: + pull_request: + branches: + - master + +jobs: + build-windows-x64: + runs-on: windows-2019 + + steps: + - name: Remove link.exe to avoid conflict with Visual Studio linker + run: rm /usr/bin/link.exe + shell: bash + + - uses: actions/checkout@v4 + + - name: Install Choco Things + uses: crazy-max/ghaction-chocolatey@v3 + with: + args: install nasm + + - name: Install Python Things + run: python3 -m pip install pytest mussels + + - name: Install Rust for cross-compiling to arm64 + run: rustup target add aarch64-pc-windows-msvc + + - uses: lukka/get-cmake@v3.30.3 + + - name: Build for x64 + run: msl build -r clamav -t x64 + + # TODO: add test step that clones clamav, sets environment variables, and runs tests + + build-windows-x86: + runs-on: windows-2019 + + steps: + - name: Remove link.exe to avoid conflict with Visual Studio linker + run: rm /usr/bin/link.exe + shell: bash + + - uses: actions/checkout@v4 + + - name: Install Choco Things + uses: crazy-max/ghaction-chocolatey@v3 + with: + args: install nasm + + - name: Install Python Things + run: python3 -m pip install pytest mussels + + - name: Install Rust for cross-compiling to arm64 + run: rustup target add aarch64-pc-windows-msvc + + - uses: lukka/get-cmake@v3.30.3 + + - name: Build for x86 + run: msl build -r clamav -t x86 + + # TODO: add test step that clones clamav, sets environment variables, and runs tests + + build-windows-arm64: + runs-on: windows-2019 + + steps: + - name: Remove link.exe to avoid conflict with Visual Studio linker + run: rm /usr/bin/link.exe + shell: bash + + - uses: actions/checkout@v4 + + - name: Install Choco Things + uses: crazy-max/ghaction-chocolatey@v3 + with: + args: install nasm + + - name: Install Python Things + run: python3 -m pip install pytest mussels + + - name: Install Rust for cross-compiling to arm64 + run: rustup target add aarch64-pc-windows-msvc + + - uses: lukka/get-cmake@v3.30.3 + + - name: Build for arm64 + run: msl build -r clamav -t arm64 + + # TODO: add test step that clones clamav, sets environment variables, and runs tests + + build-macos-dynamic: + runs-on: macos-latest + + steps: + - uses: actions/checkout@v4 + + - name: Install Brew Things + run: brew install bison flex + + - name: Install Python Things + run: python3 -m pip install mussels pytest setuptools --break-system-packages + + - uses: lukka/get-cmake@v3.30.3 + + - name: Build for using dynamic libraries for host platform + shell: bash + run: msl build -r clamav -t host + + # TODO: add test step that clones clamav, sets environment variables, and runs tests + + build-macos-static: + runs-on: macos-latest + + steps: + - uses: actions/checkout@v4 + + - name: Install Brew Things + run: brew install bison flex + + - name: Install Python Things + run: python3 -m pip install mussels pytest setuptools --break-system-packages + + - uses: lukka/get-cmake@v3.30.3 + + - name: Build for using static libraries for host platform + shell: bash + run: msl build -r clamav -t host-static + + # TODO: add test step that clones clamav, sets environment variables, and runs tests + + build-ubuntu-dynamic: + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v4 + + - name: Update package listings + run: sudo apt-get update + + - name: Install Apt-get Things + run: sudo apt-get install -y bison flex valgrind pipx + + - name: Install Python Things + run: pipx install pytest mussels + + - uses: lukka/get-cmake@v3.30.3 + + - name: Build for using dynamic libraries for host platform + shell: bash + run: msl build -r clamav -t host + + # TODO: add test step that clones clamav, sets environment variables, and runs tests + + build-ubuntu-static: + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v4 + + - name: Update package listings + run: sudo apt-get update + + - name: Install Apt-get Things + run: sudo apt-get install -y bison flex valgrind pipx + + - name: Install Python Things + run: pipx install pytest mussels + + - uses: lukka/get-cmake@v3.30.3 + + - name: Build for using static libraries for host platform + shell: bash + run: msl build -r clamav -t host-static + + # TODO: add test step that clones clamav, sets environment variables, and runs tests diff --git a/collections/clamav_deps-1.1.yaml b/collections/clamav_deps-1.1.yaml deleted file mode 100644 index 49de7ea..0000000 --- a/collections/clamav_deps-1.1.yaml +++ /dev/null @@ -1,109 +0,0 @@ -# Copyright (C) 2020 Cisco Systems, Inc. and/or its affiliates. All rights reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -name: clamav_deps -version: "1.1" -mussels_version: "0.2" -type: collection -platforms: - Linux: - host: - dependencies: - - libz - - libcurl - - libjson_c - - libxml2 - - libopenssl - - libpcre2 - - libbz2<1.1.0 - host-static: - dependencies: - - libz - - libcurl - - libjson_c - - libxml2 - - libopenssl - - libpcre2 - - libbz2<1.1.0 - - libcheck - - ncurses - Freebsd: - host: - dependencies: - - libz - - libcurl - - libjson_c - - libxml2 - - libopenssl - - libpcre2 - - libbz2<1.1.0 - host-static: - dependencies: - - libz - - libcurl - - libjson_c - - libxml2 - - libopenssl - - libpcre2 - - libbz2<1.1.0 - - libcheck - - ncurses - Darwin: - host: - dependencies: - - libz - - libcurl - - libjson_c - - libxml2 - - libopenssl - - libpcre2 - - libbz2<1.1.0 - - libcheck - - ncurses - host-static: - dependencies: - - libz - - libcurl - - libjson_c - - libxml2 - - libopenssl - - libpcre2 - - libbz2<1.1.0 - - libcheck - - ncurses - Windows: - x64: - dependencies: - - libz - - libcurl - - libjson_c - - pthreads_win32 - - libxml2 - - libopenssl - - libpcre2 - - libbz2<1.1.0 - - pdcurses - - libcheck - x86: - dependencies: - - libz - - libcurl - - libjson_c - - pthreads_win32 - - libxml2 - - libopenssl - - libpcre2 - - libbz2<1.1.0 - - pdcurses - - libcheck diff --git a/collections/clamav_deps-1.2.yaml b/collections/clamav_deps-1.5.yaml similarity index 99% rename from collections/clamav_deps-1.2.yaml rename to collections/clamav_deps-1.5.yaml index 2f5f0b2..7d38233 100644 --- a/collections/clamav_deps-1.2.yaml +++ b/collections/clamav_deps-1.5.yaml @@ -13,7 +13,7 @@ # limitations under the License. name: clamav_deps -version: "1.2" +version: "1.5" mussels_version: "0.2" type: collection platforms: diff --git a/collections/libclamav_deps-1.1.yaml b/collections/libclamav_deps-1.5.yaml similarity index 99% rename from collections/libclamav_deps-1.1.yaml rename to collections/libclamav_deps-1.5.yaml index cc06052..0ca3d0f 100644 --- a/collections/libclamav_deps-1.1.yaml +++ b/collections/libclamav_deps-1.5.yaml @@ -13,7 +13,7 @@ # limitations under the License. name: libclamav_deps -version: "1.1" +version: "1.5" mussels_version: "0.2" type: collection platforms: diff --git a/recipes/clamav-1.0.yaml b/recipes/clamav-1.0.yaml index 4647f7b..90d3159 100644 --- a/recipes/clamav-1.0.yaml +++ b/recipes/clamav-1.0.yaml @@ -505,7 +505,7 @@ platforms: -D CURSES_INCLUDE_DIR="{install}\include" \ -D CURSES_LIBRARY="{install}\lib\pdcurses.lib" \ -D PThreadW32_INCLUDE_DIR="{install}\include" \ - -D PThreadW32_LIBRARY="{install}\lib\pthreadVC2.lib" \ + -D PThreadW32_LIBRARY="{install}\lib\pthreadVC3.lib" \ -D ZLIB_INCLUDE_DIR="{install}\include" \ -D ZLIB_LIBRARY="{install}\lib\zlibstatic.lib" \ -D LIBCHECK_INCLUDE_DIR="{install}\include" \ diff --git a/recipes/clamav-1.1.yaml b/recipes/clamav-1.1.yaml deleted file mode 100644 index 7332baa..0000000 --- a/recipes/clamav-1.1.yaml +++ /dev/null @@ -1,532 +0,0 @@ -# Copyright (C) 2020 Cisco Systems, Inc. and/or its affiliates. All rights reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -# TODO: Rewrite this to use the new CMake build system, when unit test support is complete. -name: clamav -version: "1.1.0" -url: https://github.com/Cisco-Talos/clamav/archive/rel/1.1.zip -archive_name_change: - - "1.1.0" - - clamav-rel-1.1 -mussels_version: "0.2" -type: recipe -platforms: - Darwin: - host: - build_script: - configure: | - mkdir build - cd build - cmake .. \ - -D CMAKE_INSTALL_PREFIX="{install}" \ - -D CMAKE_MODULE_PATH={install}/lib/cmake \ - -D CMAKE_BUILD_TYPE=Release \ - -D ENABLE_EXAMPLES=OFF \ - -D JSONC_INCLUDE_DIR="{install}/include/json-c" \ - -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 CURL_INCLUDE_DIR="{install}/include" \ - -D CURL_LIBRARY="{install}/lib/libcurl.dylib" \ - -D OPENSSL_ROOT_DIR="{install}" \ - -D OPENSSL_INCLUDE_DIR="{install}/include" \ - -D OPENSSL_CRYPTO_LIBRARY="{install}/lib/libcrypto.dylib" \ - -D OPENSSL_SSL_LIBRARY="{install}/lib/libssl.dylib" \ - -D LIBXML2_INCLUDE_DIR="{install}/include/libxml2" \ - -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 CURSES_LIBRARY="{install}/lib/libncurses.a" \ - -D ZLIB_INCLUDE_DIR="{install}/include" \ - -D ZLIB_LIBRARY="{install}/lib/libz.dylib" \ - -D LIBCHECK_INCLUDE_DIR="{install}/include" \ - -D LIBCHECK_LIBRARY="{install}/lib/libcheck.dylib" - make: | - cd build - cmake --build . - install: | - cd build - cmake --build . --target install - install_name_tool -add_rpath @executable_path/../lib "{install}/lib/libclamunrar_iface.so" - install_name_tool -add_rpath @executable_path/../lib "{install}/lib/libfreshclam.dylib" - install_name_tool -add_rpath @executable_path/../lib "{install}/lib/libclamav.dylib" - install_name_tool -add_rpath @executable_path/../lib "{install}/bin/clambc" - install_name_tool -add_rpath @executable_path/../lib "{install}/bin/clamconf" - install_name_tool -add_rpath @executable_path/../lib "{install}/bin/clamdscan" - install_name_tool -add_rpath @executable_path/../lib "{install}/bin/clamscan" - install_name_tool -add_rpath @executable_path/../lib "{install}/bin/clamsubmit" - install_name_tool -add_rpath @executable_path/../lib "{install}/bin/freshclam" - install_name_tool -add_rpath @executable_path/../lib "{install}/bin/sigtool" - install_name_tool -add_rpath @executable_path/../lib "{install}/sbin/clamd" - dependencies: - - libz - - libcurl - - libjson_c - - libxml2 - - libopenssl - - libpcre2 - - libbz2<1.1.0 - - libcheck - - ncurses - install_paths: - license/clamav: - - COPYING* - required_tools: - - make - - clang - - pkgconfig - - cmake - host-static: - build_script: - configure: | - mkdir build - cd build - cmake .. \ - -D CMAKE_FIND_PACKAGE_PREFER_CONFIG=TRUE \ - -D CMAKE_PREFIX_PATH={install} \ - -D CMAKE_INSTALL_PREFIX="{install}" \ - -D CMAKE_MODULE_PATH={install}/lib/cmake \ - -D CMAKE_BUILD_TYPE=Release \ - -D ENABLE_EXAMPLES=OFF \ - -D JSONC_INCLUDE_DIR="{install}/include/json-c" \ - -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 OPENSSL_ROOT_DIR="{install}" \ - -D OPENSSL_INCLUDE_DIR="{install}/include" \ - -D OPENSSL_CRYPTO_LIBRARY="{install}/lib/libcrypto.a" \ - -D OPENSSL_SSL_LIBRARY="{install}/lib/libssl.a" \ - -D LIBXML2_INCLUDE_DIR="{install}/include/libxml2" \ - -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 CURSES_LIBRARY="{install}/lib/libncurses.a" \ - -D ZLIB_INCLUDE_DIR="{install}/include" \ - -D ZLIB_LIBRARY="{install}/lib/libz.a" \ - -D LIBCHECK_INCLUDE_DIR="{install}/include" \ - -D LIBCHECK_LIBRARY="{install}/lib/libcheck.a" - make: | - cd build - cmake --build . - install: | - cd build - cmake --build . --target install - install_name_tool -add_rpath @executable_path/../lib "{install}/lib/libclamunrar_iface.so" - install_name_tool -add_rpath @executable_path/../lib "{install}/lib/libfreshclam.dylib" - install_name_tool -add_rpath @executable_path/../lib "{install}/lib/libclamav.dylib" - install_name_tool -add_rpath @executable_path/../lib "{install}/bin/clambc" - install_name_tool -add_rpath @executable_path/../lib "{install}/bin/clamconf" - install_name_tool -add_rpath @executable_path/../lib "{install}/bin/clamdscan" - install_name_tool -add_rpath @executable_path/../lib "{install}/bin/clamscan" - install_name_tool -add_rpath @executable_path/../lib "{install}/bin/clamsubmit" - install_name_tool -add_rpath @executable_path/../lib "{install}/bin/freshclam" - install_name_tool -add_rpath @executable_path/../lib "{install}/bin/sigtool" - install_name_tool -add_rpath @executable_path/../lib "{install}/sbin/clamd" - dependencies: - - libz - - libcurl - - libjson_c - - libxml2 - - libopenssl - - libpcre2 - - libbz2 - - libcheck - - ncurses - install_paths: - license/clamav: - - COPYING* - required_tools: - - make - - clang - - pkgconfig - - cmake - Linux: - host: - build_script: - configure: | - mkdir build - cd build - cmake .. \ - -D CMAKE_INSTALL_PREFIX="{install}" \ - -D CMAKE_MODULE_PATH={install}/lib/cmake \ - -D CMAKE_BUILD_TYPE=Release \ - -D ENABLE_EXAMPLES=OFF \ - -D ENABLE_SYSTEMD=OFF \ - -D JSONC_INCLUDE_DIR="{install}/include/json-c" \ - -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 CURL_INCLUDE_DIR="{install}/include" \ - -D CURL_LIBRARY="{install}/lib/libcurl.so" \ - -D OPENSSL_ROOT_DIR="{install}" \ - -D OPENSSL_INCLUDE_DIR="{install}/include" \ - -D OPENSSL_CRYPTO_LIBRARY="{install}/lib/libcrypto.so" \ - -D OPENSSL_SSL_LIBRARY="{install}/lib/libssl.so" \ - -D LIBXML2_INCLUDE_DIR="{install}/include/libxml2" \ - -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 CURSES_LIBRARY="{install}/lib/libncurses.a" \ - -D ZLIB_INCLUDE_DIR="{install}/include" \ - -D ZLIB_LIBRARY="{install}/lib/libz.so" \ - -D LIBCHECK_INCLUDE_DIR="{install}/include" \ - -D LIBCHECK_LIBRARY="{install}/lib/libcheck.so" - make: | - cd build - cmake --build . - install: | - cd build - cmake --build . --target install - patchelf --set-rpath '$ORIGIN/../lib' "{install}/lib/libclamunrar_iface.so" - patchelf --set-rpath '$ORIGIN/../lib' "{install}/lib/libfreshclam.so" - patchelf --set-rpath '$ORIGIN/../lib' "{install}/lib/libclamav.so" - patchelf --set-rpath '$ORIGIN/../lib' "{install}/bin/clambc" - patchelf --set-rpath '$ORIGIN/../lib' "{install}/bin/clamconf" - patchelf --set-rpath '$ORIGIN/../lib' "{install}/bin/clamdscan" - patchelf --set-rpath '$ORIGIN/../lib' "{install}/bin/clamscan" - patchelf --set-rpath '$ORIGIN/../lib' "{install}/bin/clamsubmit" - patchelf --set-rpath '$ORIGIN/../lib' "{install}/bin/freshclam" - patchelf --set-rpath '$ORIGIN/../lib' "{install}/bin/sigtool" - patchelf --set-rpath '$ORIGIN/../lib' "{install}/sbin/clamd" - dependencies: - - libz - - libcurl - - libjson_c - - libxml2 - - libopenssl - - libpcre2 - - libbz2<1.1.0 - - libcheck - - ncurses - install_paths: - license/clamav: - - COPYING* - required_tools: - - make - - gcc - - patchelf - - pkgconfig - - cmake - host-static: - build_script: - configure: | - mkdir build - cd build - cmake .. \ - -D CMAKE_FIND_PACKAGE_PREFER_CONFIG=TRUE \ - -D CMAKE_PREFIX_PATH={install} \ - -D CMAKE_INSTALL_PREFIX="{install}" \ - -D CMAKE_MODULE_PATH={install}/lib/cmake \ - -D CMAKE_BUILD_TYPE=Release \ - -D ENABLE_EXAMPLES=OFF \ - -D JSONC_INCLUDE_DIR="{install}/include/json-c" \ - -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 OPENSSL_ROOT_DIR="{install}" \ - -D OPENSSL_INCLUDE_DIR="{install}/include" \ - -D OPENSSL_CRYPTO_LIBRARY="{install}/lib/libcrypto.a" \ - -D OPENSSL_SSL_LIBRARY="{install}/lib/libssl.a" \ - -D LIBXML2_INCLUDE_DIR="{install}/include/libxml2" \ - -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 CURSES_LIBRARY="{install}/lib/libncurses.a" \ - -D ZLIB_INCLUDE_DIR="{install}/include" \ - -D ZLIB_LIBRARY="{install}/lib/libz.a" \ - -D LIBCHECK_INCLUDE_DIR="{install}/include" \ - -D LIBCHECK_LIBRARY="{install}/lib/libcheck.a" - make: | - cd build - cmake --build . - install: | - cd build - cmake --build . --target install - patchelf --set-rpath '$ORIGIN/../lib' "{install}/lib/libclamunrar_iface.so" - patchelf --set-rpath '$ORIGIN/../lib' "{install}/lib/libfreshclam.so" - patchelf --set-rpath '$ORIGIN/../lib' "{install}/lib/libclamav.so" - patchelf --set-rpath '$ORIGIN/../lib' "{install}/bin/clambc" - patchelf --set-rpath '$ORIGIN/../lib' "{install}/bin/clamconf" - patchelf --set-rpath '$ORIGIN/../lib' "{install}/bin/clamdscan" - patchelf --set-rpath '$ORIGIN/../lib' "{install}/bin/clamscan" - patchelf --set-rpath '$ORIGIN/../lib' "{install}/bin/clamsubmit" - patchelf --set-rpath '$ORIGIN/../lib' "{install}/bin/freshclam" - patchelf --set-rpath '$ORIGIN/../lib' "{install}/bin/sigtool" - patchelf --set-rpath '$ORIGIN/../lib' "{install}/sbin/clamd" - dependencies: - - libz - - libcurl - - libjson_c - - libxml2 - - libopenssl - - libpcre2 - - libbz2 - - libcheck - - ncurses - install_paths: - license/clamav: - - COPYING* - required_tools: - - make - - gcc - - patchelf - - pkgconfig - - cmake - Freebsd: - host: - build_script: - configure: | - mkdir build - cd build - cmake .. \ - -D CMAKE_INSTALL_PREFIX="{install}" \ - -D CMAKE_MODULE_PATH={install}/lib/cmake \ - -D CMAKE_BUILD_TYPE=Release \ - -D ENABLE_EXAMPLES=OFF \ - -D ENABLE_SYSTEMD=OFF \ - -D JSONC_INCLUDE_DIR="{install}/include/json-c" \ - -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 CURL_INCLUDE_DIR="{install}/include" \ - -D CURL_LIBRARY="{install}/lib/libcurl.so" \ - -D OPENSSL_ROOT_DIR="{install}" \ - -D OPENSSL_INCLUDE_DIR="{install}/include" \ - -D OPENSSL_CRYPTO_LIBRARY="{install}/lib/libcrypto.so" \ - -D OPENSSL_SSL_LIBRARY="{install}/lib/libssl.so" \ - -D LIBXML2_INCLUDE_DIR="{install}/include/libxml2" \ - -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 CURSES_LIBRARY="{install}/lib/libncurses.a" \ - -D ZLIB_INCLUDE_DIR="{install}/include" \ - -D ZLIB_LIBRARY="{install}/lib/libz.so" \ - -D LIBCHECK_INCLUDE_DIR="{install}/include" \ - -D LIBCHECK_LIBRARY="{install}/lib/libcheck.so" - make: | - cd build - cmake --build . - install: | - cd build - cmake --build . --target install - patchelf --set-rpath '$ORIGIN/../lib' "{install}/lib/libclamunrar_iface.so" - patchelf --set-rpath '$ORIGIN/../lib' "{install}/lib/libfreshclam.so" - patchelf --set-rpath '$ORIGIN/../lib' "{install}/lib/libclamav.so" - patchelf --set-rpath '$ORIGIN/../lib' "{install}/bin/clambc" - patchelf --set-rpath '$ORIGIN/../lib' "{install}/bin/clamconf" - patchelf --set-rpath '$ORIGIN/../lib' "{install}/bin/clamdscan" - patchelf --set-rpath '$ORIGIN/../lib' "{install}/bin/clamscan" - patchelf --set-rpath '$ORIGIN/../lib' "{install}/bin/clamsubmit" - patchelf --set-rpath '$ORIGIN/../lib' "{install}/bin/freshclam" - patchelf --set-rpath '$ORIGIN/../lib' "{install}/bin/sigtool" - patchelf --set-rpath '$ORIGIN/../lib' "{install}/sbin/clamd" - dependencies: - - libz - - libcurl - - libjson_c - - libxml2 - - libopenssl - - libpcre2 - - libbz2<1.1.0 - - libcheck - - ncurses - install_paths: - license/clamav: - - COPYING* - required_tools: - - gmake - - clang - - patchelf - - pkgconfig - - cmake - host-static: - build_script: - configure: | - mkdir build - cd build - cmake .. \ - -D CMAKE_FIND_PACKAGE_PREFER_CONFIG=TRUE \ - -D CMAKE_PREFIX_PATH={install} \ - -D CMAKE_INSTALL_PREFIX="{install}" \ - -D CMAKE_MODULE_PATH={install}/lib/cmake \ - -D CMAKE_BUILD_TYPE=Release \ - -D ENABLE_EXAMPLES=OFF \ - -D JSONC_INCLUDE_DIR="{install}/include/json-c" \ - -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 OPENSSL_ROOT_DIR="{install}" \ - -D OPENSSL_INCLUDE_DIR="{install}/include" \ - -D OPENSSL_CRYPTO_LIBRARY="{install}/lib/libcrypto.a" \ - -D OPENSSL_SSL_LIBRARY="{install}/lib/libssl.a" \ - -D LIBXML2_INCLUDE_DIR="{install}/include/libxml2" \ - -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 CURSES_LIBRARY="{install}/lib/libncurses.a" \ - -D ZLIB_INCLUDE_DIR="{install}/include" \ - -D ZLIB_LIBRARY="{install}/lib/libz.a" \ - -D LIBCHECK_INCLUDE_DIR="{install}/include" \ - -D LIBCHECK_LIBRARY="{install}/lib/libcheck.a" - make: | - cd build - cmake --build . - install: | - cd build - cmake --build . --target install - patchelf --set-rpath '$ORIGIN/../lib' "{install}/lib/libclamunrar_iface.so" - patchelf --set-rpath '$ORIGIN/../lib' "{install}/lib/libfreshclam.so" - patchelf --set-rpath '$ORIGIN/../lib' "{install}/lib/libclamav.so" - patchelf --set-rpath '$ORIGIN/../lib' "{install}/bin/clambc" - patchelf --set-rpath '$ORIGIN/../lib' "{install}/bin/clamconf" - patchelf --set-rpath '$ORIGIN/../lib' "{install}/bin/clamdscan" - patchelf --set-rpath '$ORIGIN/../lib' "{install}/bin/clamscan" - patchelf --set-rpath '$ORIGIN/../lib' "{install}/bin/clamsubmit" - patchelf --set-rpath '$ORIGIN/../lib' "{install}/bin/freshclam" - patchelf --set-rpath '$ORIGIN/../lib' "{install}/bin/sigtool" - patchelf --set-rpath '$ORIGIN/../lib' "{install}/sbin/clamd" - dependencies: - - libz - - libcurl - - libjson_c - - libxml2 - - libopenssl - - libpcre2 - - libbz2 - - libcheck - - ncurses - install_paths: - license/clamav: - - COPYING* - required_tools: - - gmake - - clang - - patchelf - - pkgconfig - - cmake - Windows: - x64: - build_script: - configure: | - mkdir build - cd build - CALL cmake.exe .. -G "{visualstudio.cmake_generator}" -A x64 \ - -D CMAKE_INSTALL_PREFIX="{install}" \ - -D ENABLE_EXAMPLES=OFF \ - -D JSONC_INCLUDE_DIR="{install}\include\json-c" \ - -D JSONC_LIBRARY="{install}\lib\json-c.lib" \ - -D ENABLE_JSON_SHARED=OFF \ - -D BZIP2_INCLUDE_DIR="{install}\include" \ - -D BZIP2_LIBRARY_RELEASE="{install}\lib\libbz2.lib" \ - -D CURL_INCLUDE_DIR="{install}\include" \ - -D CURL_LIBRARY="{install}\lib\libcurl_imp.lib" \ - -D OPENSSL_ROOT_DIR="{install}" \ - -D OPENSSL_INCLUDE_DIR="{install}\include" \ - -D OPENSSL_CRYPTO_LIBRARY="{install}\lib\libcrypto.lib" \ - -D OPENSSL_SSL_LIBRARY="{install}\lib\libssl.lib" \ - -D LIBXML2_INCLUDE_DIR="{install}\include\libxml2" \ - -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 CURSES_LIBRARY="{install}\lib\pdcurses.lib" \ - -D PThreadW32_INCLUDE_DIR="{install}\include" \ - -D PThreadW32_LIBRARY="{install}\lib\pthreadVC3.lib" \ - -D ZLIB_INCLUDE_DIR="{install}\include" \ - -D ZLIB_LIBRARY="{install}\lib\zlibstatic.lib" \ - -D LIBCHECK_INCLUDE_DIR="{install}\include" \ - -D LIBCHECK_LIBRARY="{install}\lib\checkDynamic.lib" - make: | - cd build - cmake --build . --config Release - install: | - cd build - cmake --build . --config Release --target install - dependencies: - - libz - - libcurl - - libjson_c - - pthreads_win32 - - libxml2 - - libopenssl - - libpcre2 - - libbz2<1.1.0 - - pdcurses - - libcheck - required_tools: - - cmake - - visualstudio>=2017 - x86: - build_script: - configure: | - mkdir build - cd build - CALL cmake.exe .. -G "{visualstudio.cmake_generator}" -A Win32 \ - -D CMAKE_INSTALL_PREFIX="{install}" \ - -D ENABLE_EXAMPLES=OFF \ - -D JSONC_INCLUDE_DIR="{install}\include\json-c" \ - -D JSONC_LIBRARY="{install}\lib\json-c.lib" \ - -D ENABLE_JSON_SHARED=OFF \ - -D BZIP2_INCLUDE_DIR="{install}\include" \ - -D BZIP2_LIBRARY_RELEASE="{install}\lib\libbz2.lib" \ - -D CURL_INCLUDE_DIR="{install}\include" \ - -D CURL_LIBRARY="{install}\lib\libcurl_imp.lib" \ - -D OPENSSL_ROOT_DIR="{install}" \ - -D OPENSSL_INCLUDE_DIR="{install}\include" \ - -D OPENSSL_CRYPTO_LIBRARY="{install}\lib\libcrypto.lib" \ - -D OPENSSL_SSL_LIBRARY="{install}\lib\libssl.lib" \ - -D LIBXML2_INCLUDE_DIR="{install}\include\libxml2" \ - -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 CURSES_LIBRARY="{install}\lib\pdcurses.lib" \ - -D PThreadW32_INCLUDE_DIR="{install}\include" \ - -D PThreadW32_LIBRARY="{install}\lib\pthreadVC2.lib" \ - -D ZLIB_INCLUDE_DIR="{install}\include" \ - -D ZLIB_LIBRARY="{install}\lib\zlibstatic.lib" \ - -D LIBCHECK_INCLUDE_DIR="{install}\include" \ - -D LIBCHECK_LIBRARY="{install}\lib\checkDynamic.lib" - make: | - cd build - cmake --build . --config Release - install: | - cd build - cmake --build . --config Release --target install - dependencies: - - libz - - libcurl - - libjson_c - - pthreads_win32 - - libxml2 - - libopenssl - - libpcre2 - - libbz2<1.1.0 - - pdcurses - - libcheck - required_tools: - - cmake - - visualstudio>=2017 diff --git a/recipes/clamav-1.2.yaml b/recipes/clamav-1.5.yaml similarity index 82% rename from recipes/clamav-1.2.yaml rename to recipes/clamav-1.5.yaml index d738f8f..983c2d2 100644 --- a/recipes/clamav-1.2.yaml +++ b/recipes/clamav-1.5.yaml @@ -14,7 +14,7 @@ # TODO: Rewrite this to use the new CMake build system, when unit test support is complete. name: clamav -version: "1.2.0" +version: "1.5.0" url: https://github.com/Cisco-Talos/clamav/archive/main.zip archive_name_change: - "main" @@ -33,6 +33,7 @@ platforms: -D CMAKE_MODULE_PATH={install}/lib/cmake \ -D CMAKE_BUILD_TYPE=Release \ -D ENABLE_EXAMPLES=OFF \ + -D ENABLE_MILTER=OFF \ -D JSONC_INCLUDE_DIR="{install}/include/json-c" \ -D JSONC_LIBRARY="{install}/lib/libjson-c.a" \ -D ENABLE_JSON_SHARED=OFF \ @@ -95,30 +96,31 @@ platforms: mkdir build cd build cmake .. \ - -D CMAKE_FIND_PACKAGE_PREFER_CONFIG=TRUE \ - -D CMAKE_PREFIX_PATH={install} \ - -D CMAKE_INSTALL_PREFIX="{install}" \ - -D CMAKE_MODULE_PATH={install}/lib/cmake \ - -D CMAKE_BUILD_TYPE=Release \ - -D ENABLE_EXAMPLES=OFF \ - -D JSONC_INCLUDE_DIR="{install}/include/json-c" \ - -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 OPENSSL_ROOT_DIR="{install}" \ - -D OPENSSL_INCLUDE_DIR="{install}/include" \ - -D OPENSSL_CRYPTO_LIBRARY="{install}/lib/libcrypto.a" \ - -D OPENSSL_SSL_LIBRARY="{install}/lib/libssl.a" \ - -D LIBXML2_INCLUDE_DIR="{install}/include/libxml2" \ - -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 CURSES_LIBRARY="{install}/lib/libncurses.a" \ - -D ZLIB_INCLUDE_DIR="{install}/include" \ - -D ZLIB_LIBRARY="{install}/lib/libz.a" \ - -D LIBCHECK_INCLUDE_DIR="{install}/include" \ + -D CMAKE_FIND_PACKAGE_PREFER_CONFIG=TRUE \ + -D CMAKE_PREFIX_PATH={install} \ + -D CMAKE_INSTALL_PREFIX="{install}" \ + -D CMAKE_MODULE_PATH={install}/lib/cmake \ + -D CMAKE_BUILD_TYPE=Release \ + -D ENABLE_EXAMPLES=OFF \ + -D ENABLE_MILTER=OFF \ + -D JSONC_INCLUDE_DIR="{install}/include/json-c" \ + -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 OPENSSL_ROOT_DIR="{install}" \ + -D OPENSSL_INCLUDE_DIR="{install}/include" \ + -D OPENSSL_CRYPTO_LIBRARY="{install}/lib/libcrypto.a" \ + -D OPENSSL_SSL_LIBRARY="{install}/lib/libssl.a" \ + -D LIBXML2_INCLUDE_DIR="{install}/include/libxml2" \ + -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 CURSES_LIBRARY="{install}/lib/libncurses.a" \ + -D ZLIB_INCLUDE_DIR="{install}/include" \ + -D ZLIB_LIBRARY="{install}/lib/libz.a" \ + -D LIBCHECK_INCLUDE_DIR="{install}/include" \ -D LIBCHECK_LIBRARY="{install}/lib/libcheck.a" make: | cd build @@ -144,7 +146,7 @@ platforms: - libxml2 - libopenssl - libpcre2 - - libbz2 + - libbz2<1.1.0 - libcheck - ncurses install_paths: @@ -166,6 +168,7 @@ platforms: -D CMAKE_MODULE_PATH={install}/lib/cmake \ -D CMAKE_BUILD_TYPE=Release \ -D ENABLE_EXAMPLES=OFF \ + -D ENABLE_MILTER=OFF \ -D ENABLE_SYSTEMD=OFF \ -D JSONC_INCLUDE_DIR="{install}/include/json-c" \ -D JSONC_LIBRARY="{install}/lib/libjson-c.a" \ @@ -230,30 +233,31 @@ platforms: mkdir build cd build cmake .. \ - -D CMAKE_FIND_PACKAGE_PREFER_CONFIG=TRUE \ - -D CMAKE_PREFIX_PATH={install} \ - -D CMAKE_INSTALL_PREFIX="{install}" \ - -D CMAKE_MODULE_PATH={install}/lib/cmake \ - -D CMAKE_BUILD_TYPE=Release \ - -D ENABLE_EXAMPLES=OFF \ - -D JSONC_INCLUDE_DIR="{install}/include/json-c" \ - -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 OPENSSL_ROOT_DIR="{install}" \ - -D OPENSSL_INCLUDE_DIR="{install}/include" \ - -D OPENSSL_CRYPTO_LIBRARY="{install}/lib/libcrypto.a" \ - -D OPENSSL_SSL_LIBRARY="{install}/lib/libssl.a" \ - -D LIBXML2_INCLUDE_DIR="{install}/include/libxml2" \ - -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 CURSES_LIBRARY="{install}/lib/libncurses.a" \ - -D ZLIB_INCLUDE_DIR="{install}/include" \ - -D ZLIB_LIBRARY="{install}/lib/libz.a" \ - -D LIBCHECK_INCLUDE_DIR="{install}/include" \ + -D CMAKE_FIND_PACKAGE_PREFER_CONFIG=TRUE \ + -D CMAKE_PREFIX_PATH={install} \ + -D CMAKE_INSTALL_PREFIX="{install}" \ + -D CMAKE_MODULE_PATH={install}/lib/cmake \ + -D CMAKE_BUILD_TYPE=Release \ + -D ENABLE_EXAMPLES=OFF \ + -D ENABLE_MILTER=OFF \ + -D JSONC_INCLUDE_DIR="{install}/include/json-c" \ + -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 OPENSSL_ROOT_DIR="{install}" \ + -D OPENSSL_INCLUDE_DIR="{install}/include" \ + -D OPENSSL_CRYPTO_LIBRARY="{install}/lib/libcrypto.a" \ + -D OPENSSL_SSL_LIBRARY="{install}/lib/libssl.a" \ + -D LIBXML2_INCLUDE_DIR="{install}/include/libxml2" \ + -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 CURSES_LIBRARY="{install}/lib/libncurses.a" \ + -D ZLIB_INCLUDE_DIR="{install}/include" \ + -D ZLIB_LIBRARY="{install}/lib/libz.a" \ + -D LIBCHECK_INCLUDE_DIR="{install}/include" \ -D LIBCHECK_LIBRARY="{install}/lib/libcheck.a" make: | cd build @@ -279,7 +283,7 @@ platforms: - libxml2 - libopenssl - libpcre2 - - libbz2 + - libbz2<1.1.0 - libcheck - ncurses install_paths: @@ -302,6 +306,7 @@ platforms: -D CMAKE_MODULE_PATH={install}/lib/cmake \ -D CMAKE_BUILD_TYPE=Release \ -D ENABLE_EXAMPLES=OFF \ + -D ENABLE_MILTER=OFF \ -D ENABLE_SYSTEMD=OFF \ -D JSONC_INCLUDE_DIR="{install}/include/json-c" \ -D JSONC_LIBRARY="{install}/lib/libjson-c.a" \ @@ -366,30 +371,31 @@ platforms: mkdir build cd build cmake .. \ - -D CMAKE_FIND_PACKAGE_PREFER_CONFIG=TRUE \ - -D CMAKE_PREFIX_PATH={install} \ - -D CMAKE_INSTALL_PREFIX="{install}" \ - -D CMAKE_MODULE_PATH={install}/lib/cmake \ - -D CMAKE_BUILD_TYPE=Release \ - -D ENABLE_EXAMPLES=OFF \ - -D JSONC_INCLUDE_DIR="{install}/include/json-c" \ - -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 OPENSSL_ROOT_DIR="{install}" \ - -D OPENSSL_INCLUDE_DIR="{install}/include" \ - -D OPENSSL_CRYPTO_LIBRARY="{install}/lib/libcrypto.a" \ - -D OPENSSL_SSL_LIBRARY="{install}/lib/libssl.a" \ - -D LIBXML2_INCLUDE_DIR="{install}/include/libxml2" \ - -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 CURSES_LIBRARY="{install}/lib/libncurses.a" \ - -D ZLIB_INCLUDE_DIR="{install}/include" \ - -D ZLIB_LIBRARY="{install}/lib/libz.a" \ - -D LIBCHECK_INCLUDE_DIR="{install}/include" \ + -D CMAKE_FIND_PACKAGE_PREFER_CONFIG=TRUE \ + -D CMAKE_PREFIX_PATH={install} \ + -D CMAKE_INSTALL_PREFIX="{install}" \ + -D CMAKE_MODULE_PATH={install}/lib/cmake \ + -D CMAKE_BUILD_TYPE=Release \ + -D ENABLE_EXAMPLES=OFF \ + -D ENABLE_MILTER=OFF \ + -D JSONC_INCLUDE_DIR="{install}/include/json-c" \ + -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 OPENSSL_ROOT_DIR="{install}" \ + -D OPENSSL_INCLUDE_DIR="{install}/include" \ + -D OPENSSL_CRYPTO_LIBRARY="{install}/lib/libcrypto.a" \ + -D OPENSSL_SSL_LIBRARY="{install}/lib/libssl.a" \ + -D LIBXML2_INCLUDE_DIR="{install}/include/libxml2" \ + -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 CURSES_LIBRARY="{install}/lib/libncurses.a" \ + -D ZLIB_INCLUDE_DIR="{install}/include" \ + -D ZLIB_LIBRARY="{install}/lib/libz.a" \ + -D LIBCHECK_INCLUDE_DIR="{install}/include" \ -D LIBCHECK_LIBRARY="{install}/lib/libcheck.a" make: | cd build @@ -415,7 +421,7 @@ platforms: - libxml2 - libopenssl - libpcre2 - - libbz2 + - libbz2<1.1.0 - libcheck - ncurses install_paths: @@ -428,36 +434,99 @@ platforms: - pkgconfig - cmake Windows: + arm64: + build_script: + configure: | + >CMAKE_TOOLCHAIN_ARM64.cmake echo set(CMAKE_SYSTEM_NAME Windows) + >>CMAKE_TOOLCHAIN_ARM64.cmake echo set(CMAKE_SYSTEM_PROCESSOR arm64) + >>CMAKE_TOOLCHAIN_ARM64.cmake echo set(RUST_COMPILER_TARGET "aarch64-pc-windows-msvc") + >>CMAKE_TOOLCHAIN_ARM64.cmake echo set(HAVE_PRAGMA_PACK 1) + >>CMAKE_TOOLCHAIN_ARM64.cmake echo set(HAVE_SAR 1) + >>CMAKE_TOOLCHAIN_ARM64.cmake echo set(MMAP_FOR_CROSSCOMPILING OFF) + >>CMAKE_TOOLCHAIN_ARM64.cmake echo set(ENABLE_SYSTEMD OFF) + >>CMAKE_TOOLCHAIN_ARM64.cmake echo set(test_run_result "PLEASE_FILL_OUT-FAILED_TO_RUN" CACHE STRING "Result from try_run" FORCE) + >>CMAKE_TOOLCHAIN_ARM64.cmake echo set(test_run_result__TRYRUN_OUTPUT "PLEASE_FILL_OUT-NOTFOUND" CACHE STRING "Output from try_run" FORCE) + mkdir build + cd build + CALL cmake.exe .. -G "{visualstudio.cmake_generator}" -A arm64 \ + -D CMAKE_INSTALL_PREFIX="{install}" \ + -D ENABLE_EXAMPLES=OFF \ + -D JSONC_INCLUDE_DIR="{install}\include\json-c" \ + -D JSONC_LIBRARY="{install}\lib\json-c.lib" \ + -D ENABLE_JSON_SHARED=OFF \ + -D BZIP2_INCLUDE_DIR="{install}\include" \ + -D BZIP2_LIBRARY_RELEASE="{install}\lib\libbz2.lib" \ + -D CURL_INCLUDE_DIR="{install}\include" \ + -D CURL_LIBRARY="{install}\lib\libcurl_imp.lib" \ + -D OPENSSL_ROOT_DIR="{install}" \ + -D OPENSSL_INCLUDE_DIR="{install}\include" \ + -D OPENSSL_CRYPTO_LIBRARY="{install}\lib\libcrypto.lib" \ + -D OPENSSL_SSL_LIBRARY="{install}\lib\libssl.lib" \ + -D LIBXML2_INCLUDE_DIR="{install}\include\libxml2" \ + -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 CURSES_LIBRARY="{install}\lib\pdcurses.lib" \ + -D PThreadW32_INCLUDE_DIR="{install}\include" \ + -D PThreadW32_LIBRARY="{install}\lib\pthreadVC3.lib" \ + -D ZLIB_INCLUDE_DIR="{install}\include" \ + -D ZLIB_LIBRARY="{install}\lib\zlibstatic.lib" \ + -D LIBCHECK_INCLUDE_DIR="{install}\include" \ + -D LIBCHECK_LIBRARY="{install}\lib\checkDynamic.lib" \ + -D CMAKE_TOOLCHAIN_FILE="..\CMAKE_TOOLCHAIN_ARM64.cmake" \ + -D HAVE_PRAGMA_PACK=1 \ + -D HAVE_SAR=1 + make: | + cd build + cmake --build . --config Release + install: | + cd build + cmake --build . --config Release --target install + dependencies: + - libz + - libcurl + - libjson_c + - pthreads_win32 + - libxml2 + - libopenssl + - libpcre2 + - libbz2<1.1.0 + - pdcurses + - libcheck + required_tools: + - cmake + - visualstudio>=2017 x64: build_script: configure: | mkdir build cd build CALL cmake.exe .. -G "{visualstudio.cmake_generator}" -A x64 \ - -D CMAKE_INSTALL_PREFIX="{install}" \ - -D ENABLE_EXAMPLES=OFF \ - -D JSONC_INCLUDE_DIR="{install}\include\json-c" \ - -D JSONC_LIBRARY="{install}\lib\json-c.lib" \ - -D ENABLE_JSON_SHARED=OFF \ - -D BZIP2_INCLUDE_DIR="{install}\include" \ - -D BZIP2_LIBRARY_RELEASE="{install}\lib\libbz2.lib" \ - -D CURL_INCLUDE_DIR="{install}\include" \ - -D CURL_LIBRARY="{install}\lib\libcurl_imp.lib" \ - -D OPENSSL_ROOT_DIR="{install}" \ - -D OPENSSL_INCLUDE_DIR="{install}\include" \ - -D OPENSSL_CRYPTO_LIBRARY="{install}\lib\libcrypto.lib" \ - -D OPENSSL_SSL_LIBRARY="{install}\lib\libssl.lib" \ - -D LIBXML2_INCLUDE_DIR="{install}\include\libxml2" \ - -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 CURSES_LIBRARY="{install}\lib\pdcurses.lib" \ - -D PThreadW32_INCLUDE_DIR="{install}\include" \ - -D PThreadW32_LIBRARY="{install}\lib\pthreadVC3.lib" \ - -D ZLIB_INCLUDE_DIR="{install}\include" \ - -D ZLIB_LIBRARY="{install}\lib\zlibstatic.lib" \ - -D LIBCHECK_INCLUDE_DIR="{install}\include" \ + -D CMAKE_INSTALL_PREFIX="{install}" \ + -D ENABLE_EXAMPLES=OFF \ + -D JSONC_INCLUDE_DIR="{install}\include\json-c" \ + -D JSONC_LIBRARY="{install}\lib\json-c.lib" \ + -D ENABLE_JSON_SHARED=OFF \ + -D BZIP2_INCLUDE_DIR="{install}\include" \ + -D BZIP2_LIBRARY_RELEASE="{install}\lib\libbz2.lib" \ + -D CURL_INCLUDE_DIR="{install}\include" \ + -D CURL_LIBRARY="{install}\lib\libcurl_imp.lib" \ + -D OPENSSL_ROOT_DIR="{install}" \ + -D OPENSSL_INCLUDE_DIR="{install}\include" \ + -D OPENSSL_CRYPTO_LIBRARY="{install}\lib\libcrypto.lib" \ + -D OPENSSL_SSL_LIBRARY="{install}\lib\libssl.lib" \ + -D LIBXML2_INCLUDE_DIR="{install}\include\libxml2" \ + -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 CURSES_LIBRARY="{install}\lib\pdcurses.lib" \ + -D PThreadW32_INCLUDE_DIR="{install}\include" \ + -D PThreadW32_LIBRARY="{install}\lib\pthreadVC3.lib" \ + -D ZLIB_INCLUDE_DIR="{install}\include" \ + -D ZLIB_LIBRARY="{install}\lib\zlibstatic.lib" \ + -D LIBCHECK_INCLUDE_DIR="{install}\include" \ -D LIBCHECK_LIBRARY="{install}\lib\checkDynamic.lib" make: | cd build @@ -485,30 +554,30 @@ platforms: mkdir build cd build CALL cmake.exe .. -G "{visualstudio.cmake_generator}" -A Win32 \ - -D CMAKE_INSTALL_PREFIX="{install}" \ - -D ENABLE_EXAMPLES=OFF \ - -D JSONC_INCLUDE_DIR="{install}\include\json-c" \ - -D JSONC_LIBRARY="{install}\lib\json-c.lib" \ - -D ENABLE_JSON_SHARED=OFF \ - -D BZIP2_INCLUDE_DIR="{install}\include" \ - -D BZIP2_LIBRARY_RELEASE="{install}\lib\libbz2.lib" \ - -D CURL_INCLUDE_DIR="{install}\include" \ - -D CURL_LIBRARY="{install}\lib\libcurl_imp.lib" \ - -D OPENSSL_ROOT_DIR="{install}" \ - -D OPENSSL_INCLUDE_DIR="{install}\include" \ - -D OPENSSL_CRYPTO_LIBRARY="{install}\lib\libcrypto.lib" \ - -D OPENSSL_SSL_LIBRARY="{install}\lib\libssl.lib" \ - -D LIBXML2_INCLUDE_DIR="{install}\include\libxml2" \ - -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 CURSES_LIBRARY="{install}\lib\pdcurses.lib" \ - -D PThreadW32_INCLUDE_DIR="{install}\include" \ - -D PThreadW32_LIBRARY="{install}\lib\pthreadVC2.lib" \ - -D ZLIB_INCLUDE_DIR="{install}\include" \ - -D ZLIB_LIBRARY="{install}\lib\zlibstatic.lib" \ - -D LIBCHECK_INCLUDE_DIR="{install}\include" \ + -D CMAKE_INSTALL_PREFIX="{install}" \ + -D ENABLE_EXAMPLES=OFF \ + -D JSONC_INCLUDE_DIR="{install}\include\json-c" \ + -D JSONC_LIBRARY="{install}\lib\json-c.lib" \ + -D ENABLE_JSON_SHARED=OFF \ + -D BZIP2_INCLUDE_DIR="{install}\include" \ + -D BZIP2_LIBRARY_RELEASE="{install}\lib\libbz2.lib" \ + -D CURL_INCLUDE_DIR="{install}\include" \ + -D CURL_LIBRARY="{install}\lib\libcurl_imp.lib" \ + -D OPENSSL_ROOT_DIR="{install}" \ + -D OPENSSL_INCLUDE_DIR="{install}\include" \ + -D OPENSSL_CRYPTO_LIBRARY="{install}\lib\libcrypto.lib" \ + -D OPENSSL_SSL_LIBRARY="{install}\lib\libssl.lib" \ + -D LIBXML2_INCLUDE_DIR="{install}\include\libxml2" \ + -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 CURSES_LIBRARY="{install}\lib\pdcurses.lib" \ + -D PThreadW32_INCLUDE_DIR="{install}\include" \ + -D PThreadW32_LIBRARY="{install}\lib\pthreadVC3.lib" \ + -D ZLIB_INCLUDE_DIR="{install}\include" \ + -D ZLIB_LIBRARY="{install}\lib\zlibstatic.lib" \ + -D LIBCHECK_INCLUDE_DIR="{install}\include" \ -D LIBCHECK_LIBRARY="{install}\lib\checkDynamic.lib" make: | cd build From a72a9737ce8c55feb383e4fa957a0c9ed1192e42 Mon Sep 17 00:00:00 2001 From: Micah Snyder Date: Sat, 31 Aug 2024 16:50:45 -0400 Subject: [PATCH 6/8] libcurl: Disable libidn2 for all builds Automatic library detection finds brew-installed libs. This is primarily to fix builds on GitHub Actions where the system provides all sorts of stuff we didn't request. On macOS, specifically, this causes failures because we build universal binaries, and brew binaries are not universal and lack symbols for othe other platform. --- recipes/libcurl-8.yaml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/recipes/libcurl-8.yaml b/recipes/libcurl-8.yaml index 3831d45..a63b233 100644 --- a/recipes/libcurl-8.yaml +++ b/recipes/libcurl-8.yaml @@ -42,6 +42,7 @@ platforms: -D NGHTTP2_INCLUDE_DIR="{includes}" \ -D NGHTTP2_LIBRARY="{libs}/libnghttp2.dylib" \ -D CMAKE_INSTALL_PREFIX="{install}" \ + -D USE_LIBIDN2=OFF \ -D BUILD_CURL_EXE=OFF make: | cd build @@ -86,6 +87,7 @@ platforms: -D NGHTTP2_LIBRARY="{libs}/libnghttp2.a" \ -D CMAKE_INSTALL_PREFIX="{install}" \ -D BUILD_SHARED_LIBS=OFF \ + -D USE_LIBIDN2=OFF \ -D BUILD_CURL_EXE=OFF make: | cd build @@ -128,6 +130,7 @@ platforms: -D NGHTTP2_INCLUDE_DIR="{includes}" \ -D NGHTTP2_LIBRARY="{libs}/libnghttp2.so" \ -D CMAKE_INSTALL_PREFIX="{install}" \ + -D USE_LIBIDN2=OFF \ -D BUILD_CURL_EXE=OFF make: | cd build @@ -172,6 +175,7 @@ platforms: -D CMAKE_INSTALL_PREFIX="{install}" \ -D BUILD_SHARED_LIBS=OFF \ -D CMAKE_INSTALL_LIBDIR=lib \ + -D USE_LIBIDN2=OFF \ -D BUILD_CURL_EXE=OFF make: | cd build @@ -213,6 +217,7 @@ platforms: -D NGHTTP2_INCLUDE_DIR="{includes}" \ -D NGHTTP2_LIBRARY="{libs}/libnghttp2.so" \ -D CMAKE_INSTALL_PREFIX="{install}" \ + -D USE_LIBIDN2=OFF \ -D BUILD_CURL_EXE=OFF make: | cd build @@ -258,6 +263,7 @@ platforms: -D CMAKE_INSTALL_PREFIX="{install}" \ -D BUILD_SHARED_LIBS=OFF \ -D CMAKE_INSTALL_LIBDIR=lib \ + -D USE_LIBIDN2=OFF \ -D BUILD_CURL_EXE=OFF make: | cd build From b1101fffc4af88f40d23ac3c959bc49a7e84f1fb Mon Sep 17 00:00:00 2001 From: Micah Snyder Date: Sat, 31 Aug 2024 17:02:52 -0400 Subject: [PATCH 7/8] 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. --- recipes/clamav-1.0.yaml | 22 +++++++++++----------- recipes/clamav-1.5.yaml | 18 +++++++++--------- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/recipes/clamav-1.0.yaml b/recipes/clamav-1.0.yaml index 90d3159..e326174 100644 --- 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 index 983c2d2..6f0434c 100644 --- 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" \ From ecd619b4328de3891f5ef3e835c0157768044e0d Mon Sep 17 00:00:00 2001 From: Micah Snyder Date: Sat, 31 Aug 2024 21:06:04 -0400 Subject: [PATCH 8/8] libncurses: don't build separate tinfo library --- recipes/clamav-1.0.yaml | 154 ++++++++++++++++++++-------------------- recipes/clamav-1.5.yaml | 6 +- recipes/ncurses-6.yaml | 12 ++-- 3 files changed, 86 insertions(+), 86 deletions(-) diff --git a/recipes/clamav-1.0.yaml b/recipes/clamav-1.0.yaml index e326174..1e34183 100644 --- a/recipes/clamav-1.0.yaml +++ b/recipes/clamav-1.0.yaml @@ -49,7 +49,7 @@ platforms: -D PCRE2_INCLUDE_DIR="{install}/include" \ -D PCRE2_LIBRARY="{install}/lib/libpcre2-8.dylib" \ -D NCURSES_INCLUDE_DIR="{install}/include" \ - -D CURSES_LIBRARY="{install}/lib/libncurses.a" \ + -D CURSES_LIBRARIES="{install}/lib/libncurses.a" \ -D ZLIB_INCLUDE_DIR="{install}/include" \ -D ZLIB_LIBRARY="{install}/lib/libz.dylib" \ -D LIBCHECK_INCLUDE_DIR="{install}/include" \ @@ -95,30 +95,30 @@ platforms: mkdir build cd build cmake .. \ - -D CMAKE_FIND_PACKAGE_PREFER_CONFIG=TRUE \ - -D CMAKE_PREFIX_PATH={install} \ - -D CMAKE_INSTALL_PREFIX="{install}" \ - -D CMAKE_MODULE_PATH={install}/lib/cmake \ - -D CMAKE_BUILD_TYPE=Release \ - -D ENABLE_EXAMPLES=OFF \ - -D JSONC_INCLUDE_DIR="{install}/include/json-c" \ - -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 OPENSSL_ROOT_DIR="{install}" \ - -D OPENSSL_INCLUDE_DIR="{install}/include" \ - -D OPENSSL_CRYPTO_LIBRARY="{install}/lib/libcrypto.a" \ - -D OPENSSL_SSL_LIBRARY="{install}/lib/libssl.a" \ - -D LIBXML2_INCLUDE_DIR="{install}/include/libxml2" \ - -D LIBXML2_LIBRARY="{install}/lib/libxml2.a" \ - -D PCRE2_INCLUDE_DIR="{install}/include" \ - -D PCRE2_LIBRARY="{install}/lib/libpcre2-8.a" \ - -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" \ - -D LIBCHECK_INCLUDE_DIR="{install}/include" \ + -D CMAKE_FIND_PACKAGE_PREFER_CONFIG=TRUE \ + -D CMAKE_PREFIX_PATH={install} \ + -D CMAKE_INSTALL_PREFIX="{install}" \ + -D CMAKE_MODULE_PATH={install}/lib/cmake \ + -D CMAKE_BUILD_TYPE=Release \ + -D ENABLE_EXAMPLES=OFF \ + -D JSONC_INCLUDE_DIR="{install}/include/json-c" \ + -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 OPENSSL_ROOT_DIR="{install}" \ + -D OPENSSL_INCLUDE_DIR="{install}/include" \ + -D OPENSSL_CRYPTO_LIBRARY="{install}/lib/libcrypto.a" \ + -D OPENSSL_SSL_LIBRARY="{install}/lib/libssl.a" \ + -D LIBXML2_INCLUDE_DIR="{install}/include/libxml2" \ + -D LIBXML2_LIBRARY="{install}/lib/libxml2.a" \ + -D PCRE2_INCLUDE_DIR="{install}/include" \ + -D PCRE2_LIBRARY="{install}/lib/libpcre2-8.a" \ + -D NCURSES_INCLUDE_DIR="{install}/include" \ + -D CURSES_LIBRARIES="{install}/lib/libncurses.a" \ + -D ZLIB_INCLUDE_DIR="{install}/include" \ + -D ZLIB_LIBRARY="{install}/lib/libz.a" \ + -D LIBCHECK_INCLUDE_DIR="{install}/include" \ -D LIBCHECK_LIBRARY="{install}/lib/libcheck.a" make: | cd build @@ -183,7 +183,7 @@ platforms: -D PCRE2_INCLUDE_DIR="{install}/include" \ -D PCRE2_LIBRARY="{install}/lib/libpcre2-8.so" \ -D NCURSES_INCLUDE_DIR="{install}/include" \ - -D CURSES_LIBRARY="{install}/lib/libncurses.a" \ + -D CURSES_LIBRARIES="{install}/lib/libncurses.a" \ -D ZLIB_INCLUDE_DIR="{install}/include" \ -D ZLIB_LIBRARY="{install}/lib/libz.so" \ -D LIBCHECK_INCLUDE_DIR="{install}/include" \ @@ -230,30 +230,30 @@ platforms: mkdir build cd build cmake .. \ - -D CMAKE_FIND_PACKAGE_PREFER_CONFIG=TRUE \ - -D CMAKE_PREFIX_PATH={install} \ - -D CMAKE_INSTALL_PREFIX="{install}" \ - -D CMAKE_MODULE_PATH={install}/lib/cmake \ - -D CMAKE_BUILD_TYPE=Release \ - -D ENABLE_EXAMPLES=OFF \ - -D JSONC_INCLUDE_DIR="{install}/include/json-c" \ - -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 OPENSSL_ROOT_DIR="{install}" \ - -D OPENSSL_INCLUDE_DIR="{install}/include" \ - -D OPENSSL_CRYPTO_LIBRARY="{install}/lib/libcrypto.a" \ - -D OPENSSL_SSL_LIBRARY="{install}/lib/libssl.a" \ - -D LIBXML2_INCLUDE_DIR="{install}/include/libxml2" \ - -D LIBXML2_LIBRARY="{install}/lib/libxml2.a" \ - -D PCRE2_INCLUDE_DIR="{install}/include" \ - -D PCRE2_LIBRARY="{install}/lib/libpcre2-8.a" \ - -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" \ - -D LIBCHECK_INCLUDE_DIR="{install}/include" \ + -D CMAKE_FIND_PACKAGE_PREFER_CONFIG=TRUE \ + -D CMAKE_PREFIX_PATH={install} \ + -D CMAKE_INSTALL_PREFIX="{install}" \ + -D CMAKE_MODULE_PATH={install}/lib/cmake \ + -D CMAKE_BUILD_TYPE=Release \ + -D ENABLE_EXAMPLES=OFF \ + -D JSONC_INCLUDE_DIR="{install}/include/json-c" \ + -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 OPENSSL_ROOT_DIR="{install}" \ + -D OPENSSL_INCLUDE_DIR="{install}/include" \ + -D OPENSSL_CRYPTO_LIBRARY="{install}/lib/libcrypto.a" \ + -D OPENSSL_SSL_LIBRARY="{install}/lib/libssl.a" \ + -D LIBXML2_INCLUDE_DIR="{install}/include/libxml2" \ + -D LIBXML2_LIBRARY="{install}/lib/libxml2.a" \ + -D PCRE2_INCLUDE_DIR="{install}/include" \ + -D PCRE2_LIBRARY="{install}/lib/libpcre2-8.a" \ + -D NCURSES_INCLUDE_DIR="{install}/include" \ + -D CURSES_LIBRARIES="{install}/lib/libncurses.a" \ + -D ZLIB_INCLUDE_DIR="{install}/include" \ + -D ZLIB_LIBRARY="{install}/lib/libz.a" \ + -D LIBCHECK_INCLUDE_DIR="{install}/include" \ -D LIBCHECK_LIBRARY="{install}/lib/libcheck.a" make: | cd build @@ -319,7 +319,7 @@ platforms: -D PCRE2_INCLUDE_DIR="{install}/include" \ -D PCRE2_LIBRARY="{install}/lib/libpcre2-8.so" \ -D NCURSES_INCLUDE_DIR="{install}/include" \ - -D CURSES_LIBRARY="{install}/lib/libncurses.a" \ + -D CURSES_LIBRARIES="{install}/lib/libncurses.a" \ -D ZLIB_INCLUDE_DIR="{install}/include" \ -D ZLIB_LIBRARY="{install}/lib/libz.so" \ -D LIBCHECK_INCLUDE_DIR="{install}/include" \ @@ -366,30 +366,30 @@ platforms: mkdir build cd build cmake .. \ - -D CMAKE_FIND_PACKAGE_PREFER_CONFIG=TRUE \ - -D CMAKE_PREFIX_PATH={install} \ - -D CMAKE_INSTALL_PREFIX="{install}" \ - -D CMAKE_MODULE_PATH={install}/lib/cmake \ - -D CMAKE_BUILD_TYPE=Release \ - -D ENABLE_EXAMPLES=OFF \ - -D JSONC_INCLUDE_DIR="{install}/include/json-c" \ - -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 OPENSSL_ROOT_DIR="{install}" \ - -D OPENSSL_INCLUDE_DIR="{install}/include" \ - -D OPENSSL_CRYPTO_LIBRARY="{install}/lib/libcrypto.a" \ - -D OPENSSL_SSL_LIBRARY="{install}/lib/libssl.a" \ - -D LIBXML2_INCLUDE_DIR="{install}/include/libxml2" \ - -D LIBXML2_LIBRARY="{install}/lib/libxml2.a" \ - -D PCRE2_INCLUDE_DIR="{install}/include" \ - -D PCRE2_LIBRARY="{install}/lib/libpcre2-8.a" \ - -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" \ - -D LIBCHECK_INCLUDE_DIR="{install}/include" \ + -D CMAKE_FIND_PACKAGE_PREFER_CONFIG=TRUE \ + -D CMAKE_PREFIX_PATH={install} \ + -D CMAKE_INSTALL_PREFIX="{install}" \ + -D CMAKE_MODULE_PATH={install}/lib/cmake \ + -D CMAKE_BUILD_TYPE=Release \ + -D ENABLE_EXAMPLES=OFF \ + -D JSONC_INCLUDE_DIR="{install}/include/json-c" \ + -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 OPENSSL_ROOT_DIR="{install}" \ + -D OPENSSL_INCLUDE_DIR="{install}/include" \ + -D OPENSSL_CRYPTO_LIBRARY="{install}/lib/libcrypto.a" \ + -D OPENSSL_SSL_LIBRARY="{install}/lib/libssl.a" \ + -D LIBXML2_INCLUDE_DIR="{install}/include/libxml2" \ + -D LIBXML2_LIBRARY="{install}/lib/libxml2.a" \ + -D PCRE2_INCLUDE_DIR="{install}/include" \ + -D PCRE2_LIBRARY="{install}/lib/libpcre2-8.a" \ + -D NCURSES_INCLUDE_DIR="{install}/include" \ + -D CURSES_LIBRARIES="{install}/lib/libncurses.a" \ + -D ZLIB_INCLUDE_DIR="{install}/include" \ + -D ZLIB_LIBRARY="{install}/lib/libz.a" \ + -D LIBCHECK_INCLUDE_DIR="{install}/include" \ -D LIBCHECK_LIBRARY="{install}/lib/libcheck.a" make: | cd build @@ -452,7 +452,7 @@ platforms: -D PCRE2_INCLUDE_DIR="{install}\include" \ -D PCRE2_LIBRARY="{install}\lib\pcre2-8.lib" \ -D PDCURSES_INCLUDE_DIR="{install}\include" \ - -D CURSES_LIBRARY="{install}\lib\pdcurses.lib" \ + -D CURSES_LIBRARIES="{install}\lib\pdcurses.lib" \ -D PThreadW32_INCLUDE_DIR="{install}\include" \ -D PThreadW32_LIBRARY="{install}\lib\pthreadVC3.lib" \ -D ZLIB_INCLUDE_DIR="{install}\include" \ @@ -503,7 +503,7 @@ platforms: -D PCRE2_INCLUDE_DIR="{install}\include" \ -D PCRE2_LIBRARY="{install}\lib\pcre2-8.lib" \ -D PDCURSES_INCLUDE_DIR="{install}\include" \ - -D CURSES_LIBRARY="{install}\lib\pdcurses.lib" \ + -D CURSES_LIBRARIES="{install}\lib\pdcurses.lib" \ -D PThreadW32_INCLUDE_DIR="{install}\include" \ -D PThreadW32_LIBRARY="{install}\lib\pthreadVC3.lib" \ -D ZLIB_INCLUDE_DIR="{install}\include" \ diff --git a/recipes/clamav-1.5.yaml b/recipes/clamav-1.5.yaml index 6f0434c..6e98fc7 100644 --- a/recipes/clamav-1.5.yaml +++ b/recipes/clamav-1.5.yaml @@ -467,7 +467,7 @@ platforms: -D PCRE2_INCLUDE_DIR="{install}\include" \ -D PCRE2_LIBRARY="{install}\lib\pcre2-8.lib" \ -D PDCURSES_INCLUDE_DIR="{install}\include" \ - -D CURSES_LIBRARY="{install}\lib\pdcurses.lib" \ + -D CURSES_LIBRARIES="{install}\lib\pdcurses.lib" \ -D PThreadW32_INCLUDE_DIR="{install}\include" \ -D PThreadW32_LIBRARY="{install}\lib\pthreadVC3.lib" \ -D ZLIB_INCLUDE_DIR="{install}\include" \ @@ -521,7 +521,7 @@ platforms: -D PCRE2_INCLUDE_DIR="{install}\include" \ -D PCRE2_LIBRARY="{install}\lib\pcre2-8.lib" \ -D PDCURSES_INCLUDE_DIR="{install}\include" \ - -D CURSES_LIBRARY="{install}\lib\pdcurses.lib" \ + -D CURSES_LIBRARIES="{install}\lib\pdcurses.lib" \ -D PThreadW32_INCLUDE_DIR="{install}\include" \ -D PThreadW32_LIBRARY="{install}\lib\pthreadVC3.lib" \ -D ZLIB_INCLUDE_DIR="{install}\include" \ @@ -572,7 +572,7 @@ platforms: -D PCRE2_INCLUDE_DIR="{install}\include" \ -D PCRE2_LIBRARY="{install}\lib\pcre2-8.lib" \ -D PDCURSES_INCLUDE_DIR="{install}\include" \ - -D CURSES_LIBRARY="{install}\lib\pdcurses.lib" \ + -D CURSES_LIBRARIES="{install}\lib\pdcurses.lib" \ -D PThreadW32_INCLUDE_DIR="{install}\include" \ -D PThreadW32_LIBRARY="{install}\lib\pthreadVC3.lib" \ -D ZLIB_INCLUDE_DIR="{install}\include" \ diff --git a/recipes/ncurses-6.yaml b/recipes/ncurses-6.yaml index 7ea798e..6629d76 100644 --- a/recipes/ncurses-6.yaml +++ b/recipes/ncurses-6.yaml @@ -22,7 +22,7 @@ platforms: host: build_script: configure: | - CFLAGS="-arch x86_64 -arch arm64" ./configure --with-termlib --disable-widec --prefix={install} + CFLAGS="-arch x86_64 -arch arm64" ./configure --disable-widec --prefix={install} make: | make install: | @@ -37,7 +37,7 @@ platforms: host-static: build_script: configure: | - CFLAGS="-arch x86_64 -arch arm64" ./configure --with-termlib --disable-widec --prefix={install} + CFLAGS="-arch x86_64 -arch arm64" ./configure --disable-widec --prefix={install} make: | make install: | @@ -53,7 +53,7 @@ platforms: host: build_script: configure: | - ./configure --with-termlib --disable-widec --prefix={install} + ./configure --disable-widec --prefix={install} make: | gmake install: | @@ -68,7 +68,7 @@ platforms: host-static: build_script: configure: | - ./configure --with-termlib --disable-widec --prefix={install} + ./configure --disable-widec --prefix={install} make: | gmake install: | @@ -84,7 +84,7 @@ platforms: host: build_script: configure: | - ./configure --with-termlib --disable-widec --prefix={install} + ./configure --disable-widec --prefix={install} make: | make install: | @@ -99,7 +99,7 @@ platforms: host-static: build_script: configure: | - ./configure --with-termlib --disable-widec --prefix={install} + ./configure --disable-widec --prefix={install} make: | make install: |