pjs/tools/build-environment/win32/libiconv-build.patch

29 строки
1.6 KiB
Diff

--- src/Makefile.in Fri Jul 14 09:19:07 2006
+++ src/Makefile.in Fri Mar 9 16:16:21 2007
@@ -95,11 +95,11 @@
if [ ! -d $(DESTDIR)$(exec_prefix) ] ; then $(mkinstalldirs) $(DESTDIR)$(exec_prefix) ; fi
if [ ! -d $(DESTDIR)$(bindir) ] ; then $(mkinstalldirs) $(DESTDIR)$(bindir) ; fi
case "@host_os@" in \
hpux*) $(CC) $(LDFLAGS) $(iconv_LDFLAGS) iconv.@OBJEXT@ ../srclib/libicrt.a -L$(DESTDIR)$(libdir) -liconv @LIBINTL@ `if test -n '$(DESTDIR)'; then echo " -Wl,+b -Wl,$(libdir)"; fi` -o iconv;; \
- *) $(LIBTOOL_LINK) $(CC) $(LDFLAGS) $(iconv_LDFLAGS) iconv.@OBJEXT@ ../srclib/libicrt.a $(DESTDIR)$(libdir)/libiconv.la @LTLIBINTL@ -o iconv;; \
+ *) $(LIBTOOL_LINK) $(CC) $(LDFLAGS) $(iconv_LDFLAGS) iconv.@OBJEXT@ ../srclib/libicrt.a ../lib/libiconv.la @LTLIBINTL@ -o iconv;; \
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)$(prefix) ] ; then $(mkinstalldirs) $(DESTDIR)$(prefix) ; fi
if [ ! -d $(DESTDIR)$(exec_prefix) ] ; then $(mkinstalldirs) $(DESTDIR)$(exec_prefix) ; fi
diff -Naur libiconv-1.11.orig/srclib/stdint_.h libiconv-1.11/srclib/stdint_.h
--- libiconv-1.11.orig/srclib/stdint_.h Fri Dec 7 15:00:32 2007
+++ srclib/stdint_.h Fri Dec 7 15:01:45 2007
@@ -91,7 +91,7 @@
types have 8, 16, 32, optionally 64 bits. */
#if !@HAVE_INT8_T@
-typedef signed char int8_t;
+typedef char int8_t;
#endif
#if !@HAVE_UINT8_T@
typedef unsigned char uint8_t