From 692fe80dd11345c0efa811a844dd02ecaaf2d477 Mon Sep 17 00:00:00 2001 From: Jacob Heider Date: Tue, 8 Sep 2026 16:00:53 -0400 Subject: [PATCH] fix(rpm-sequoia) closes #14301 --- projects/rpm.org/rpm-sequoia/package.yml | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/projects/rpm.org/rpm-sequoia/package.yml b/projects/rpm.org/rpm-sequoia/package.yml index c72a4ba011..58990d374f 100644 --- a/projects/rpm.org/rpm-sequoia/package.yml +++ b/projects/rpm.org/rpm-sequoia/package.yml @@ -9,31 +9,34 @@ versions: platforms: [linux] -dependencies: - openssl.org: ^1.1 - build: dependencies: rust-lang.org: ">=1.85" + pkgx.sh: ">=1" env: - OPENSSL_DIR: "{{deps.openssl.org.prefix}}" + OPENSSL_DIR: "{{pkgx.prefix}}/openssl.org/v3" + OPENSSL_STATIC: "1" + PREFIX: "{{prefix}}" script: + - pkgx +openssl.org^3.0.7 - cargo build --release --no-default-features --features crypto-openssl - run: install -Dm755 $SRCROOT/target/release/librpm_sequoia.so librpm_sequoia.so working-directory: ${{prefix}}/lib/ - run: ln -s librpm_sequoia.so librpm_sequoia.so.1 working-directory: ${{prefix}}/lib if: linux - - run: sed 's|/usr/local|{{prefix}}|' $SRCROOT/target/release/rpm-sequoia.pc >rpm-sequoia.pc + # OPENSSL_STATIC: don't advertise a libssl pkg-config dep + - run: sed -e 's|/usr/local|{{prefix}}|' -e 's/^Requires.private:.*/Requires.private:/' $SRCROOT/target/release/rpm-sequoia.pc >rpm-sequoia.pc working-directory: ${{prefix}}/lib/pkgconfig/ test: dependencies: gnu.org/gcc: "*" + freedesktop.org/pkg-config: "*" script: - test -f {{prefix}}/lib/librpm_sequoia.so - test -f {{prefix}}/lib/pkgconfig/rpm-sequoia.pc - - pkg-config --exists rpm-sequoia + - pkg-config --print-errors --exists rpm-sequoia # Test C linkage with the rpm-sequoia library - run: gcc -v $FIXTURE -o test_link $(pkg-config --cflags --libs rpm-sequoia) fixture: