CVS commit: pkgsrc/security/nettle

["Alistair G. Crooks" <agc%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   agc
Date:           Thu Sep 17 18:58:20 UTC 2026

Modified Files:
        pkgsrc/security/nettle: distinfo
        pkgsrc/security/nettle/patches: patch-Makefile.in patch-config.make.in

Log Message:
security/nettle: build fix

provide the libtool tag for compile and link phases, so that libtool
doesn't try to infer anything


To generate a diff of this commit:
cvs rdiff -u -r1.34 -r1.35 pkgsrc/security/nettle/distinfo
cvs rdiff -u -r1.14 -r1.15 pkgsrc/security/nettle/patches/patch-Makefile.in
cvs rdiff -u -r1.3 -r1.4 pkgsrc/security/nettle/patches/patch-config.make.in

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

Modified files:

Index: pkgsrc/security/nettle/distinfo
diff -u pkgsrc/security/nettle/distinfo:1.34 pkgsrc/security/nettle/distinfo:1.35
--- pkgsrc/security/nettle/distinfo:1.34        Thu May 14 16:29:23 2026
+++ pkgsrc/security/nettle/distinfo     Thu Sep 17 18:58:20 2026
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.34 2026/05/14 16:29:23 ryoon Exp $
+$NetBSD: distinfo,v 1.35 2026/09/17 18:58:20 agc Exp $
 
 BLAKE2s (nettle-4.0.tar.gz) = ffef23783302e27718f7d9a279f936cfa826a8d8a06bca8c16a3cd56ed2fb8e3
 SHA512 (nettle-4.0.tar.gz) = 833303d94f5a67094011ad4dd931fffdb9adf679b4df241a544a08194a66e6e449398b704ba5b29d52c1c3b5ada6f6dc18b24d1adb3382a68470a11645bf13cd
 Size (nettle-4.0.tar.gz) = 2630735 bytes
-SHA1 (patch-Makefile.in) = 50b24e265e35b58228c897e8ea8381ea8ff6efc4
-SHA1 (patch-config.make.in) = 708fb3cac9c44825e0d231541cbecade2239c850
+SHA1 (patch-Makefile.in) = 2a08720aa2f4f95586b44657bffa4b839a44622e
+SHA1 (patch-config.make.in) = 6b01bcd2869efcc43cde63b6f9a3cdc56a150856
 SHA1 (patch-configure) = c05cec552acae0340fa017e433a2cc436a4e86a2
 SHA1 (patch-testsuite_Makefile.in) = 23cc958d5b4bc5c3822848ce0e4be5e7f13d2ffc
 SHA1 (patch-tools_Makefile.in) = 743d09935526cb783fe93ffc417c4153e13dcfac

Index: pkgsrc/security/nettle/patches/patch-Makefile.in
diff -u pkgsrc/security/nettle/patches/patch-Makefile.in:1.14 pkgsrc/security/nettle/patches/patch-Makefile.in:1.15
--- pkgsrc/security/nettle/patches/patch-Makefile.in:1.14       Thu May 14 16:29:23 2026
+++ pkgsrc/security/nettle/patches/patch-Makefile.in    Thu Sep 17 18:58:20 2026
@@ -1,4 +1,4 @@
-$NetBSD: patch-Makefile.in,v 1.14 2026/05/14 16:29:23 ryoon Exp $
+$NetBSD: patch-Makefile.in,v 1.15 2026/09/17 18:58:20 agc Exp $
 
 Use LIBTOOL.
 
@@ -22,7 +22,7 @@ Use LIBTOOL.
 -      $(AR) $(ARFLAGS) $@ $(nettle_OBJS)
 -      $(RANLIB) $@
 +libnettle.la: $(nettle_OBJS)
-+      ${LIBTOOL} --mode=link ${CC} ${LDFLAGS} -o libnettle.la \
++      ${LIBTOOL} --mode=link --tag=CC ${CC} ${LDFLAGS} -o libnettle.la \
 +              ${nettle_OBJS:.o=.lo} -rpath ${PREFIX}/lib \
 +              -version-info ${LIBNETTLE_MAJOR}:${LIBNETTLE_MINOR}
        echo nettle > libnettle.stamp
@@ -32,7 +32,7 @@ Use LIBTOOL.
 -      $(AR) $(ARFLAGS) $@ $(hogweed_OBJS)
 -      $(RANLIB) $@
 +libhogweed.la: $(hogweed_OBJS)
-+      ${LIBTOOL} --mode=link ${CC} ${LDFLAGS} -o libhogweed.la \
++      ${LIBTOOL} --mode=link --tag=CC ${CC} ${LDFLAGS} -o libhogweed.la \
 +              ${hogweed_OBJS:.o=.lo} -rpath ${PREFIX}/lib \
 +              -version-info ${LIBHOGWEED_MAJOR}:${LIBHOGWEED_MINOR}
        echo hogweed > libhogweed.stamp
@@ -40,11 +40,11 @@ Use LIBTOOL.
  %.$(OBJEXT): %.asm $(srcdir)/m4-utils.m4 $(srcdir)/asm.m4 config.m4 machine.m4
        $(M4) $(srcdir)/m4-utils.m4 $(srcdir)/asm.m4 config.m4 machine.m4 $< >$*.s
 -      $(COMPILE) $(ASM_FLAGS) -c $*.s
-+      ${LIBTOOL} --mode=compile $(COMPILE) -c $*.s
++      ${LIBTOOL} --mode=compile --tag=CC $(COMPILE) -c $*.s
  
  %.$(OBJEXT): %.c
 -      $(COMPILE) -c $< \
-+      ${LIBTOOL} --mode=compile $(COMPILE) -c $< \
++      ${LIBTOOL} --mode=compile --tag=CC $(COMPILE) -c $< \
        && $(DEP_PROCESS)
  
  # Rules building shared libraries.

Index: pkgsrc/security/nettle/patches/patch-config.make.in
diff -u pkgsrc/security/nettle/patches/patch-config.make.in:1.3 pkgsrc/security/nettle/patches/patch-config.make.in:1.4
--- pkgsrc/security/nettle/patches/patch-config.make.in:1.3     Sun Aug 23 14:22:10 2015
+++ pkgsrc/security/nettle/patches/patch-config.make.in Thu Sep 17 18:58:20 2026
@@ -1,4 +1,4 @@
-$NetBSD: patch-config.make.in,v 1.3 2015/08/23 14:22:10 wiz Exp $
+$NetBSD: patch-config.make.in,v 1.4 2026/09/17 18:58:20 agc Exp $
 
 Use LIBTOOL.
 
@@ -10,8 +10,8 @@ Use LIBTOOL.
  COMPILE_CXX = $(CXX) $(PRE_CPPFLAGS) $(CPPFLAGS) $(DEFS) $(CXXFLAGS) $(DEP_FLAGS)
 -LINK = $(CC) $(CFLAGS) $(PRE_LDFLAGS) $(LDFLAGS)
 -LINK_CXX = $(CXX) $(CXXFLAGS) $(PRE_LDFLAGS) $(LDFLAGS)
-+LINK = ${LIBTOOL} --mode=link $(CC) $(CFLAGS) $(PRE_LDFLAGS) $(LDFLAGS)
-+LINK_CXX = ${LIBTOOL} --mode=link $(CXX) $(CXXFLAGS) $(PRE_LDFLAGS) $(LDFLAGS)
++LINK = ${LIBTOOL} --mode=link --tag=CC $(CC) $(CFLAGS) $(PRE_LDFLAGS) $(LDFLAGS)
++LINK_CXX = ${LIBTOOL} --mode=link --tag=CXX $(CXX) $(CXXFLAGS) $(PRE_LDFLAGS) $(LDFLAGS)
  
  # Default rule. Must be here, since config.make is included before the
  # usual targets.