diff options
Diffstat (limited to 'security')
| -rw-r--r-- | security/arti/Makefile | 2 | ||||
| -rw-r--r-- | security/authenticator/files/patch-build-aux_cargo.sh | 15 | ||||
| -rw-r--r-- | security/sequoia/Makefile | 13 | ||||
| -rw-r--r-- | security/solana/Makefile | 2 |
4 files changed, 23 insertions, 9 deletions
diff --git a/security/arti/Makefile b/security/arti/Makefile index 3514e8e39769..5aebcc585121 100644 --- a/security/arti/Makefile +++ b/security/arti/Makefile @@ -288,7 +288,7 @@ CARGO_CRATES= adler-1.0.2 \ PLIST_FILES= bin/arti do-install: - ${INSTALL_SCRIPT} ${WRKDIR}/target/release/arti ${STAGEDIR}${PREFIX}/bin/arti + ${INSTALL_SCRIPT} ${CARGO_TARGET_DIR}/${CARGO_BUILD_TARGET}/*/arti ${STAGEDIR}${PREFIX}/bin/arti post-install: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/arti diff --git a/security/authenticator/files/patch-build-aux_cargo.sh b/security/authenticator/files/patch-build-aux_cargo.sh new file mode 100644 index 000000000000..4682a5974221 --- /dev/null +++ b/security/authenticator/files/patch-build-aux_cargo.sh @@ -0,0 +1,15 @@ +--- build-aux/cargo.sh.orig 2021-09-08 15:33:49 UTC ++++ build-aux/cargo.sh +@@ -12,10 +12,10 @@ if [ "$BUILDTYPE" = "release" ]; then + echo "RELEASE MODE" + cargo build --manifest-path \ + "$MESON_SOURCE_ROOT"/Cargo.toml --release && +- cp "$CARGO_TARGET_DIR"/release/"$APP_BIN" "$OUTPUT" ++ cp "$CARGO_TARGET_DIR"/$CARGO_BUILD_TARGET/release/"$APP_BIN" "$OUTPUT" + else + echo "DEBUG MODE" + cargo build --manifest-path \ + "$MESON_SOURCE_ROOT"/Cargo.toml && +- cp "$CARGO_TARGET_DIR"/debug/"$APP_BIN" "$OUTPUT" ++ cp "$CARGO_TARGET_DIR"/$CARGO_BUILD_TARGET/debug/"$APP_BIN" "$OUTPUT" + fi diff --git a/security/sequoia/Makefile b/security/sequoia/Makefile index df313b4195ea..3fb8334b1899 100644 --- a/security/sequoia/Makefile +++ b/security/sequoia/Makefile @@ -309,17 +309,16 @@ do-install: ${STAGEDIR}${PREFIX}/etc/bash_completion.d \ ${STAGEDIR}${PREFIX}/share/fish/completions \ ${STAGEDIR}${PREFIX}/share/zsh/site-functions -.for f in ffi ffi_macros openpgp_ffi - ${STRIP_CMD} ${CARGO_TARGET_DIR}/release/libsequoia_${f}.so - ${INSTALL_LIB} ${CARGO_TARGET_DIR}/release/libsequoia_${f}.so ${STAGEDIR}${PREFIX}/lib/libsequoia_${f}.so.${SOVERS} +.for f in ffi openpgp_ffi + ${INSTALL_LIB} ${CARGO_TARGET_DIR}/${CARGO_BUILD_TARGET}/*/libsequoia_${f}.so ${STAGEDIR}${PREFIX}/lib/libsequoia_${f}.so.${SOVERS} ${LN} -sf libsequoia_${f}.so.${SOVERS} ${STAGEDIR}${PREFIX}/lib/libsequoia_${f}.so .endfor + ${INSTALL_LIB} ${CARGO_TARGET_DIR}/*/libsequoia_ffi_macros.so ${STAGEDIR}${PREFIX}/lib/libsequoia_ffi_macros.so.${SOVERS} + ${LN} -sf libsequoia_ffi_macros.so.${SOVERS} ${STAGEDIR}${PREFIX}/lib/libsequoia_ffi_macros.so .for f in sq sqop sqv - ${STRIP_CMD} ${CARGO_TARGET_DIR}/release/${f} - ${INSTALL_PROGRAM} ${CARGO_TARGET_DIR}/release/${f} ${STAGEDIR}${PREFIX}/bin + ${INSTALL_PROGRAM} ${CARGO_TARGET_DIR}/${CARGO_BUILD_TARGET}/*/${f} ${STAGEDIR}${PREFIX}/bin .endfor - ${STRIP_CMD} ${CARGO_TARGET_DIR}/release/sequoia-public-key-store - ${INSTALL_PROGRAM} ${CARGO_TARGET_DIR}/release/sequoia-public-key-store ${STAGEDIR}${PREFIX}/lib/sequoia/sequoia-public-key-store + ${INSTALL_PROGRAM} ${CARGO_TARGET_DIR}/${CARGO_BUILD_TARGET}/*/sequoia-public-key-store ${STAGEDIR}${PREFIX}/lib/sequoia/sequoia-public-key-store (cd ${WRKSRC}/ffi/include && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/include) (cd ${WRKSRC}/openpgp-ffi/include/sequoia && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/include/sequoia) diff --git a/security/solana/Makefile b/security/solana/Makefile index a18de962357b..a2d2d6261873 100644 --- a/security/solana/Makefile +++ b/security/solana/Makefile @@ -566,7 +566,7 @@ LLVM_VERSION= 12 BINARY_ALIAS= llvm-config=${PREFIX}/bin/llvm-config${LLVM_VERSION} do-install: - for f in ${WRKDIR}/target/release/${PORTNAME}*; do \ + for f in ${CARGO_TARGET_DIR}/${CARGO_BUILD_TARGET}/*/${PORTNAME}*; do \ if [ -f $$f -a -x $$f ]; then \ ${INSTALL_PROGRAM} $$f ${STAGEDIR}${PREFIX}/bin; \ fi \ |