Re: [bug-gnu-libiconv] Patch suggestion

[Roumen Petrov]

Hi,

Bruno Haible wrote:
> Hello Roumen,
>
> > The complete solution is to replace all. Actually libiconv 1.12 use 
> > resource in two places(targets) and both don't work.
> Huh? On mingw, I looked for the presence of the resource info, and found that
> in you can access this info through the Windows NT file explorer, via a pop-up
> menu on the file's icon. The one in iconv.exe was present, the one in
> libiconv.dll was missing. So I added that.

I just finish cross-build from source (v1.12 both v.13). For both 
versions executable is with resource info. Now libiconv (v.13) is linked 
with resource info (checked with winedump -j resource binary).
I can't reproduce issue with executable in 1.12. So maybe I'm wrong.

About libiconv resource. InternalName/OriginalFilename name is 
iconv.dll, i.e without "lib" prefix.


> I found it a bit strange that "strings < iconv.exe" showed part of the resource
> text, but "strings < libiconv.dll" didn't, although the info was visible in
> the file explorer.

This is unexpected. If I remember well resource object was not passed to 
the linker.


> > Also configure.ac still contain
> >   AC_CHECK_TOOL([WINDRES], [windres]).
>
> Yes, this is needed for the src/Makefile.in.

It is just one more check - not so important if things work.


> > I will cross-compile v1.13 and I will keep you informed.
>
> Ah, you are cross-compiling from Linux? I used a cross-compile from Cygwin;
> maybe that makes a difference?

There is another difference. May be related to '.exe suffix' -
http://avialle.free.fr/cygwin-ug-net/using-specialnames.html#id4729824

After install bin directory contain
iconv
libcharset-1.dll
libiconv-2.dll

I'm using patch (see attached) file to add .exe suffix for 
install/uninstall targets (even for hpux :) just in case).


> Bruno

Roumen

--- ./src/Makefile.in.ORIG      2007-05-28 01:15:52.000000000 +0300
+++ ./src/Makefile.in   2008-12-21 15:38:02.000000000 +0200
@@ -103,16 +103,16 @@
 install : all force
        if [ ! -d $(DESTDIR)$(bindir) ] ; then $(mkinstalldirs) 
$(DESTDIR)$(bindir) ; fi
        case "@host_os@" in \
-         hpux*) $(CC) $(LDFLAGS) $(CFLAGS) $(iconv_LDFLAGS) address@hidden@ 
../srclib/libicrt.a -L$(DESTDIR)$(libdir) -liconv @LIBINTL@ $(address@hidden@) 
`if test -n '$(DESTDIR)'; then echo " -Wl,+b -Wl,$(libdir)"; fi` -o iconv;; \
-         *) $(LIBTOOL_LINK) $(CC) $(LDFLAGS) $(CFLAGS) $(iconv_LDFLAGS) 
address@hidden@ ../srclib/libicrt.a $(DESTDIR)$(libdir)/libiconv.la @LTLIBINTL@ 
$(address@hidden@) -o iconv;; \
+         hpux*) $(CC) $(LDFLAGS) $(CFLAGS) $(iconv_LDFLAGS) address@hidden@ 
../srclib/libicrt.a -L$(DESTDIR)$(libdir) -liconv @LIBINTL@ $(address@hidden@) 
`if test -n '$(DESTDIR)'; then echo " -Wl,+b -Wl,$(libdir)"; fi` -o 
iconv$(EXEEXT);; \
+         *) $(LIBTOOL_LINK) $(CC) $(LDFLAGS) $(CFLAGS) $(iconv_LDFLAGS) 
address@hidden@ ../srclib/libicrt.a $(DESTDIR)$(libdir)/libiconv.la @LTLIBINTL@ 
$(address@hidden@) -o iconv$(EXEEXT);; \
        esac
-       $(INSTALL_PROGRAM_ENV) $(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) iconv 
$(DESTDIR)$(bindir)/iconv
+       $(INSTALL_PROGRAM_ENV) $(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) 
iconv$(EXEEXT) $(DESTDIR)$(bindir)/iconv$(EXEEXT)
 
 installdirs : force
        if [ ! -d $(DESTDIR)$(bindir) ] ; then $(mkinstalldirs) 
$(DESTDIR)$(bindir) ; fi
 
 uninstall : force
-       $(LIBTOOL_UNINSTALL) $(RM) $(DESTDIR)$(bindir)/iconv
+       $(LIBTOOL_UNINSTALL) $(RM) $(DESTDIR)$(bindir)/iconv$(EXEEXT)
 
 check : all