CVS commit: pkgsrc/converters/libiconv

["Amitai Schleier" <schmonz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   schmonz
Date:           Mon May  8 16:21:55 UTC 2023

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

Log Message:
Just use libtool normally (we're pkgsrc, we have wrappers). Tested to
fix update builds and pkg/57222 on NetBSD 10.0_BETA, macOS 13.3.1,
Tribblix m30.


To generate a diff of this commit:
cvs rdiff -u -r1.44 -r1.45 pkgsrc/converters/libiconv/distinfo
cvs rdiff -u -r0 -r1.1 \
    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.44 pkgsrc/converters/libiconv/distinfo:1.45
--- pkgsrc/converters/libiconv/distinfo:1.44    Mon Jan 23 15:22:24 2023
+++ pkgsrc/converters/libiconv/distinfo Mon May  8 16:21:55 2023
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.44 2023/01/23 15:22:24 wiz Exp $
+$NetBSD: distinfo,v 1.45 2023/05/08 16:21:55 schmonz Exp $
 
 BLAKE2s (libiconv-1.17.tar.gz) = 4814bedfb28a110fbc6e7ae1b602c3beab371516c097667f0b4142858bbf6d02
 SHA512 (libiconv-1.17.tar.gz) = 18a09de2d026da4f2d8b858517b0f26d853b21179cf4fa9a41070b2d140030ad9525637dc4f34fc7f27abca8acdc84c6751dfb1d426e78bf92af4040603ced86
 Size (libiconv-1.17.tar.gz) = 5413283 bytes
+SHA1 (patch-src_Makefile.in) = 03500c41ec9b07b63c5800464328811d11a998d6

Added files:

Index: pkgsrc/converters/libiconv/patches/patch-src_Makefile.in
diff -u /dev/null pkgsrc/converters/libiconv/patches/patch-src_Makefile.in:1.1
--- /dev/null   Mon May  8 16:21:55 2023
+++ pkgsrc/converters/libiconv/patches/patch-src_Makefile.in    Mon May  8 16:21:55 2023
@@ -0,0 +1,29 @@
+$NetBSD: patch-src_Makefile.in,v 1.1 2023/05/08 16:21:55 schmonz Exp $
+
+Just use libtool normally (we're pkgsrc, we have wrappers). Fixes
+pkg/57222.
+
+--- src/Makefile.in.orig       2019-01-27 22:07:13.000000000 +0000
++++ src/Makefile.in
+@@ -101,20 +101,9 @@ INSTALL_PROGRAM_ENV = @INSTALL_PROGRAM_E
+ iconv_LDFLAGS = `if test -n '$(RELOCATABLE_LDFLAGS)'; then $(RELOCATABLE_LDFLAGS) $(bindir); fi`
+ 
+ # During "make install", we can build the final iconv executable.
+-# On HP-UX, in order to ensure that the new libiconv.sl will override the old
+-# one that is hardcoded in libintl.sl, we need to mention libiconv.sl before
+-# libintl.sl on the link command line. We have to bypass libtool in order to
+-# achieve this.
+-# On Solaris, the linker gives an error if we are using libintl.so and it
+-# refers to a libiconv.so in $prefix/lib since then it sees two libiconv.so's,
+-# one in $prefix/lib and one in ../lib/.libs. So we have to avoid using
+-# ../lib/libiconv.la entirely.
+ install : all force
+       if [ ! -d $(DESTDIR)$(bindir) ] ; then $(mkinstalldirs) $(DESTDIR)$(bindir) ; fi
+-      case "@host_os@" in \
+-        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 $(DESTDIR)$(libdir)/libiconv.la @LTLIBINTL@ $(OBJECTS_RES_@WOE32@) -o iconv$(EXEEXT);; \
+-      esac
++      $(LIBTOOL_LINK) $(CC) $(LDFLAGS) $(CFLAGS) $(iconv_LDFLAGS) iconv.@OBJEXT@ ../srclib/libicrt.a ../lib/libiconv.la @LTLIBINTL@ $(OBJECTS_RES_@WOE32@) -o iconv$(EXEEXT)
+       $(INSTALL_PROGRAM_ENV) $(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) iconv$(EXEEXT) $(DESTDIR)$(bindir)/iconv$(EXEEXT)
+ 
+ install-strip : force