CVS commit: pkgsrc/chat

["Taylor R Campbell" <riastradh%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   riastradh
Date:           Thu May 16 23:34:12 UTC 2024

Modified Files:
        pkgsrc/chat/irssi: options.mk
        pkgsrc/chat/libotr: Makefile

Log Message:
chat/libotr, chat/irssi: Pass through libgcrypt-config on cross.

This is kludgey, on two levels:

1. We are relying on the _cross-built_ libgcrypt-config to be a shell
   script that can be executed at build-time.  (Why can't we just use
   pkg-config?  Downstream packages' configure scripts have to be
   patched to be taught to do this -- the libgcrypt.m4 autoconf library
   that gcrypt ships with doesn't know how.)

2. Knowing where the libgcrypt-config lives should be defined in one
   place, security/gcrypt/buildlink3.mk, not in every user like
   textproc/libxml2, chat/libotr, chat/irssi, &c.

But this will get irssi cross-building, at least.

No change to native build because conditional on USE_CROSS_COMPILE.


To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 pkgsrc/chat/irssi/options.mk
cvs rdiff -u -r1.20 -r1.21 pkgsrc/chat/libotr/Makefile

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

Modified files:

Index: pkgsrc/chat/irssi/options.mk
diff -u pkgsrc/chat/irssi/options.mk:1.22 pkgsrc/chat/irssi/options.mk:1.23
--- pkgsrc/chat/irssi/options.mk:1.22   Sun Feb 23 14:09:13 2020
+++ pkgsrc/chat/irssi/options.mk        Thu May 16 23:34:12 2024
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.22 2020/02/23 14:09:13 nia Exp $
+# $NetBSD: options.mk,v 1.23 2024/05/16 23:34:12 riastradh Exp $
 
 PKG_OPTIONS_VAR=               PKG_OPTIONS.irssi
 PKG_SUPPORTED_OPTIONS=         otr perl truecolor
@@ -9,6 +9,9 @@ PKG_SUGGESTED_OPTIONS=          otr perl truecol
 .if !empty(PKG_OPTIONS:Motr)
 # Build it into the main irssi executable instead of a module.
 CONFIGURE_ARGS+=       --with-otr=static
+.  if ${USE_CROSS_COMPILE:tl} == "yes"
+CONFIGURE_ARGS+=       LIBGCRYPT_CONFIG=${CROSS_DESTDIR:Q}${LOCALBASE:Q}/bin/libgcrypt-config
+.  endif
 .include "../../chat/libotr/buildlink3.mk"
 .else
 CONFIGURE_ARGS+=       --with-otr=no

Index: pkgsrc/chat/libotr/Makefile
diff -u pkgsrc/chat/libotr/Makefile:1.20 pkgsrc/chat/libotr/Makefile:1.21
--- pkgsrc/chat/libotr/Makefile:1.20    Sun Feb 23 18:07:10 2020
+++ pkgsrc/chat/libotr/Makefile Thu May 16 23:34:12 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2020/02/23 18:07:10 nia Exp $
+# $NetBSD: Makefile,v 1.21 2024/05/16 23:34:12 riastradh Exp $
 
 VERSION=       4.1.1
 DISTNAME=      libotr-${VERSION}
@@ -36,6 +36,12 @@ CONFIGURE_ARGS+=     --disable-gcc-hardening
 # left as a hint to others.
 #CONFIGURE_ARGS+=      --disable-linker-hardening
 
+.include "../../mk/bsd.prefs.mk"
+
+.if ${USE_CROSS_COMPILE:tl} == "yes"
+CONFIGURE_ARGS+=       LIBGCRYPT_CONFIG=${CROSS_DESTDIR:Q}${LOCALBASE:Q}/bin/libgcrypt-config
+.endif
+
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../security/libgcrypt/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"