Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .github/platforms.json
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
"linux_x86_64": [
{
"platform": "x86_64-linux",
"os": "ubuntu-latest",
"os": "ubuntu-22.04",
"ruby": "3.4",
"description": "Linux x86_64 (generic)",
"build": true,
Expand All @@ -65,7 +65,7 @@
},
{
"platform": "x86_64-linux-gnu",
"os": "ubuntu-latest",
"os": "ubuntu-22.04",
"ruby": "3.4",
"description": "Linux x86_64 GNU libc",
"build": true,
Expand All @@ -83,7 +83,7 @@
"linux_aarch64": [
{
"platform": "aarch64-linux",
"os": "ubuntu-latest",
"os": "ubuntu-22.04",
"ruby": "3.4",
"description": "Linux ARM64 (generic)",
"build": true,
Expand All @@ -93,7 +93,7 @@
},
{
"platform": "aarch64-linux-gnu",
"os": "ubuntu-latest",
"os": "ubuntu-22.04",
"ruby": "3.4",
"description": "Linux ARM64 GNU libc",
"build": true,
Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/gem-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,6 @@ jobs:
tmp
lib/ffi-libarchive-binary/libarchive.*
key: deps-${{ matrix.platform }}-${{ hashFiles('ext/configuration.yml', 'lib/ffi-libarchive-binary/*_recipe.rb', 'lib/ffi-libarchive-binary/base_recipe.rb') }}
restore-keys: |
deps-${{ matrix.platform }}-

- uses: ruby/setup-ruby@v1
with:
Expand Down
7 changes: 4 additions & 3 deletions lib/ffi-libarchive-binary/libarchive_recipe.rb
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,10 @@ def default_flags
"-DENABLE_OPENSSL:BOOL=ON", "-DENABLE_LIBB2:BOOL=OFF", "-DENABLE_LZ4:BOOL=OFF",
"-DENABLE_LZO::BOOL=OFF", "-DENABLE_LZMA:BOOL=ON", "-DENABLE_ZSTD:BOOL=OFF",
"-DENABLE_ZLIB::BOOL=ON", "-DENABLE_BZip2:BOOL=OFF", "-DENABLE_LIBXML2:BOOL=OFF",
"-DENABLE_EXPAT::BOOL=ON", "-DENABLE_TAR:BOOL=OFF", "-DENABLE_CPIO::BOOL=OFF",
"-DENABLE_CAT:BOOL=OFF", "-DENABLE_ACL:BOOL=OFF", "-DENABLE_TEST:BOOL=OFF",
"-DENABLE_UNZIP:BOOL=OFF", "-DOPENSSL_USE_STATIC_LIBS=ON", "-DENABLE_XAR:BOOL=ON",
"-DENABLE_EXPAT::BOOL=ON", "-DENABLE_TAR:BOOL=OFF", "-DENABLE_ICONV:BOOL=OFF",
"-DENABLE_CPIO::BOOL=OFF", "-DENABLE_CAT:BOOL=OFF", "-DENABLE_ACL:BOOL=OFF",
"-DENABLE_TEST:BOOL=OFF", "-DENABLE_UNZIP:BOOL=OFF", "-DOPENSSL_USE_STATIC_LIBS=ON",
"-DENABLE_XAR:BOOL=ON",

# Provide root directories - let CMake find libraries in lib or lib64
"-DOPENSSL_ROOT_DIR:PATH=#{@openssl_recipe.path}",
Expand Down
Loading