delorie.com/archives/browse.cgi   search  
Mail Archives: djgpp-workers/2001/02/27/12:31:20

From: "Juan Manuel Guerrero" <ST001906 AT HRZ1 DOT HRZ DOT TU-Darmstadt DOT De>
Organization: Darmstadt University of Technology
To: Bruno Haible <haible AT ilog DOT fr>
Date: Tue, 27 Feb 2001 18:30:36 +0200
MIME-Version: 1.0
Subject: Re DJGPP specific patch for libiconv-1.5.1
CC: Eli Zaretskii <eliz AT is DOT elta DOT co DOT il>, djgpp-workers AT delorie DOT com
X-mailer: Pegasus Mail for Windows (v2.54DE)
Message-ID: <33124FA02EC@HRZ1.hrz.tu-darmstadt.de>
Reply-To: djgpp-workers AT delorie DOT com

patch 4/4
diff -acprNC5 libiconv-20010226.orig/libcharset/djgpp/config.sed libiconv-20010226/libcharset/djgpp/config.sed
*** libiconv-20010226.orig/libcharset/djgpp/config.sed	Thu Jan  1 00:00:00 1970
--- libiconv-20010226/libcharset/djgpp/config.sed	Wed Feb 14 15:02:36 2001
***************
*** 0 ****
--- 1,85 ----
+ # Additional editing of Makefiles
+ /ac_given_INSTALL=/,/^CEOF/ {
+   /^CEOF$/ i\
+ # DJGPP specific Makefile changes.\
+   /^aliaspath *	*=/s,:,";",g\
+   /^lispdir *	*=/ c\\\\\
+ lispdir = \\$(prefix)/gnu/emacs/site-lisp\
+   /TEXINPUTS=/s,:,";",g\
+   /PATH=/s,:,";",g\
+   s,config\\.h\\.in,config.h-in,g\
+   s,\\.tab\\.c,_tab.c,g\
+   s,\\.tab\\.h,_tab.h,g\
+   s,\\.old\\.,_old.,g\
+   s,libcharset\\.h\\.in,libcharset.h-in,g\
+   s,Makefile\\.in\\.in,Makefile.in-in,g\
+   s,Makefile\\.am\\.in,Makefile.am-in,g\
+   /^install-info-am:/,/^$/ s,file-\\[0-9\\]\\[0-9\\],& \\$\\$file[0-9] \\$\\$file[0-9][0-9],\
+   /^\\.y\\.c:/,/^$/ {\
+     /\\\$(YACC)/ {\
+       s,[ 	]*&&.*$,,\
+       a\\\\\
+ 	-mv -f y_tab.c \\$*.c\\\\\
+ 	-@test -f y.tab.c && mv -f y.tab.c \\$*.c\\\\\
+ 	-@test -f y.tab.h && mv -f y.tab.h y_tab.h\
+     }\
+   }
+ }
+ 
+ # Rename config.h.in into config.h-in
+ /^ *CONFIG_HEADERS=/,/^EOF/ {
+   s|"lib/config\.h|&:lib/config.h-in|
+   s|"config\.h|&:config.h-in|
+ }
+ 
+ # Rename iconv.h.in into iconv.h-in
+ /^ *CONFIG_FILES=/,/^EOF/ {
+   s|include/iconv\.h|&:include/iconv.h-in|
+ }
+ 
+ # Replace (command) > /dev/null with `command > /dev/null`, since
+ # parenthesized commands always return zero status in the ported Bash,
+ # even if the named command doesn't exist
+ /if ([^|;]*null/{
+   s,(,`,
+   s,),,
+   s,;  *then,`; then,
+ }
+ 
+ # DOS-style absolute file names should be supported as well
+ /\*) srcdir=/s,/\*,[\\\\/]* | [A-z]:[\\\\/]*,
+ /\$]\*) INSTALL=/s,\[/\$\]\*,[\\\\/$]* | [A-z]:[\\\\/]*,
+ /\$]\*) ac_rel_source=/s,\[/\$\]\*,[\\\\/$]* | [A-z]:[\\\\/]*,
+ 
+ # Switch the order of the two Sed commands, since DOS path names
+ # could include a colon
+ /ac_file_inputs=/s,\( -e "s%\^%\$ac_given_srcdir/%"\)\( -e "s%:% $ac_given_srcdir/%g"\),\2\1,
+ 
+ # Prevent the spliting of conftest.subs.
+ # The sed script: conftest.subs is split into 48 or 90 lines long files.
+ # This will produce sed scripts called conftest.s1, conftest.s2, etc.
+ # that will not work if conftest.subs contains a multi line sed command
+ # at line #90. In this case the first part of the sed command will be the
+ # last line of conftest.s1 and the rest of the command will be the first lines
+ # of conftest.s2. So both script will not work properly.
+ # This matches the configure script produced by Autoconf 2.12
+ /ac_max_sed_cmds=[0-9]/ s,=.*$,=`sed -n "$=" conftest.subs`,
+ # This matches the configure script produced by Autoconf 2.14a
+ /ac_max_sed_lines=[0-9]/ s,=.*$,=`sed -n "$=" $ac_cs_root.subs `,
+ 
+ # The following two items are changes needed for configuring
+ # and compiling across partitions.
+ # 1) The given srcdir value is always translated from the
+ #    "x:" syntax into "/dev/x" syntax while we run configure.
+ /^[ 	]*-srcdir=\*.*$/ a\
+     ac_optarg=`echo "$ac_optarg" | sed "s,^\\([A-Za-z]\\):,/dev/\\1,"`
+ /set X `ls -Lt \$srcdir/ i\
+    if `echo $srcdir | grep "^/dev/" - > /dev/null`; then\
+      srcdir=`echo "$srcdir" | sed -e "s%^/dev/%%" -e "s%/%:/%"`\
+    fi
+ 
+ #  2) We need links across partitions,
+ #     so we will use "cp -pf" instead of "ln".
+ /# Make a symlink if possible; otherwise try a hard link./,/EOF/ {
+   s,;.*then, 2>/dev/null || cp -pf \$srcdir/\$ac_source \$ac_dest&,
+ }
diff -acprNC5 libiconv-20010226.orig/libcharset/djgpp/config.site libiconv-20010226/libcharset/djgpp/config.site
*** libiconv-20010226.orig/libcharset/djgpp/config.site	Thu Jan  1 00:00:00 1970
--- libiconv-20010226/libcharset/djgpp/config.site	Wed Feb 14 15:02:36 2001
***************
*** 0 ****
--- 1,43 ----
+ #! /bin/sh
+ 
+ # These two variables are required, otherwise looking for
+ # programs along the PATH will not work.
+ PATH_SEPARATOR=:
+ PATH_EXPAND=y
+ 
+ # This is required in for "test -f foo" to find foo.exe
+ export TEST_FINDS_EXE=y
+ 
+ # The root of the DJGPP tree serves as the default prefix
+ # for all paths that are hardcoded in the binaries.
+ # When installing the installation prefix must be supplied.
+ test "x$prefix" = xNONE && prefix='/dev/env/DJDIR'
+ 
+ # This is required for config.status script to be run, since
+ # ./configure runs it by invoking ${CONFIG_SHELL-/bin/sh}
+ # CONFIG_SHELL=${CONFIG_SHELL='sh'}
+ 
+ # These are set here so the generated Makefile's will be good
+ # for every DJGPP installation, not only the one where the
+ # package was configured.
+ # $INSTALL must be an absolute path name, otherwise config.status
+ # will try to prepend ./ and ../ to it when it goes into subdirs.
+ INSTALL=${INSTALL='/dev/env/DJDIR/bin/ginstall -c'}
+ RANLIB=${RANLIB='/dev/env/DJDIR/bin/ranlib'}
+ GMSGFMT=${GMSGFMT='/dev/env/DJDIR/bin/msgfmt'}
+ MSGFMT=${MSGFMT='/dev/env/DJDIR/bin/msgfmt'}
+ XGETTEXT=${XGETTEXT='/dev/env/DJDIR/bin/xgettext'}
+ 
+ # A sane default for emacs.
+ ac_cv_path_EMACS=${EMACS='/dev/env/DJDIR/gnu/emacs/bin/emacs'}
+ 
+ # These are set here so the generated libtool will be good
+ # for every DJGPP installation, not only the one where the
+ # package was configured.
+ NM=${NM='/dev/env/DJDIR/bin/nm'}
+ LD=${LD='/dev/env/DJDIR/bin/ld'}
+ 
+ # Force the test for 'ln -s' to report no.
+ ac_cv_prog_LN_S='cp -p'
+ cl_cv_prog_LN_S='cp -p'
+ cl_cv_prog_LN='cp -p'
diff -acprNC5 libiconv-20010226.orig/libcharset/djgpp/fnchange.lst libiconv-20010226/libcharset/djgpp/fnchange.lst
*** libiconv-20010226.orig/libcharset/djgpp/fnchange.lst	Thu Jan  1 00:00:00 1970
--- libiconv-20010226/libcharset/djgpp/fnchange.lst	Mon Feb 26 23:27:26 2001
***************
*** 0 ****
--- 1,74 ----
+ libiconv-1.6/libcharset/                                  libiconv-1.6/libcharset/
+ libiconv-1.6/libcharset/tools/                            libiconv-1.6/libcharset/tools/
+ libiconv-1.6/libcharset/tools/README                      libiconv-1.6/libcharset/tools/README
+ libiconv-1.6/libcharset/tools/aix-3.2.5                   libiconv-1.6/libcharset/tools/aix-3.2.5
+ libiconv-1.6/libcharset/tools/aix-4.1.5                   libiconv-1.6/libcharset/tools/aix-4.1.5
+ libiconv-1.6/libcharset/tools/aix-4.2.0                   libiconv-1.6/libcharset/tools/aix-4.2.0
+ libiconv-1.6/libcharset/tools/aix-4.3.2                   libiconv-1.6/libcharset/tools/aix-4.3.2
+ libiconv-1.6/libcharset/tools/all-charsets                libiconv-1.6/libcharset/tools/all-charsets
+ libiconv-1.6/libcharset/tools/all-locales                 libiconv-1.6/libcharset/tools/all-locales
+ libiconv-1.6/libcharset/tools/freebsd-3.3                 libiconv-1.6/libcharset/tools/freebsd-3.3
+ libiconv-1.6/libcharset/tools/glibc-2.1.3                 libiconv-1.6/libcharset/tools/glibc-2.1.3
+ libiconv-1.6/libcharset/tools/glibc-2.1.90                libiconv-1.6/libcharset/tools/glibc-2.1.90
+ libiconv-1.6/libcharset/tools/hpux-10.01                  libiconv-1.6/libcharset/tools/hpux-10.01
+ libiconv-1.6/libcharset/tools/hpux-10.20                  libiconv-1.6/libcharset/tools/hpux-10.20
+ libiconv-1.6/libcharset/tools/hpux-11.00                  libiconv-1.6/libcharset/tools/hpux-11.00
+ libiconv-1.6/libcharset/tools/irix-6.5                    libiconv-1.6/libcharset/tools/irix-6.5
+ libiconv-1.6/libcharset/tools/locale_charmap              libiconv-1.6/libcharset/tools/locale_charmap
+ libiconv-1.6/libcharset/tools/locale_charset.c            libiconv-1.6/libcharset/tools/locale_charset.c
+ libiconv-1.6/libcharset/tools/locale_codeset.c            libiconv-1.6/libcharset/tools/localecodeset.c
+ libiconv-1.6/libcharset/tools/osf1-4.0a                   libiconv-1.6/libcharset/tools/osf1-4.0a
+ libiconv-1.6/libcharset/tools/osf1-4.0d                   libiconv-1.6/libcharset/tools/osf1-4.0d
+ libiconv-1.6/libcharset/tools/solaris-2.4                 libiconv-1.6/libcharset/tools/solaris-2.4
+ libiconv-1.6/libcharset/tools/solaris-2.5.1               libiconv-1.6/libcharset/tools/solaris-2.5.1
+ libiconv-1.6/libcharset/tools/solaris-2.6                 libiconv-1.6/libcharset/tools/solaris-2.6
+ libiconv-1.6/libcharset/tools/solaris-2.6-cjk             libiconv-1.6/libcharset/tools/solaris-2.6-cjk
+ libiconv-1.6/libcharset/tools/solaris-2.7                 libiconv-1.6/libcharset/tools/solaris-2.7
+ libiconv-1.6/libcharset/tools/sunos-4.1.4                 libiconv-1.6/libcharset/tools/sunos-4.1.4
+ libiconv-1.6/libcharset/tools/win32                       libiconv-1.6/libcharset/tools/win32
+ libiconv-1.6/libcharset/tools/glibc-2.2                   libiconv-1.6/libcharset/tools/glibc-2.2
+ libiconv-1.6/libcharset/tools/all-charsets-X11            libiconv-1.6/libcharset/tools/all-charsets.X11
+ libiconv-1.6/libcharset/tools/glibc-2.2-XF86-3.3.6        libiconv-1.6/libcharset/tools/glibc-2.2-XF86-3.3.6
+ libiconv-1.6/libcharset/tools/glibc-2.2-XF86-4.0.1f       libiconv-1.6/libcharset/tools/glibc-2.2XF86-4.0.1f
+ libiconv-1.6/libcharset/tools/locale_x11encoding.c        libiconv-1.6/libcharset/tools/locale_x11encoding.c
+ libiconv-1.6/libcharset/tools/beos-5                      libiconv-1.6/libcharset/tools/beos-5
+ libiconv-1.6/libcharset/m4/                               libiconv-1.6/libcharset/m4/
+ libiconv-1.6/libcharset/m4/ChangeLog                      libiconv-1.6/libcharset/m4/ChangeLog
+ libiconv-1.6/libcharset/m4/codeset.m4                     libiconv-1.6/libcharset/m4/codeset.m4
+ libiconv-1.6/libcharset/m4/glibc21.m4                     libiconv-1.6/libcharset/m4/glibc21.m4
+ libiconv-1.6/libcharset/m4/libtool.m4                     libiconv-1.6/libcharset/m4/libtool.m4
+ libiconv-1.6/libcharset/lib/                              libiconv-1.6/libcharset/lib/
+ libiconv-1.6/libcharset/lib/config.charset                libiconv-1.6/libcharset/lib/config.charset
+ libiconv-1.6/libcharset/lib/localcharset.c                libiconv-1.6/libcharset/lib/localcharset.c
+ libiconv-1.6/libcharset/lib/ref-add.sin                   libiconv-1.6/libcharset/lib/ref-add.sin
+ libiconv-1.6/libcharset/lib/ref-del.sin                   libiconv-1.6/libcharset/lib/ref-del.sin
+ libiconv-1.6/libcharset/lib/ChangeLog                     libiconv-1.6/libcharset/lib/ChangeLog
+ libiconv-1.6/libcharset/lib/Makefile.in                   libiconv-1.6/libcharset/lib/Makefile.in
+ libiconv-1.6/libcharset/lib/Makefile.msvc                 libiconv-1.6/libcharset/lib/Makefile.msvc
+ libiconv-1.6/libcharset/AUTHORS                           libiconv-1.6/libcharset/AUTHORS
+ libiconv-1.6/libcharset/COPYING.LIB                       libiconv-1.6/libcharset/COPYING.LIB
+ libiconv-1.6/libcharset/INSTALL.generic                   libiconv-1.6/libcharset/INSTALL.generic
+ libiconv-1.6/libcharset/README                            libiconv-1.6/libcharset/README
+ libiconv-1.6/libcharset/Makefile.devel                    libiconv-1.6/libcharset/Makefile.devel
+ libiconv-1.6/libcharset/Makefile.in                       libiconv-1.6/libcharset/Makefile.in
+ libiconv-1.6/libcharset/configure.in                      libiconv-1.6/libcharset/configure.in
+ libiconv-1.6/libcharset/configure                         libiconv-1.6/libcharset/configure
+ libiconv-1.6/libcharset/INTEGRATE                         libiconv-1.6/libcharset/INTEGRATE
+ libiconv-1.6/libcharset/include/                          libiconv-1.6/libcharset/include/
+ libiconv-1.6/libcharset/include/libcharset.h.in           libiconv-1.6/libcharset/include/libcharset.h.in
+ libiconv-1.6/libcharset/include/libcharset.h.msvc-shared  libiconv-1.6/libcharset/include/libcharset_h.shared-msvc
+ libiconv-1.6/libcharset/autoconf/                         libiconv-1.6/libcharset/autoconf/
+ libiconv-1.6/libcharset/autoconf/config.guess             libiconv-1.6/libcharset/autoconf/config.guess
+ libiconv-1.6/libcharset/autoconf/config.sub               libiconv-1.6/libcharset/autoconf/config.sub
+ libiconv-1.6/libcharset/autoconf/ltconfig                 libiconv-1.6/libcharset/autoconf/ltconfig
+ libiconv-1.6/libcharset/autoconf/ltmain.sh                libiconv-1.6/libcharset/autoconf/ltmain.sh
+ libiconv-1.6/libcharset/autoconf/install-sh               libiconv-1.6/libcharset/autoconf/install-sh
+ libiconv-1.6/libcharset/autoconf/aclocal.m4               libiconv-1.6/libcharset/autoconf/aclocal.m4
+ libiconv-1.6/libcharset/autoconf/mkinstalldirs            libiconv-1.6/libcharset/autoconf/mkinstalldirs
+ libiconv-1.6/libcharset/config.h.in                       libiconv-1.6/libcharset/config.h.in
+ libiconv-1.6/libcharset/windows/                          libiconv-1.6/libcharset/windows/
+ libiconv-1.6/libcharset/windows/dllexport.h               libiconv-1.6/libcharset/windows/dllexport.h
+ libiconv-1.6/libcharset/ChangeLog                         libiconv-1.6/libcharset/ChangeLog
+ libiconv-1.6/libcharset/Makefile.msvc                     libiconv-1.6/libcharset/Makefile.msvc
+ libiconv-1.6/libcharset/README.win32                      libiconv-1.6/libcharset/README.win32
+ libiconv-1.6/libcharset/config.h.msvc                     libiconv-1.6/libcharset/config.h.msvc
diff -acprNC5 libiconv-20010226.orig/libcharset/djgpp/readme libiconv-20010226/libcharset/djgpp/readme
*** libiconv-20010226orig/libcharset/djgpp/readme	Thu Jan  1 00:00:00 1970
--- libiconv-20010226/libcharset/djgpp/readme	Tue Feb 27 17:08:44 2001
***************
*** 0 ****
--- 1,123 ----
+ This is a port of GNU Libiconv 1.6 to MSDOS/DJGPP.
+ 
+ 1.:     DJGPP specific changes.
+         =======================
+         There are no DJGPP specific changes. This package should
+         configure and compile out-of-the-box.
+         Please read the documentation to become familiar with this
+         product.
+ 
+ 
+ 2.:     Installing the binary package.
+         ==============================
+ 
+ 2.1.:   Copy the binary distribution into the top DJGPP installation
+         directory and unzip the binary distribution running *ONE* of
+         the following commands:
+           unzip32 licv16b.zip      or
+           djtarx licv16b.zip       or
+           pkunzip -d licv16b.zip
+ 
+ 
+ 
+ 3.:     Building the binaries from sources.
+         ===================================
+ 
+ 3.1.:   To build the binaries you will need the following binary packages:
+           djdev203.zip, bsh204b.zip, gcc2952b.zip,
+           bnu210b.zip, mak3791b.zip, fil316b.zip,
+           shl112b.zip, txt20b.zip, txi40b.zip,
+           grep24b.zip and sed302b.zip
+ 
+ 
+         All this packages can be found in the v2gnu directory of any
+         Simtel.NET mirror.
+         You will need bsh204b.zip and *NOT* a prior version or the build will fail.
+         The same applies to djdev203.zip. You *MUST* use the updated versions of
+         fil316b.zip (date: 2000-05-30) and shl112b.zip (date: 2000-08-11). This
+         updated versions have been recompiled with djdev203.zip and know about
+         the "/dev/env" functionality introduced with djdev203.zip. All the other
+         packages are the ones I have used to build the binaries from this sources.
+         Previuos and/or later versions of this packages may do the job as well but
+         I have not tested this.
+ 
+ 3.2.:   Create a temporary directory and copy the source package: licv16s.zip
+         into the temporary directory. If you download the source distribution
+         from one of the DJGPP archives, just unzip it preserving the directory
+         structure, runnig ONE of the following commands:
+           unzip32 licv16s.zip      or
+           djtarx licv16s.zip       or
+           pkunzip -d licv16s.zip
+ 
+         Source distributions downloaded from one of the GNU FTP sites need
+         some more work to unpack.  First, you MUST use the `djtar' program to
+         unzip the package.  That's because some file names in the official
+         distributions need to be changed to avoid problems on the various
+         platforms supported by DJGPP.  `djtar' can rename files on the fly
+         given a file with name mappings.  The distribution includes a file
+         `djgpp/fnchange.lst' with the necessary mappings.  So you need first
+         to retrieve that file, and then invoke `djtar' to unpack the
+         distribution.  Here's how:
+ 
+           djtar -x -p -o libiconv-1.6/djgpp/fnchange.lst libiconv-1.6.tar.gz > lst
+           djtar -x -n lst libiconv-1.6.tar.gz
+ 
+         (The name of the distribution archive and the top-level directory will
+         be different for versions other than 1.6.)
+ 
+ 
+ 3.3.:   The package is preconfigured for djdev203. To build the products you
+         should run the following command:
+           make
+ 
+         After the compilation has finished, you can check the products
+         running the command:
+           make check
+ 
+         To install the products run the command:
+           make install
+ 
+         This will install the products (iconv.exe iconv.h libcharset.h libconv.a
+         libcharset.a iconv.1 iconv.3 iconv_open.3 iconv_close.3) into your DJGPP
+         installation tree. As usual, prefix is defined as "/dev/env/DJDIR".
+         If you prefer to install into same other directory run the command:
+           make install prefix=z:/some/other/dir
+ 
+         Of course, you should replace "z:/some/other/dir" by an appropriate path
+         that will meet your requeriments.
+ 
+ 3.4.:   If you need/want to reconfigure the package you will have to run the
+         following commands:
+           make distclean
+           djgpp\config
+ 
+         Please note that you *MUST* use the "distclean" option or the config.cache
+         file will *NOT* be deleted. In this case you are *NOT* reconfiguring
+         because the configuration informations is read from the cache file instead
+         of being newly computed.
+         To build the programs in a directory other than where the sources are,
+         you must add the parameter that specifies the source directory,
+         e.g:
+           x:\src\gnu\libiconv.16\djgpp\config x:/src/gnu/libiconv.16
+ 
+         Lets assume you want to build the binaries in a directory placed on a 
+         different drive (z:\build in this case) from where the sources are,
+         then you will run the following commands:
+           z:
+           md \build
+           cd \build
+           x:\src\gnu\libiconv.16\djgpp\config x:/src/gnu/libiconv.16
+ 
+         You *MUST* use forward slashes to specify the source directory.
+         After having configured the package run the folowing commands to create
+         the binaries and docs and install them:
+           make
+           make check
+           make install
+ 
+         Send suggestions and bug reports concerning the DJGPP port to
+         comp.os.msdos.djgpp or djgpp AT delorie DOT com. Libiconv specific bugs
+         must be reported to Bruno Haible <haible AT clisp DOT cons DOT org>.
+ 
+ 
+           Guerrero, Juan Manuel <st001906 AT hrz1 DOT hrz DOT tu-darmstadt DOT de>

- Raw text -


  webmaster     delorie software   privacy  
  Copyright © 2019   by DJ Delorie     Updated Jul 2019