CVS commit: pkgsrc/converters/libiconv

["Hauke Fath" <hauke%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   hauke
Date:           Tue Nov 25 12:26:47 UTC 2025

Modified Files:
        pkgsrc/converters/libiconv: distinfo
        pkgsrc/converters/libiconv/patches: patch-src_Makefile.in

Log Message:
The last update brought back the breakage reported in PR pkg/57222.

Why attempt to pull in a static library from the DESTDIR tree (where
it might end up, but isn't yet), when it is right there?


To generate a diff of this commit:
cvs rdiff -u -r1.46 -r1.47 pkgsrc/converters/libiconv/distinfo
cvs rdiff -u -r1.2 -r1.3 \
    pkgsrc/converters/libiconv/patches/patch-src_Makefile.in

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

Modified files:

Index: pkgsrc/converters/libiconv/distinfo
diff -u pkgsrc/converters/libiconv/distinfo:1.46 pkgsrc/converters/libiconv/distinfo:1.47
--- pkgsrc/converters/libiconv/distinfo:1.46    Sat Nov 15 13:12:46 2025
+++ pkgsrc/converters/libiconv/distinfo Tue Nov 25 12:26:46 2025
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.46 2025/11/15 13:12:46 ryoon Exp $
+$NetBSD: distinfo,v 1.47 2025/11/25 12:26:46 hauke Exp $
 
 BLAKE2s (libiconv-1.18.tar.gz) = 8b22e4e00213e4102f7a66cc2533f0bc4e62b537eda5c5214b9fc731c6d25c95
 SHA512 (libiconv-1.18.tar.gz) = a55eb3b7b785a78ab8918db8af541c9e11deb5ff4f89d54483287711ed797d87848ce0eafffa7ce26d9a7adb4b5a9891cb484f94bd4f51d3ce97a6a47b4c719a
 Size (libiconv-1.18.tar.gz) = 5822590 bytes
-SHA1 (patch-src_Makefile.in) = 404f0134fd27366a64217ead60041dc422431b40
+SHA1 (patch-src_Makefile.in) = c99ea1eb7e9ed9b841bdc3984dad951ece0ff661

Index: pkgsrc/converters/libiconv/patches/patch-src_Makefile.in
diff -u pkgsrc/converters/libiconv/patches/patch-src_Makefile.in:1.2 pkgsrc/converters/libiconv/patches/patch-src_Makefile.in:1.3
--- pkgsrc/converters/libiconv/patches/patch-src_Makefile.in:1.2        Sat Nov 15 13:12:46 2025
+++ pkgsrc/converters/libiconv/patches/patch-src_Makefile.in    Tue Nov 25 12:26:47 2025
@@ -1,4 +1,4 @@
-$NetBSD: patch-src_Makefile.in,v 1.2 2025/11/15 13:12:46 ryoon Exp $
+$NetBSD: patch-src_Makefile.in,v 1.3 2025/11/25 12:26:47 hauke Exp $
 
 Just use libtool normally (we're pkgsrc, we have wrappers). Fixes
 pkg/57222.
@@ -23,7 +23,7 @@ pkg/57222.
 -        hpux*) $(CC) $(LDFLAGS) $(CFLAGS) $(iconv_LDFLAGS) iconv.@OBJEXT@ ../srclib/libicrt.a -L$(DESTDIR)$(libdir) -liconv @LIBINTL@ $(OBJECTS_RES_@WOE32@) `if test -n '$(DESTDIR)'; then echo " 
-Wl,+b -Wl,$(libdir)"; fi` -o iconv$(EXEEXT);; \
 -        *) $(LIBTOOL_LINK) $(CC) $(LDFLAGS) $(CFLAGS) $(iconv_LDFLAGS) iconv.@OBJEXT@ ../srclib/libicrt.a @LTLIBINTL@ $(DESTDIR)$(libdir)/libiconv.la $(OBJECTS_RES_@WOE32@) -o iconv$(EXEEXT);; \
 -      esac
-+      $(LIBTOOL_LINK) $(CC) $(LDFLAGS) $(CFLAGS) $(iconv_LDFLAGS) iconv.@OBJEXT@ ../srclib/libicrt.a @LTLIBINTL@ $(DESTDIR)$(libdir)/libiconv.la $(OBJECTS_RES_@WOE32@) -o iconv$(EXEEXT)
++      $(LIBTOOL_LINK) $(CC) $(LDFLAGS) $(CFLAGS) $(iconv_LDFLAGS) iconv.@OBJEXT@ ../srclib/libicrt.a @LTLIBINTL@ ../lib/libiconv.la $(OBJECTS_RES_@WOE32@) -o iconv$(EXEEXT)
        $(INSTALL_PROGRAM_ENV) $(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) iconv$(EXEEXT) $(DESTDIR)$(bindir)/iconv$(EXEEXT)
  
  install-strip : force