CVS commit: pkgsrc/security/libgcrypt

["David A. Holland" <dholland%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   dholland
Date:           Tue Apr 13 17:38:12 UTC 2021

Modified Files:
        pkgsrc/security/libgcrypt: distinfo
Added Files:
        pkgsrc/security/libgcrypt/patches: patch-mpi_config.links

Log Message:
PR pkg/56100: security/libgcrypt fails on NetBSD/m68k

Extend the m68k assembler syntax probe to recognize NetBSD targets.


To generate a diff of this commit:
cvs rdiff -u -r1.87 -r1.88 pkgsrc/security/libgcrypt/distinfo
cvs rdiff -u -r0 -r1.3 \
    pkgsrc/security/libgcrypt/patches/patch-mpi_config.links

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

Modified files:

Index: pkgsrc/security/libgcrypt/distinfo
diff -u pkgsrc/security/libgcrypt/distinfo:1.87 pkgsrc/security/libgcrypt/distinfo:1.88
--- pkgsrc/security/libgcrypt/distinfo:1.87     Thu Feb 18 10:58:08 2021
+++ pkgsrc/security/libgcrypt/distinfo  Tue Apr 13 17:38:12 2021
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.87 2021/02/18 10:58:08 adam Exp $
+$NetBSD: distinfo,v 1.88 2021/04/13 17:38:12 dholland Exp $
 
 SHA1 (libgcrypt-1.9.2.tar.bz2) = 29bd5d0a8f674d4521167dd518ef99b26d1e8f27
 RMD160 (libgcrypt-1.9.2.tar.bz2) = 57fca67d695ff958086becd33abfca8256efbee6
@@ -7,5 +7,6 @@ Size (libgcrypt-1.9.2.tar.bz2) = 3206187
 SHA1 (patch-aa) = 60b3f4453b217ed8879a2ffd8d485c0195ffb5f8
 SHA1 (patch-cipher_rijndael-arm.S) = ef3cb7f481022440780eb48ae31cbfad0a3ec115
 SHA1 (patch-configure) = edc92453a0843ab0442da7f1b9df2ef4c219bdf5
+SHA1 (patch-mpi_config.links) = 9808ad9a9d669ed6b84190a543b820ddcc7613df
 SHA1 (patch-random_jitterentropy-base.c) = 5a14676aae7ad5d12f9f0bed366af5183aaf22ad
 SHA1 (patch-src_visibility.h) = 8cbbf6803ab34b4b7dda832aa8ee18247aa89518

Added files:

Index: pkgsrc/security/libgcrypt/patches/patch-mpi_config.links
diff -u /dev/null pkgsrc/security/libgcrypt/patches/patch-mpi_config.links:1.3
--- /dev/null   Tue Apr 13 17:38:12 2021
+++ pkgsrc/security/libgcrypt/patches/patch-mpi_config.links    Tue Apr 13 17:38:12 2021
@@ -0,0 +1,28 @@
+$NetBSD: patch-mpi_config.links,v 1.3 2021/04/13 17:38:12 dholland Exp $
+
+Extend the m68k assembler syntax probe to match NetBSD targets.
+
+(...probably should just make ELF_SYNTAX the default for pkgsrc, but
+not now)
+
+--- mpi/config.links~  2021-01-28 12:53:52.000000000 +0000
++++ mpi/config.links
+@@ -279,6 +279,18 @@ case "${host}" in
+       path="m68k"
+         mpi_cpu_arch="m68k"
+       ;;
++    m680[234]0*-*-netbsd | \
++    m68k-*-netbsd)
++      echo '#define ELF_SYNTAX'           >>./mpi/asm-syntax.h
++      cat  $srcdir/mpi/m68k/syntax.h      >>./mpi/asm-syntax.h
++      path="m68k"
++        mpi_cpu_arch="m68k"
++      ;;
++    m68060*-*-netbsd)
++      echo '#define ELF_SYNTAX'           >>./mpi/asm-syntax.h
++      cat  $srcdir/mpi/m68k/syntax.h      >>./mpi/asm-syntax.h
++        mpi_cpu_arch="m68k"
++      ;;
+     m68k-atari-mint)
+       echo '#define MIT_SYNTAX'           >>./mpi/asm-syntax.h
+       cat  $srcdir/mpi/m68k/syntax.h      >>./mpi/asm-syntax.h