pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

sequoia-chameleon-gnupg: hack around weird link error

Module Name:	pkgsrc-wip
Committed By:	Thomas Klausner <wiz%NetBSD.org@localhost>
Pushed By:	wiz
Date:		Thu Mar 6 18:24:15 2025 +0100
Changeset:	0bb6eaedc4a2492bb5b1ecec3ee0e5422e7df831

Modified Files:
	sequoia-chameleon-gnupg/Makefile
	sequoia-chameleon-gnupg/PLIST
Removed Files:
	sequoia-chameleon-gnupg/TODO

Log Message:
sequoia-chameleon-gnupg: hack around weird link error

Finish package.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=0bb6eaedc4a2492bb5b1ecec3ee0e5422e7df831

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 sequoia-chameleon-gnupg/Makefile | 12 +++--
 sequoia-chameleon-gnupg/PLIST    | 98 +++++-----------------------------------
 sequoia-chameleon-gnupg/TODO     | 19 --------
 3 files changed, 20 insertions(+), 109 deletions(-)

diffs:
diff --git a/sequoia-chameleon-gnupg/Makefile b/sequoia-chameleon-gnupg/Makefile
index 929f10afa4..fc4af6b411 100644
--- a/sequoia-chameleon-gnupg/Makefile
+++ b/sequoia-chameleon-gnupg/Makefile
@@ -29,11 +29,17 @@ INSTALLATION_DIRS+=	share/bash-completion/completions
 INSTALLATION_DIRS+=	share/fish/vendor_completions.d
 INSTALLATION_DIRS+=	share/zsh/site-functions
 
+# https://gitlab.com/sequoia-pgp/sequoia-chameleon-gnupg/-/issues/127
+BUILDLINK_TRANSFORM+=	rm:-lnettl
+
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/target/release/build/sequoia-chameleon-gnupg-*/out/man-pages/*.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
-	${INSTALL_DATA} ${WRKSRC}/target/release/build/sequoia-chameleon-gnupg-*/out/shell-completions/sq.bash ${DESTDIR}${PREFIX}/share/bash-completion/completions
-	${INSTALL_DATA} ${WRKSRC}/target/release/build/sequoia-chameleon-gnupg-*/out/shell-completions/sq.fish ${DESTDIR}${PREFIX}/share/fish/vendor_completions.d
-	${INSTALL_DATA} ${WRKSRC}/target/release/build/sequoia-chameleon-gnupg-*/out/shell-completions/_sq ${DESTDIR}${PREFIX}/share/zsh/site-functions
+	${INSTALL_DATA} ${WRKSRC}/target/release/build/sequoia-chameleon-gnupg-*/out/shell-completions/gpg-sq.bash ${DESTDIR}${PREFIX}/share/bash-completion/completions
+	${INSTALL_DATA} ${WRKSRC}/target/release/build/sequoia-chameleon-gnupg-*/out/shell-completions/gpgv-sq.bash ${DESTDIR}${PREFIX}/share/bash-completion/completions
+	${INSTALL_DATA} ${WRKSRC}/target/release/build/sequoia-chameleon-gnupg-*/out/shell-completions/gpg-sq.fish ${DESTDIR}${PREFIX}/share/fish/vendor_completions.d
+	${INSTALL_DATA} ${WRKSRC}/target/release/build/sequoia-chameleon-gnupg-*/out/shell-completions/gpgv-sq.fish ${DESTDIR}${PREFIX}/share/fish/vendor_completions.d
+	${INSTALL_DATA} ${WRKSRC}/target/release/build/sequoia-chameleon-gnupg-*/out/shell-completions/_gpg-sq ${DESTDIR}${PREFIX}/share/zsh/site-functions
+	${INSTALL_DATA} ${WRKSRC}/target/release/build/sequoia-chameleon-gnupg-*/out/shell-completions/_gpgv-sq ${DESTDIR}${PREFIX}/share/zsh/site-functions
 
 .include "../../databases/sqlite3/buildlink3.mk"
 .include "../../lang/rust/cargo.mk"
diff --git a/sequoia-chameleon-gnupg/PLIST b/sequoia-chameleon-gnupg/PLIST
index 1546b90341..2f98fcb06f 100644
--- a/sequoia-chameleon-gnupg/PLIST
+++ b/sequoia-chameleon-gnupg/PLIST
@@ -1,87 +1,11 @@
-@comment $NetBSD: PLIST,v 1.4 2025/03/05 11:12:38 wiz Exp $
-bin/sq
-man/man1/sq-cert-export.1
-man/man1/sq-cert-import.1
-man/man1/sq-cert-lint.1
-man/man1/sq-cert-list.1
-man/man1/sq-cert.1
-man/man1/sq-config-get.1
-man/man1/sq-config-inspect-network.1
-man/man1/sq-config-inspect-paths.1
-man/man1/sq-config-inspect-policy.1
-man/man1/sq-config-inspect.1
-man/man1/sq-config-template.1
-man/man1/sq-config.1
-man/man1/sq-decrypt.1
-man/man1/sq-download.1
-man/man1/sq-encrypt.1
-man/man1/sq-inspect.1
-man/man1/sq-key-approvals-list.1
-man/man1/sq-key-approvals-update.1
-man/man1/sq-key-approvals.1
-man/man1/sq-key-delete.1
-man/man1/sq-key-expire.1
-man/man1/sq-key-export.1
-man/man1/sq-key-generate.1
-man/man1/sq-key-import.1
-man/man1/sq-key-list.1
-man/man1/sq-key-password.1
-man/man1/sq-key-revoke.1
-man/man1/sq-key-rotate.1
-man/man1/sq-key-subkey-add.1
-man/man1/sq-key-subkey-bind.1
-man/man1/sq-key-subkey-delete.1
-man/man1/sq-key-subkey-expire.1
-man/man1/sq-key-subkey-export.1
-man/man1/sq-key-subkey-password.1
-man/man1/sq-key-subkey-revoke.1
-man/man1/sq-key-subkey.1
-man/man1/sq-key-userid-add.1
-man/man1/sq-key-userid-revoke.1
-man/man1/sq-key-userid.1
-man/man1/sq-key.1
-man/man1/sq-keyring-filter.1
-man/man1/sq-keyring-list.1
-man/man1/sq-keyring-merge.1
-man/man1/sq-keyring-split.1
-man/man1/sq-keyring.1
-man/man1/sq-network-dane-generate.1
-man/man1/sq-network-dane-search.1
-man/man1/sq-network-dane.1
-man/man1/sq-network-keyserver-publish.1
-man/man1/sq-network-keyserver-search.1
-man/man1/sq-network-keyserver.1
-man/man1/sq-network-search.1
-man/man1/sq-network-wkd-publish.1
-man/man1/sq-network-wkd-search.1
-man/man1/sq-network-wkd.1
-man/man1/sq-network.1
-man/man1/sq-packet-armor.1
-man/man1/sq-packet-dearmor.1
-man/man1/sq-packet-decrypt.1
-man/man1/sq-packet-dump.1
-man/man1/sq-packet-join.1
-man/man1/sq-packet-split.1
-man/man1/sq-packet.1
-man/man1/sq-pki-authenticate.1
-man/man1/sq-pki-identify.1
-man/man1/sq-pki-link-add.1
-man/man1/sq-pki-link-authorize.1
-man/man1/sq-pki-link-list.1
-man/man1/sq-pki-link-retract.1
-man/man1/sq-pki-link.1
-man/man1/sq-pki-lookup.1
-man/man1/sq-pki-path.1
-man/man1/sq-pki-vouch-add.1
-man/man1/sq-pki-vouch-authorize.1
-man/man1/sq-pki-vouch-list.1
-man/man1/sq-pki-vouch-replay.1
-man/man1/sq-pki-vouch.1
-man/man1/sq-pki.1
-man/man1/sq-sign.1
-man/man1/sq-verify.1
-man/man1/sq-version.1
-man/man1/sq.1
-share/bash-completion/completions/sq.bash
-share/fish/vendor_completions.d/sq.fish
-share/zsh/site-functions/_sq
+@comment $NetBSD$
+bin/gpg-sq
+bin/gpgv-sq
+man/man1/gpg-sq.1
+man/man1/gpgv-sq.1
+share/bash-completion/completions/gpg-sq.bash
+share/bash-completion/completions/gpgv-sq.bash
+share/fish/vendor_completions.d/gpg-sq.fish
+share/fish/vendor_completions.d/gpgv-sq.fish
+share/zsh/site-functions/_gpg-sq
+share/zsh/site-functions/_gpgv-sq
diff --git a/sequoia-chameleon-gnupg/TODO b/sequoia-chameleon-gnupg/TODO
deleted file mode 100644
index 9d2dc90bd0..0000000000
--- a/sequoia-chameleon-gnupg/TODO
+++ /dev/null
@@ -1,19 +0,0 @@
-Fails to build:
-
-  = note: LC_ALL="C" PATH="/usr/pkg/lib/rustlib/x86_64-unknown-netbsd/bin:/scratch/security/sequoia-chameleon-gnupg/work/.cwrapper/bin:/scratch/security/sequoia-chameleon-gnupg/work/.buildlink/bin:/scratch/security/sequoia-chameleon-gnupg/work/.gcc/bin:/scratch/security/sequoia-chameleon-gnupg/work/.tools/bin:/usr/pkg/bin:/home/wiz/bin:/usr/local/bin:/usr/X11R7/bin:/bin:/usr/bin:/usr/pkg/bin:/usr/local/bin:/sbin:/usr/sbin:/usr/pkg/sbin:/usr/local/sbin:/usr/games:/archive/foreign/localsrc/security/advisories:/sbin:/usr/sbin:/usr/local/bin:/usr/pkg_bulk/bin:/usr/pkg/bin:/usr/pkg/bin" VSLANG="1033" "cc" "-Wl,-R/usr/pkg/lib/libatomic" "-Wl,-L/usr/pkg/lib/libatomic" "-m64" "/tmp/rustc0gBsZ0/symbols.o" "/scratch/security/sequoia-chameleon-gnupg/work/sequoia-chameleon-gnupg-v0.12.0-bba1ced319eb4cd34d937392054d9d0ea0838243/target/release/deps/gpgv_sq-58bd1f4c313dd714.gpgv_sq.cc0ab99aec818498-cgu.0.rcgu.o" "-Wl,--as-needed" "-Wl,-Bstatic" "/tmp/rustc0gBsZ0/libbzip2_sys-5a3a18631706c3
30.rlib" "/usr/pkg/lib/rustlib/x86_64-unknown-netbsd/lib/libcompiler_builtins-b32ad93acc0f9fdc.rlib" "-Wl,-Bdynamic" "-lssl" "-lcrypto" "-lsqlite3" "-lnettle" "-lhogweed" "-lnettl" "-lgmp" "-lutil" "-lrt" "-lutil" "-lexecinfo" "-lexecinfo" "-lpthread" "-lrt" "-lgcc_s" "-lc" "-lm" "-lrt" "-lpthread" "-lutil" "-lrt" "-lutil" "-lexecinfo" "-Wl,--eh-frame-hdr" "-Wl,-z,noexecstack" "-L" "/scratch/security/sequoia-chameleon-gnupg/work/sequoia-chameleon-gnupg-v0.12.0-bba1ced319eb4cd34d937392054d9d0ea0838243/target/release/build/bzip2-sys-288f7fdfce6862d1/out/lib" "-L" "/usr/lib" "-L" "/usr/pkg/lib" "-L" "/usr/pkg/lib" "-L" "/usr/pkg/lib" "-L" "/usr/pkg/lib" "-L" "/usr/pkg/lib" "-o" "/scratch/security/sequoia-chameleon-gnupg/work/sequoia-chameleon-gnupg-v0.12.0-bba1ced319eb4cd34d937392054d9d0ea0838243/target/release/deps/gpgv_sq-58bd1f4c313dd714" "-Wl,--gc-sections" "-pie" "-Wl,-z,relro,-z,now" "-Wl,-O1" "-Wl,-R/usr/lib" "-Wl,-R/usr/pkg/lib" "-Wl,-R/usr/pkg/lib"
-  = note: ld: cannot find -lnettl: No such file or directory
-          ld: /scratch/security/sequoia-chameleon-gnupg/work/sequoia-chameleon-gnupg-v0.12.0-bba1ced319eb4cd34d937392054d9d0ea0838243/target/release/deps/gpgv_sq-58bd1f4c313dd714.gpgv_sq.cc0ab99aec818498-cgu.0.rcgu.o: in function `mio::sys::unix::selector::Selector::register':
-          gpgv_sq.cc0ab99aec818498-cgu.0:(.text._ZN3mio3sys4unix8selector8Selector8register17ha76f48098e096b1cE+0x8a): warning: warning: reference to compatibility __kevent50(); use kevent()
-          ld: /scratch/security/sequoia-chameleon-gnupg/work/sequoia-chameleon-gnupg-v0.12.0-bba1ced319eb4cd34d937392054d9d0ea0838243/target/release/deps/gpgv_sq-58bd1f4c313dd714.gpgv_sq.cc0ab99aec818498-cgu.0.rcgu.o: note: the message above does not take linker garbage collection into account
-
-
-warning: `sequoia-chameleon-gnupg` (bin "gpgv-sq") generated 2 warnings
-The following warnings were emitted during compilation:
-
-warning: sequoia-chameleon-gnupg@0.12.0: shell completions written to /scratch/security/sequoia-chameleon-gnupg/work/sequoia-chameleon-gnupg-v0.12.0-bba1ced319eb4cd34d937392054d9d0ea0838243/target/release/build/sequoia-chameleon-gnupg-51a9f693b2f17ea6/out/shell-completions
-warning: sequoia-chameleon-gnupg@0.12.0: man pages written to /scratch/security/sequoia-chameleon-gnupg/work/sequoia-chameleon-gnupg-v0.12.0-bba1ced319eb4cd34d937392054d9d0ea0838243/target/release/build/sequoia-chameleon-gnupg-51a9f693b2f17ea6/out/man-pages
-
-error: could not compile `sequoia-chameleon-gnupg` (bin "gpgv-sq") due to 1 previous error; 2 warnings emitted
-
-Reported upstream at:
-https://gitlab.com/sequoia-pgp/sequoia-chameleon-gnupg/-/issues/127
Home | Main Index | Thread Index | Old Index