From MAILER-DAEMON Sun Apr 10 04:20:37 2011 Received: from mailman by lists.gnu.org with archive (Exim 4.43) id 1Q8psr-00008K-FR for mharc-libtool-patches@gnu.org; Sun, 10 Apr 2011 04:20:37 -0400 Received: from [140.186.70.92] (port=56640 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Q8pso-00006O-Ew for libtool-patches@gnu.org; Sun, 10 Apr 2011 04:20:35 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Q8psm-0007wC-RR for libtool-patches@gnu.org; Sun, 10 Apr 2011 04:20:33 -0400 Received: from mailout-de.gmx.net ([213.165.64.23]:49755) by eggs.gnu.org with smtp (Exim 4.71) (envelope-from ) id 1Q8psm-0007vk-Cj for libtool-patches@gnu.org; Sun, 10 Apr 2011 04:20:32 -0400 Received: (qmail invoked by alias); 10 Apr 2011 08:20:30 -0000 Received: from xdsl-89-0-86-5.netcologne.de (EHLO localhost.localdomain) [89.0.86.5] by mail.gmx.net (mp003) with SMTP; 10 Apr 2011 10:20:30 +0200 X-Authenticated: #13673931 X-Provags-ID: V01U2FsdGVkX1/SqFRdBS/SAOUOO0GHTYMF2LIawvesHhH7OI0R0W DGAMfJAZCHwnSN Received: from ralf by localhost.localdomain with local (Exim 4.72) (envelope-from ) id 1Q8psj-0000YW-SI; Sun, 10 Apr 2011 10:20:29 +0200 Date: Sun, 10 Apr 2011 10:20:29 +0200 From: Ralf Wildenhues To: Svante Signell , libtool-patches@gnu.org Message-ID: <20110410082029.GF28526@gmx.de> Mail-Followup-To: Svante Signell , libtool-patches@gnu.org, bug-libtool@gnu.org, 8441@debbugs.gnu.org References: <1302193460.32453.172.camel@s1499.it.kth.se> <20110407180632.GB30379@gmx.de> <1302200455.32453.184.camel@s1499.it.kth.se> <20110407182433.GC30379@gmx.de> <1302246116.26044.12.camel@hp.my.own.domain> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1302246116.26044.12.camel@hp.my.own.domain> Organization: Institute for Numerical Simulation, University of Bonn User-Agent: Mutt/1.5.20 (2010-08-04) X-Y-GMX-Trusted: 0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) X-Received-From: 213.165.64.23 Cc: bug-libtool@gnu.org, 8441@debbugs.gnu.org Subject: Re: Updated patches: Re: bug#8441: Patches making libtool-2.4-1 build under GNU/Hurd X-BeenThere: libtool-patches@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Patch submission list for the GNU libtool shared library maintenance tool List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 10 Apr 2011 08:20:35 -0000 * Svante Signell wrote on Fri, Apr 08, 2011 at 09:01:56AM CEST: > # shlibpath_overrides_runpath is set to 'unknown' in libtool.m4 > # and not defined under $host_os ="gnu" > # This patch make the tests/*demo* run. > --- libtool-2.4/libltdt/m4/libtool.m4.orig 2011-02-03 21:33:56.000000000 +0100 > +++ libtool-2.4/libltdl/m4/libtool.m4 2011-02-03 21:43:46.000000000 +0100 > @@ -2325,6 +2325,7 @@ > library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' > soname_spec='${libname}${release}${shared_ext}$major' > shlibpath_var=LD_LIBRARY_PATH > + shlibpath_overrides_runpath=no > hardcode_into_libs=yes > ;; Thank you. This should let the low-cmdline test pass as well, so it need not be disabled any more (except for non coffee drinking purposes at least ;-) I'm pushing the patch below in your name and adding you to THANKS. The '(tiny change)' annotation is just to denote that you haven't exchanged copyright papers with the FSF yet. Cheers, Ralf 2011-04-10 Svante Signell <...> (tiny change) Set shlibpath_overrides_runpath for the Hurd. * libltdl/m4/libtool.m4 (_LT_SYS_DYNAMIC_LINKER) [gnu] : Set to no. * THANKS: Update. diff --git a/libltdl/m4/libtool.m4 b/libltdl/m4/libtool.m4 index 5cc027b..2ed41b7 100644 --- a/libltdl/m4/libtool.m4 +++ b/libltdl/m4/libtool.m4 @@ -2519,6 +2519,7 @@ gnu*) library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' soname_spec='${libname}${release}${shared_ext}$major' shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no hardcode_into_libs=yes ;; From MAILER-DAEMON Sun Apr 10 04:24:45 2011 Received: from mailman by lists.gnu.org with archive (Exim 4.43) id 1Q8pwq-0003Rf-R6 for mharc-libtool-patches@gnu.org; Sun, 10 Apr 2011 04:24:44 -0400 Received: from [140.186.70.92] (port=42604 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Q8pwp-0003Op-14 for libtool-patches@gnu.org; Sun, 10 Apr 2011 04:24:43 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Q8pwn-0000GO-Nu for libtool-patches@gnu.org; Sun, 10 Apr 2011 04:24:42 -0400 Received: from mailout-de.gmx.net ([213.165.64.23]:58803) by eggs.gnu.org with smtp (Exim 4.71) (envelope-from ) id 1Q8pwn-0000Fz-C9 for libtool-patches@gnu.org; Sun, 10 Apr 2011 04:24:41 -0400 Received: (qmail invoked by alias); 10 Apr 2011 08:24:39 -0000 Received: from xdsl-89-0-86-5.netcologne.de (EHLO localhost.localdomain) [89.0.86.5] by mail.gmx.net (mp013) with SMTP; 10 Apr 2011 10:24:39 +0200 X-Authenticated: #13673931 X-Provags-ID: V01U2FsdGVkX18eS3V7Erse+1FrG7j8+WizqBa/zw3RxRZYgEj2je pVj6O3If5euAS1 Received: from ralf by localhost.localdomain with local (Exim 4.72) (envelope-from ) id 1Q8pwk-0000Zc-77; Sun, 10 Apr 2011 10:24:38 +0200 Date: Sun, 10 Apr 2011 10:24:38 +0200 From: Ralf Wildenhues To: Kurt Roeckx , libtool-patches@gnu.org Message-ID: <20110410082438.GG28526@gmx.de> Mail-Followup-To: Kurt Roeckx , libtool-patches@gnu.org, bug-libtool@gnu.org, 619845@bugs.debian.org References: <201103271213.18344.dschepler@gmail.com> <20110327230822.GA7216@roeckx.be> <20110329071812.GG27293@gmx.de> <20110402190605.GA25333@roeckx.be> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20110402190605.GA25333@roeckx.be> Organization: Institute for Numerical Simulation, University of Bonn User-Agent: Mutt/1.5.20 (2010-08-04) X-Y-GMX-Trusted: 0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 213.165.64.23 Cc: bug-libtool@gnu.org, 619845@bugs.debian.org Subject: Re: [PATCH] tagdemo: Link to libfoo X-BeenThere: libtool-patches@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Patch submission list for the GNU libtool shared library maintenance tool List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 10 Apr 2011 08:24:43 -0000 Hi Kurt, * Kurt Roeckx wrote on Sat, Apr 02, 2011 at 09:06:05PM CEST: > * tests/tagdemo/Makefile.am: Link to all libraries that the > demo application uses. Thanks, I'm pushing that patch in your name. Cheers, Ralf 2011-04-10 Kurt Roeckx <...> tagdemo: do not rely on picking up symbols from indirect deps. * tests/tagdemo/Makefile.am: Link to all libraries that the demo application uses. diff --git a/tests/tagdemo/Makefile.am b/tests/tagdemo/Makefile.am index e945c25..295e7b6 100644 --- a/tests/tagdemo/Makefile.am +++ b/tests/tagdemo/Makefile.am @@ -1,6 +1,6 @@ ## Makefile.am -- Process this file with automake to produce Makefile.in ## -## Copyright (C) 2003, 2004, 2005 Free Software Foundation +## Copyright (C) 2003, 2004, 2005, 2011 Free Software Foundation ## Written by Gary V. Vaughan, 2003 ## ## This file is part of GNU Libtool. @@ -47,7 +47,7 @@ noinst_HEADERS = foo.h baz.h conv.h bin_PROGRAMS = tagdemo tagdemo_SOURCES = main.cpp -tagdemo_LDADD = libbaz.la +tagdemo_LDADD = libbaz.la libfoo.la libtool: $(LIBTOOL_DEPS) $(SHELL) ./config.status --recheck From MAILER-DAEMON Fri Apr 15 08:58:34 2011 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1QAiba-0002Go-Ov for mharc-libtool-patches@gnu.org; Fri, 15 Apr 2011 08:58:34 -0400 Received: from eggs.gnu.org ([140.186.70.92]:36797) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QAibY-0002DE-W6 for libtool-patches@gnu.org; Fri, 15 Apr 2011 08:58:33 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QAibX-0004sa-UW for libtool-patches@gnu.org; Fri, 15 Apr 2011 08:58:32 -0400 Received: from [211.211.79.186] (port=61935 helo=localhost) by eggs.gnu.org with smtp (Exim 4.71) (envelope-from ) id 1QAibW-0004qe-Nh for libtool-patches@gnu.org; Fri, 15 Apr 2011 08:58:31 -0400 Received: from localhost.localdomain (localhost [127.0.0.1]) by smtp (InetPowerServer/2 v1.0.2.2) with SMTP id 4DC47F6E0011; Thu, 14 Apr 2011 23:08:30 +1000 From: KO Myung-Hun To: libtool-patches@gnu.org Subject: [PATCH 00/10] Enhanced OS/2 ports Date: Thu, 14 Apr 2011 23:06:04 +0900 Message-Id: <1302789974-3413-1-git-send-email-komh@chollian.net> X-Mailer: git-send-email 1.7.3.2 X-detected-operating-system: by eggs.gnu.org: Tru64 4.0 (or OS/2 Warp 4) X-Received-From: 211.211.79.186 X-BeenThere: libtool-patches@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Patch submission list for the GNU libtool shared library maintenance tool List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 15 Apr 2011 12:58:33 -0000 Hi/2. I attach the patches to enhance OS/2 ports. Review, please. [PATCH 01/10] Add -shortname option. [PATCH 02/10] Don't eliminate duplications in $postdeps and $predeps on OS/2 [PATCH 03/10] Set lt_prog_compiler_static to -Bstatic on OS/2 [PATCH 04/10] OS/2 uses other APIs to load a DLL than LoadLibrary() on Windows. [PATCH 05/10] OS/2 uses ld inherited from GNU ld [PATCH 06/10] There is no need to relink DLLs on OS/2 [PATCH 07/10] Set lt_cv_deplibs_check_method to pass_all on OS/2 [PATCH 08/10] Support -Zxxx options used on OS/2 [PATCH 09/10] Create import libraries instead of links to the real library on OS/2 [PATCH 10/10] Fix a problem that it fails to find proper libraries if .la is a dependency From MAILER-DAEMON Fri Apr 15 08:58:41 2011 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1QAibg-0002Lj-Uu for mharc-libtool-patches@gnu.org; Fri, 15 Apr 2011 08:58:40 -0400 Received: from eggs.gnu.org ([140.186.70.92]:36828) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QAibe-0002Kj-Jh for libtool-patches@gnu.org; Fri, 15 Apr 2011 08:58:39 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QAibd-0004tW-Ho for libtool-patches@gnu.org; Fri, 15 Apr 2011 08:58:38 -0400 Received: from [211.211.79.186] (port=61937 helo=localhost) by eggs.gnu.org with smtp (Exim 4.71) (envelope-from ) id 1QAibc-0004t4-N3 for libtool-patches@gnu.org; Fri, 15 Apr 2011 08:58:37 -0400 Received: from localhost.localdomain (localhost [127.0.0.1]) by smtp (InetPowerServer/2 v1.0.2.2) with SMTP id 4DC47F6F0011; Thu, 14 Apr 2011 23:08:32 +1000 From: KO Myung-Hun To: libtool-patches@gnu.org Subject: [PATCH 01/10] Add -shortname option. Date: Thu, 14 Apr 2011 23:06:05 +0900 Message-Id: <1302789974-3413-2-git-send-email-komh@chollian.net> X-Mailer: git-send-email 1.7.3.2 In-Reply-To: <1302789974-3413-1-git-send-email-komh@chollian.net> References: <1302789974-3413-1-git-send-email-komh@chollian.net> X-detected-operating-system: by eggs.gnu.org: Tru64 4.0 (or OS/2 Warp 4) X-Received-From: 211.211.79.186 X-BeenThere: libtool-patches@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Patch submission list for the GNU libtool shared library maintenance tool List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 15 Apr 2011 12:58:39 -0000 OS/2 limits a length of a DLL base name up to 8 characters. If a name of a shared library is longer than 8 characters, OS/2 cannot load it. So the option to specify a short name is needed. --- NEWS | 1 + doc/libtool.texi | 4 ++++ libltdl/config/ltmain.m4sh | 11 +++++++++++ libltdl/m4/libtool.m4 | 38 ++++++++++++++++++++++++++++++++++---- 4 files changed, 50 insertions(+), 4 deletions(-) diff --git a/NEWS b/NEWS index 90d14b7..566eeb1 100644 --- a/NEWS +++ b/NEWS @@ -7,6 +7,7 @@ New in 2.4.2 2011-??-??: git version 2.4.1a, Libtool team: - The --with-pic configure option now supports a list of comma-separated package names. This can be used to build some static libraries with PIC objects while building others with non-PIC objects. + - Added -shortname option to specify a short name for a DLL (OS/2 only) - Initial support for Go, using the gccgo compiler. diff --git a/doc/libtool.texi b/doc/libtool.texi index 72bb0fc..2e4c88d 100644 --- a/doc/libtool.texi +++ b/doc/libtool.texi @@ -1583,6 +1583,10 @@ In the later case, libtool will signal an error if it was configured with @option{--disable-shared}, or if the host does not support shared libraries. +@item -shortname @var{name} +If @var{name} is specified, replace a name for a DLL with @var{suffix} (effect +on OS/2 only) + @item -shrext @var{suffix} If @var{output-file} is a libtool library, replace the system's standard file name extension for shared libraries with @var{suffix} (most systems diff --git a/libltdl/config/ltmain.m4sh b/libltdl/config/ltmain.m4sh index 9358ec5..371a973 100644 --- a/libltdl/config/ltmain.m4sh +++ b/libltdl/config/ltmain.m4sh @@ -1638,6 +1638,7 @@ The following components of LINK-COMMAND are treated specially: -rpath LIBDIR the created library will eventually be installed in LIBDIR -R[ ]LIBDIR add LIBDIR to the runtime path of programs and libraries -shared only do dynamic linking of libtool libraries + -shortname NAME specify a short name for a DLL(effect on OS/2 only) -shrext SUFFIX override the standard shared library file extension -static do not do any dynamic linking of uninstalled libtool libraries -static-libtool-libs @@ -4639,6 +4640,11 @@ func_mode_link () prev= continue ;; + shortname) + shortname_cmds="$ECHO $arg | cut -b -8" + prev= + continue + ;; shrext) shrext_cmds="$arg" prev= @@ -4959,6 +4965,11 @@ func_mode_link () continue ;; + -shortname) + prev=shortname + continue + ;; + -shrext) prev=shrext continue diff --git a/libltdl/m4/libtool.m4 b/libltdl/m4/libtool.m4 index 2ed41b7..c2814de 100644 --- a/libltdl/m4/libtool.m4 +++ b/libltdl/m4/libtool.m4 @@ -2225,6 +2225,7 @@ BEGIN {RS=" "; FS="/|\n";} { else sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" fi]) +shortname_cmds= library_names_spec= libname_spec='lib$name' soname_spec= @@ -2751,9 +2752,15 @@ os2*) libname_spec='$name' shrext_cmds=".dll" need_lib_prefix=no - library_names_spec='$libname${shared_ext} $libname.a' + # OS/2 limits a length of a DLL basename up to 8 characters. + # So there is need to use a short name instead of a original name + # longer than 8 characters. + shortname_cmds='$ECHO $libname | cut -b -8' + library_names_spec='`eval $shortname_cmds`${shared_ext} ${libname}_dll.$libext' dynamic_linker='OS/2 ld.exe' - shlibpath_var=LIBPATH + shlibpath_var=BEGINLIBPATH + sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" + sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" ;; osf3* | osf4* | osf5*) @@ -2899,6 +2906,7 @@ _LT_DECL([], [shlibpath_var], [0],[Shared library path variable]) _LT_DECL([], [shlibpath_overrides_runpath], [0], [Is shlibpath searched before the hard-coded library search path?]) _LT_DECL([], [libname_spec], [1], [Format of library name prefix]) +_LT_DECL([], [shortname_cmds], [2], [Command to make a short name]) _LT_DECL([], [library_names_spec], [1], [[List of archive names. First name is the real one, the rest are links. The last name is the one that the linker finds with -lNAME]]) @@ -4772,6 +4780,16 @@ _LT_EOF _LT_TAGVAR(link_all_deplibs, $1)=yes ;; + os2*) + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' + _LT_TAGVAR(hardcode_minus_L, $1)=yes + _LT_TAGVAR(allow_undefined_flag, $1)=unsupported + shrext_cmds=".dll" + _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY `eval $shortname_cmds` INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$ECHO DATA >> $output_objdir/$libname.def~$ECHO " MULTIPLE NONSHARED" >> $output_objdir/$libname.def~$ECHO EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def' + _LT_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def' + _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes + ;; + interix[[3-9]]*) _LT_TAGVAR(hardcode_direct, $1)=no _LT_TAGVAR(hardcode_shlibpath_var, $1)=no @@ -5395,8 +5413,10 @@ _LT_EOF _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' _LT_TAGVAR(hardcode_minus_L, $1)=yes _LT_TAGVAR(allow_undefined_flag, $1)=unsupported - _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~echo DATA >> $output_objdir/$libname.def~echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def' - _LT_TAGVAR(old_archive_from_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def' + shrext_cmds=".dll" + _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY `eval $shortname_cmds` INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$ECHO DATA >> $output_objdir/$libname.def~$ECHO " MULTIPLE NONSHARED" >> $output_objdir/$libname.def~$ECHO EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def' + _LT_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def' + _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes ;; osf3*) @@ -6188,6 +6208,16 @@ if test "$_lt_caught_CXX_error" != yes; then _LT_DARWIN_LINKER_FEATURES($1) ;; + os2*) + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' + _LT_TAGVAR(hardcode_minus_L, $1)=yes + _LT_TAGVAR(allow_undefined_flag, $1)=unsupported + shrext_cmds=".dll" + _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY `eval $shortname_cmds` INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$ECHO DATA >> $output_objdir/$libname.def~$ECHO " MULTIPLE NONSHARED" >> $output_objdir/$libname.def~$ECHO EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def' + _LT_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def' + _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes + ;; + dgux*) case $cc_basename in ec++*) -- 1.7.3.2 From MAILER-DAEMON Fri Apr 15 08:58:45 2011 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1QAibl-0002NL-2I for mharc-libtool-patches@gnu.org; Fri, 15 Apr 2011 08:58:45 -0400 Received: from eggs.gnu.org ([140.186.70.92]:36847) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QAibj-0002N0-9J for libtool-patches@gnu.org; Fri, 15 Apr 2011 08:58:43 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QAibi-0004u8-D0 for libtool-patches@gnu.org; Fri, 15 Apr 2011 08:58:43 -0400 Received: from [211.211.79.186] (port=61938 helo=localhost) by eggs.gnu.org with smtp (Exim 4.71) (envelope-from ) id 1QAibh-0004tu-QW for libtool-patches@gnu.org; Fri, 15 Apr 2011 08:58:42 -0400 Received: from localhost.localdomain (localhost [127.0.0.1]) by smtp (InetPowerServer/2 v1.0.2.2) with SMTP id 4DC47F710011; Thu, 14 Apr 2011 23:08:33 +1000 From: KO Myung-Hun To: libtool-patches@gnu.org Subject: [PATCH 02/10] Don't eliminate duplications in $postdeps and $predeps on OS/2 Date: Thu, 14 Apr 2011 23:06:06 +0900 Message-Id: <1302789974-3413-3-git-send-email-komh@chollian.net> X-Mailer: git-send-email 1.7.3.2 In-Reply-To: <1302789974-3413-1-git-send-email-komh@chollian.net> References: <1302789974-3413-1-git-send-email-komh@chollian.net> X-detected-operating-system: by eggs.gnu.org: Tru64 4.0 (or OS/2 Warp 4) X-Received-From: 211.211.79.186 X-BeenThere: libtool-patches@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Patch submission list for the GNU libtool shared library maintenance tool List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 15 Apr 2011 12:58:43 -0000 --- libltdl/config/ltmain.m4sh | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/libltdl/config/ltmain.m4sh b/libltdl/config/ltmain.m4sh index 371a973..12e653f 100644 --- a/libltdl/config/ltmain.m4sh +++ b/libltdl/config/ltmain.m4sh @@ -395,7 +395,7 @@ M4SH_GETOPTS( test "$opt_debug" = : || func_append preserve_args " --debug" case $host in - *cygwin* | *mingw* | *pw32* | *cegcc*) + *cygwin* | *mingw* | *pw32* | *cegcc* | *os2*) # don't eliminate duplications in $postdeps and $predeps opt_duplicate_compiler_generated_deps=: ;; -- 1.7.3.2 From MAILER-DAEMON Fri Apr 15 08:58:49 2011 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1QAibp-0002PS-5B for mharc-libtool-patches@gnu.org; Fri, 15 Apr 2011 08:58:49 -0400 Received: from eggs.gnu.org ([140.186.70.92]:36864) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QAibn-0002PM-Jx for libtool-patches@gnu.org; Fri, 15 Apr 2011 08:58:48 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QAibm-0004ul-Rv for libtool-patches@gnu.org; Fri, 15 Apr 2011 08:58:47 -0400 Received: from [211.211.79.186] (port=61939 helo=localhost) by eggs.gnu.org with smtp (Exim 4.71) (envelope-from ) id 1QAibm-0004uT-86 for libtool-patches@gnu.org; Fri, 15 Apr 2011 08:58:46 -0400 Received: from localhost.localdomain (localhost [127.0.0.1]) by smtp (InetPowerServer/2 v1.0.2.2) with SMTP id 4DC47F730011; Thu, 14 Apr 2011 23:08:35 +1000 From: KO Myung-Hun To: libtool-patches@gnu.org Subject: [PATCH 03/10] Set lt_prog_compiler_static to -Bstatic on OS/2 Date: Thu, 14 Apr 2011 23:06:07 +0900 Message-Id: <1302789974-3413-4-git-send-email-komh@chollian.net> X-Mailer: git-send-email 1.7.3.2 In-Reply-To: <1302789974-3413-1-git-send-email-komh@chollian.net> References: <1302789974-3413-1-git-send-email-komh@chollian.net> X-detected-operating-system: by eggs.gnu.org: Tru64 4.0 (or OS/2 Warp 4) X-Received-From: 211.211.79.186 X-BeenThere: libtool-patches@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Patch submission list for the GNU libtool shared library maintenance tool List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 15 Apr 2011 12:58:48 -0000 --- libltdl/m4/libtool.m4 | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/libltdl/m4/libtool.m4 b/libltdl/m4/libtool.m4 index c2814de..2361831 100644 --- a/libltdl/m4/libtool.m4 +++ b/libltdl/m4/libtool.m4 @@ -3919,6 +3919,11 @@ m4_if([$1], [CXX], [ # (--disable-auto-import) libraries m4_if([$1], [GCJ], [], [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) + case $host_os in + os2*) + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + ;; + esac ;; darwin* | rhapsody*) # PIC is the default on this platform @@ -4237,6 +4242,11 @@ m4_if([$1], [CXX], [ # (--disable-auto-import) libraries m4_if([$1], [GCJ], [], [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) + case $host_os in + os2*) + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + ;; + esac ;; darwin* | rhapsody*) @@ -4320,6 +4330,11 @@ m4_if([$1], [CXX], [ # built for inclusion in a dll (and should export symbols for example). m4_if([$1], [GCJ], [], [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) + case $host_os in + os2*) + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + ;; + esac ;; hpux9* | hpux10* | hpux11*) -- 1.7.3.2 From MAILER-DAEMON Fri Apr 15 08:58:53 2011 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1QAibt-0002Rm-A1 for mharc-libtool-patches@gnu.org; Fri, 15 Apr 2011 08:58:53 -0400 Received: from eggs.gnu.org ([140.186.70.92]:36888) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QAibr-0002Rd-BH for libtool-patches@gnu.org; Fri, 15 Apr 2011 08:58:52 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QAibq-0004vN-MT for libtool-patches@gnu.org; Fri, 15 Apr 2011 08:58:51 -0400 Received: from [211.211.79.186] (port=61940 helo=localhost) by eggs.gnu.org with smtp (Exim 4.71) (envelope-from ) id 1QAibq-0004v7-47 for libtool-patches@gnu.org; Fri, 15 Apr 2011 08:58:50 -0400 Received: from localhost.localdomain (localhost [127.0.0.1]) by smtp (InetPowerServer/2 v1.0.2.2) with SMTP id 4DC47F740011; Thu, 14 Apr 2011 23:08:37 +1000 From: KO Myung-Hun To: libtool-patches@gnu.org Subject: [PATCH 04/10] OS/2 uses other APIs to load a DLL than LoadLibrary() on Windows. Date: Thu, 14 Apr 2011 23:06:08 +0900 Message-Id: <1302789974-3413-5-git-send-email-komh@chollian.net> X-Mailer: git-send-email 1.7.3.2 In-Reply-To: <1302789974-3413-1-git-send-email-komh@chollian.net> References: <1302789974-3413-1-git-send-email-komh@chollian.net> X-detected-operating-system: by eggs.gnu.org: Tru64 4.0 (or OS/2 Warp 4) X-Received-From: 211.211.79.186 X-BeenThere: libtool-patches@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Patch submission list for the GNU libtool shared library maintenance tool List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 15 Apr 2011 12:58:52 -0000 --- libltdl/m4/ltdl.m4 | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/libltdl/m4/ltdl.m4 b/libltdl/m4/ltdl.m4 index ea76f4d..76f9919 100644 --- a/libltdl/m4/ltdl.m4 +++ b/libltdl/m4/ltdl.m4 @@ -703,7 +703,7 @@ darwin[[1567]].*) beos*) LT_DLLOADERS="$LT_DLLOADERS ${lt_dlopen_dir+$lt_dlopen_dir/}load_add_on.la" ;; -cygwin* | mingw* | os2* | pw32*) +cygwin* | mingw* | pw32*) AC_CHECK_DECLS([cygwin_conv_path], [], [], [[#include ]]) LT_DLLOADERS="$LT_DLLOADERS ${lt_dlopen_dir+$lt_dlopen_dir/}loadlibrary.la" ;; -- 1.7.3.2 From MAILER-DAEMON Fri Apr 15 08:58:58 2011 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1QAiby-0002V5-EH for mharc-libtool-patches@gnu.org; Fri, 15 Apr 2011 08:58:58 -0400 Received: from eggs.gnu.org ([140.186.70.92]:36912) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QAibw-0002U0-5U for libtool-patches@gnu.org; Fri, 15 Apr 2011 08:58:57 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QAibv-0004wG-DT for libtool-patches@gnu.org; Fri, 15 Apr 2011 08:58:56 -0400 Received: from [211.211.79.186] (port=61941 helo=localhost) by eggs.gnu.org with smtp (Exim 4.71) (envelope-from ) id 1QAibu-0004vs-R6 for libtool-patches@gnu.org; Fri, 15 Apr 2011 08:58:55 -0400 Received: from localhost.localdomain (localhost [127.0.0.1]) by smtp (InetPowerServer/2 v1.0.2.2) with SMTP id 4DC47F760011; Thu, 14 Apr 2011 23:08:39 +1000 From: KO Myung-Hun To: libtool-patches@gnu.org Subject: [PATCH 05/10] OS/2 uses ld inherited from GNU ld Date: Thu, 14 Apr 2011 23:06:09 +0900 Message-Id: <1302789974-3413-6-git-send-email-komh@chollian.net> X-Mailer: git-send-email 1.7.3.2 In-Reply-To: <1302789974-3413-1-git-send-email-komh@chollian.net> References: <1302789974-3413-1-git-send-email-komh@chollian.net> X-detected-operating-system: by eggs.gnu.org: Tru64 4.0 (or OS/2 Warp 4) X-Received-From: 211.211.79.186 X-BeenThere: libtool-patches@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Patch submission list for the GNU libtool shared library maintenance tool List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 15 Apr 2011 12:58:57 -0000 --- libltdl/m4/libtool.m4 | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/libltdl/m4/libtool.m4 b/libltdl/m4/libtool.m4 index 2361831..9f0e5d7 100644 --- a/libltdl/m4/libtool.m4 +++ b/libltdl/m4/libtool.m4 @@ -4656,6 +4656,9 @@ dnl Note also adjust exclude_expsyms for C++ above. with_gnu_ld=no fi ;; + os2*) + with_gnu_ld=yes + ;; interix*) # we just hope/assume this is gcc and not c89 (= MSVC++) with_gnu_ld=yes -- 1.7.3.2 From MAILER-DAEMON Fri Apr 15 08:59:07 2011 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1QAic7-0002iu-7Z for mharc-libtool-patches@gnu.org; Fri, 15 Apr 2011 08:59:07 -0400 Received: from eggs.gnu.org ([140.186.70.92]:36983) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QAic4-0002e7-RU for libtool-patches@gnu.org; Fri, 15 Apr 2011 08:59:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QAic4-0004xs-6y for libtool-patches@gnu.org; Fri, 15 Apr 2011 08:59:04 -0400 Received: from [211.211.79.186] (port=61943 helo=localhost) by eggs.gnu.org with smtp (Exim 4.71) (envelope-from ) id 1QAic3-0004xc-KF for libtool-patches@gnu.org; Fri, 15 Apr 2011 08:59:04 -0400 Received: from localhost.localdomain (localhost [127.0.0.1]) by smtp (InetPowerServer/2 v1.0.2.2) with SMTP id 4DC47F7A0011; Thu, 14 Apr 2011 23:08:42 +1000 From: KO Myung-Hun To: libtool-patches@gnu.org Subject: [PATCH 07/10] Set lt_cv_deplibs_check_method to pass_all on OS/2 Date: Thu, 14 Apr 2011 23:06:11 +0900 Message-Id: <1302789974-3413-8-git-send-email-komh@chollian.net> X-Mailer: git-send-email 1.7.3.2 In-Reply-To: <1302789974-3413-1-git-send-email-komh@chollian.net> References: <1302789974-3413-1-git-send-email-komh@chollian.net> X-detected-operating-system: by eggs.gnu.org: Tru64 4.0 (or OS/2 Warp 4) X-Received-From: 211.211.79.186 X-BeenThere: libtool-patches@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Patch submission list for the GNU libtool shared library maintenance tool List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 15 Apr 2011 12:59:05 -0000 --- libltdl/m4/libtool.m4 | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/libltdl/m4/libtool.m4 b/libltdl/m4/libtool.m4 index 9f0e5d7..0dc1055 100644 --- a/libltdl/m4/libtool.m4 +++ b/libltdl/m4/libtool.m4 @@ -3369,6 +3369,9 @@ sysv4 | sysv4.3*) tpf*) lt_cv_deplibs_check_method=pass_all ;; +os2*) + lt_cv_deplibs_check_method=pass_all + ;; esac ]) -- 1.7.3.2 From MAILER-DAEMON Fri Apr 15 08:59:08 2011 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1QAic8-0002lb-AU for mharc-libtool-patches@gnu.org; Fri, 15 Apr 2011 08:59:08 -0400 Received: from eggs.gnu.org ([140.186.70.92]:37000) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QAic5-0002gO-Uo for libtool-patches@gnu.org; Fri, 15 Apr 2011 08:59:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QAic5-0004yE-DV for libtool-patches@gnu.org; Fri, 15 Apr 2011 08:59:05 -0400 Received: from [211.211.79.186] (port=61944 helo=localhost) by eggs.gnu.org with smtp (Exim 4.71) (envelope-from ) id 1QAic4-0004xn-Pe for libtool-patches@gnu.org; Fri, 15 Apr 2011 08:59:05 -0400 Received: from localhost.localdomain (localhost [127.0.0.1]) by smtp (InetPowerServer/2 v1.0.2.2) with SMTP id 4DC47F7B0011; Thu, 14 Apr 2011 23:08:44 +1000 From: KO Myung-Hun To: libtool-patches@gnu.org Subject: [PATCH 08/10] Support -Zxxx options used on OS/2 Date: Thu, 14 Apr 2011 23:06:12 +0900 Message-Id: <1302789974-3413-9-git-send-email-komh@chollian.net> X-Mailer: git-send-email 1.7.3.2 In-Reply-To: <1302789974-3413-1-git-send-email-komh@chollian.net> References: <1302789974-3413-1-git-send-email-komh@chollian.net> X-detected-operating-system: by eggs.gnu.org: Tru64 4.0 (or OS/2 Warp 4) X-Received-From: 211.211.79.186 X-BeenThere: libtool-patches@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Patch submission list for the GNU libtool shared library maintenance tool List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 15 Apr 2011 12:59:06 -0000 --- libltdl/config/ltmain.m4sh | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/libltdl/config/ltmain.m4sh b/libltdl/config/ltmain.m4sh index 03a4add..3619343 100644 --- a/libltdl/config/ltmain.m4sh +++ b/libltdl/config/ltmain.m4sh @@ -5083,6 +5083,17 @@ func_mode_link () continue ;; + # OS/2 uses -Zxxx to specify OS/2-specific options + -Z*) + compiler_flags="$compiler_flags $arg" + func_append compile_command " $arg" + func_append finalize_command " $arg" + case $arg in + -Zlinker | -Zstack) prev=xcompiler;; + esac + continue + ;; + # Some other compiler flag. -* | +*) func_quote_for_eval "$arg" -- 1.7.3.2 From MAILER-DAEMON Fri Apr 15 08:59:13 2011 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1QAicD-0002wK-Dv for mharc-libtool-patches@gnu.org; Fri, 15 Apr 2011 08:59:13 -0400 Received: from eggs.gnu.org ([140.186.70.92]:37038) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QAicA-0002s7-UQ for libtool-patches@gnu.org; Fri, 15 Apr 2011 08:59:11 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QAicA-0004zC-1a for libtool-patches@gnu.org; Fri, 15 Apr 2011 08:59:10 -0400 Received: from [211.211.79.186] (port=61946 helo=localhost) by eggs.gnu.org with smtp (Exim 4.71) (envelope-from ) id 1QAic9-0004yj-Gm for libtool-patches@gnu.org; Fri, 15 Apr 2011 08:59:09 -0400 Received: from localhost.localdomain (localhost [127.0.0.1]) by smtp (InetPowerServer/2 v1.0.2.2) with SMTP id 4DC47F7D0011; Thu, 14 Apr 2011 23:08:46 +1000 From: KO Myung-Hun To: libtool-patches@gnu.org Subject: [PATCH 09/10] Create import libraries instead of links to the real library on OS/2 Date: Thu, 14 Apr 2011 23:06:13 +0900 Message-Id: <1302789974-3413-10-git-send-email-komh@chollian.net> X-Mailer: git-send-email 1.7.3.2 In-Reply-To: <1302789974-3413-1-git-send-email-komh@chollian.net> References: <1302789974-3413-1-git-send-email-komh@chollian.net> X-detected-operating-system: by eggs.gnu.org: Tru64 4.0 (or OS/2 Warp 4) X-Received-From: 211.211.79.186 X-BeenThere: libtool-patches@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Patch submission list for the GNU libtool shared library maintenance tool List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 15 Apr 2011 12:59:12 -0000 --- libltdl/config/ltmain.m4sh | 23 ++++++++++++++++++++--- 1 files changed, 20 insertions(+), 3 deletions(-) diff --git a/libltdl/config/ltmain.m4sh b/libltdl/config/ltmain.m4sh index 3619343..9052a9d 100644 --- a/libltdl/config/ltmain.m4sh +++ b/libltdl/config/ltmain.m4sh @@ -2222,8 +2222,17 @@ func_mode_install () # so we also need to try rm && ln -s. for linkname do - test "$linkname" != "$realname" \ - && func_show_eval "(cd $destdir && { $LN_S -f $realname $linkname || { $RM $linkname && $LN_S $realname $linkname; }; })" + if test "$linkname" != "$realname"; then + case $host_os in + os2*) + # Create import libraries instead of links on OS/2 + func_show_eval "(emximp -o $destdir/$linkname $dir/${linkname%%_dll.$libext}.def)" + ;; + *) + func_show_eval "(cd $destdir && { $LN_S -f $realname $linkname || { $RM $linkname && $LN_S $realname $linkname; }; })" + ;; + esac + fi done fi @@ -7799,7 +7808,15 @@ EOF # Create links to the real library. for linkname in $linknames; do if test "$realname" != "$linkname"; then - func_show_eval '(cd "$output_objdir" && $RM "$linkname" && $LN_S "$realname" "$linkname")' 'exit $?' + case $host_os in + os2*) + # Create import libraries instead of links on OS/2 + func_show_eval '(emximp -o $output_objdir/$linkname $output_objdir/$libname.def)' 'exit $?' + ;; + *) + func_show_eval '(cd "$output_objdir" && $RM "$linkname" && $LN_S "$realname" "$linkname")' 'exit $?' + ;; + esac fi done -- 1.7.3.2 From MAILER-DAEMON Fri Apr 15 08:59:07 2011 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1QAic7-0002ih-29 for mharc-libtool-patches@gnu.org; Fri, 15 Apr 2011 08:59:07 -0400 Received: from eggs.gnu.org ([140.186.70.92]:36985) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QAic4-0002eE-VV for libtool-patches@gnu.org; Fri, 15 Apr 2011 08:59:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QAic0-0004xE-Ej for libtool-patches@gnu.org; Fri, 15 Apr 2011 08:59:04 -0400 Received: from [211.211.79.186] (port=61942 helo=localhost) by eggs.gnu.org with smtp (Exim 4.71) (envelope-from ) id 1QAibz-0004ww-Ps for libtool-patches@gnu.org; Fri, 15 Apr 2011 08:59:00 -0400 Received: from localhost.localdomain (localhost [127.0.0.1]) by smtp (InetPowerServer/2 v1.0.2.2) with SMTP id 4DC47F780011; Thu, 14 Apr 2011 23:08:41 +1000 From: KO Myung-Hun To: libtool-patches@gnu.org Subject: [PATCH 06/10] There is no need to relink DLLs on OS/2 Date: Thu, 14 Apr 2011 23:06:10 +0900 Message-Id: <1302789974-3413-7-git-send-email-komh@chollian.net> X-Mailer: git-send-email 1.7.3.2 In-Reply-To: <1302789974-3413-1-git-send-email-komh@chollian.net> References: <1302789974-3413-1-git-send-email-komh@chollian.net> X-detected-operating-system: by eggs.gnu.org: Tru64 4.0 (or OS/2 Warp 4) X-Received-From: 211.211.79.186 X-BeenThere: libtool-patches@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Patch submission list for the GNU libtool shared library maintenance tool List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 15 Apr 2011 12:59:05 -0000 --- libltdl/config/ltmain.m4sh | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/libltdl/config/ltmain.m4sh b/libltdl/config/ltmain.m4sh index 12e653f..03a4add 100644 --- a/libltdl/config/ltmain.m4sh +++ b/libltdl/config/ltmain.m4sh @@ -5910,7 +5910,7 @@ func_mode_link () if test -n "$library_names" && { test "$use_static_libs" = no || test -z "$old_library"; }; then case $host in - *cygwin* | *mingw* | *cegcc*) + *cygwin* | *mingw* | *cegcc* | *os2*) # No point in relinking DLLs because paths are not encoded func_append notinst_deplibs " $lib" need_relink=no -- 1.7.3.2 From MAILER-DAEMON Fri Apr 15 08:59:13 2011 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1QAicD-0002wd-Hv for mharc-libtool-patches@gnu.org; Fri, 15 Apr 2011 08:59:13 -0400 Received: from eggs.gnu.org ([140.186.70.92]:37035) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QAicA-0002rO-Mb for libtool-patches@gnu.org; Fri, 15 Apr 2011 08:59:11 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QAic9-0004z5-Tu for libtool-patches@gnu.org; Fri, 15 Apr 2011 08:59:10 -0400 Received: from [211.211.79.186] (port=61945 helo=localhost) by eggs.gnu.org with smtp (Exim 4.71) (envelope-from ) id 1QAic9-0004yb-AS for libtool-patches@gnu.org; Fri, 15 Apr 2011 08:59:09 -0400 Received: from localhost.localdomain (localhost [127.0.0.1]) by smtp (InetPowerServer/2 v1.0.2.2) with SMTP id 4DC47F7F0011; Thu, 14 Apr 2011 23:08:47 +1000 From: KO Myung-Hun To: libtool-patches@gnu.org Subject: [PATCH 10/10] Fix a problem that it fails to find proper libraries if .la is a dependency on OS/2 Date: Thu, 14 Apr 2011 23:06:14 +0900 Message-Id: <1302789974-3413-11-git-send-email-komh@chollian.net> X-Mailer: git-send-email 1.7.3.2 In-Reply-To: <1302789974-3413-1-git-send-email-komh@chollian.net> References: <1302789974-3413-1-git-send-email-komh@chollian.net> X-detected-operating-system: by eggs.gnu.org: Tru64 4.0 (or OS/2 Warp 4) X-Received-From: 211.211.79.186 X-BeenThere: libtool-patches@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Patch submission list for the GNU libtool shared library maintenance tool List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 15 Apr 2011 12:59:12 -0000 --- libltdl/config/ltmain.m4sh | 103 +++++++++++++++++++++++++++++++++---------- 1 files changed, 79 insertions(+), 24 deletions(-) diff --git a/libltdl/config/ltmain.m4sh b/libltdl/config/ltmain.m4sh index 9052a9d..19b816a 100644 --- a/libltdl/config/ltmain.m4sh +++ b/libltdl/config/ltmain.m4sh @@ -5457,33 +5457,66 @@ func_mode_link () # If $allow_libtool_libs_with_static_runtimes && $deplib is a stdlib, # We need to do some special things here, and not later. if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then - case " $predeps $postdeps " in - *" $deplib "*) - if func_lalib_p "$lib"; then - library_names= - old_library= - func_source "$lib" - for l in $old_library $library_names; do - ll="$l" - done - if test "X$ll" = "X$old_library" ; then # only static version available - found=no - func_dirname "$lib" "" "." - ladir="$func_dirname_result" - lib=$ladir/$old_library - if test "$linkmode,$pass" = "prog,link"; then - compile_deplibs="$deplib $compile_deplibs" - finalize_deplibs="$deplib $finalize_deplibs" - else - deplibs="$deplib $deplibs" - test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs" + case $host_os in + os2*) + case " $predeps $postdeps " in + *" $deplib "*) ;; + *) + if func_lalib_p "$lib"; then + library_names= + old_library= + func_source "$lib" + for l in $old_library $library_names; do + ll="$l" + done + if test "X$ll" = "X$old_library" ; then # only static version available + found=no + func_dirname "$lib" "" "." + ladir="$func_dirname_result" + lib=$ladir/$old_library + if test "$linkmode,$pass" = "prog,link"; then + compile_deplibs="$deplib $compile_deplibs" + finalize_deplibs="$deplib $finalize_deplibs" + else + deplibs="$deplib $deplibs" + test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs" + fi + continue fi - continue fi - fi + ;; + esac ;; - *) ;; - esac + *) + case " $predeps $postdeps " in + *" $deplib "*) + if func_lalib_p "$lib"; then + library_names= + old_library= + func_source "$lib" + for l in $old_library $library_names; do + ll="$l" + done + if test "X$ll" = "X$old_library" ; then # only static version available + found=no + func_dirname "$lib" "" "." + ladir="$func_dirname_result" + lib=$ladir/$old_library + if test "$linkmode,$pass" = "prog,link"; then + compile_deplibs="$deplib $compile_deplibs" + finalize_deplibs="$deplib $finalize_deplibs" + else + deplibs="$deplib $deplibs" + test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs" + fi + continue + fi + fi + ;; + *) ;; + esac + ;; + esac # case $host_os in fi fi ;; # -l @@ -6313,6 +6346,28 @@ func_mode_link () fi fi ;; + *-*-os2*) + depdepl= + deplibrary_names= + if test "$build_old_libs" != yes && test "$link_static" != yes ; then + eval deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib` + fi + if test -z "$deplibrary_names" ; then + # fall back to static library + eval deplibrary_names=`${SED} -n -e 's/^old_library=\(.*\)$/\1/p' $deplib` + fi + if test -n "$deplibrary_names" ; then + for tmp in $deplibrary_names ; do + depdepl=$tmp + done + if test -f "$absdir/$objdir/$depdepl" ; then + depdepl="$absdir/$objdir/$depdepl" + compiler_flags="$compiler_flags $depdepl" + linker_flags="$linker_flags $depdepl" + fi + fi + path= + ;; *) path="-L$absdir/$objdir" ;; -- 1.7.3.2 From MAILER-DAEMON Fri Apr 15 09:02:03 2011 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1QAiew-0003fn-SW for mharc-libtool-patches@gnu.org; Fri, 15 Apr 2011 09:02:02 -0400 Received: from eggs.gnu.org ([140.186.70.92]:36417) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QAieq-0003f8-DN for libtool-patches@gnu.org; Fri, 15 Apr 2011 09:02:00 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QAiep-0005XZ-5c for libtool-patches@gnu.org; Fri, 15 Apr 2011 09:01:56 -0400 Received: from [211.211.79.186] (port=61953 helo=localhost) by eggs.gnu.org with smtp (Exim 4.71) (envelope-from ) id 1QAieo-0005Wc-Fv for libtool-patches@gnu.org; Fri, 15 Apr 2011 09:01:55 -0400 Received: from localhost.localdomain (localhost [127.0.0.1]) by smtp (InetPowerServer/2 v1.0.2.2) with SMTP id 4DC5C13E0018; Fri, 15 Apr 2011 22:01:35 +1000 From: KO Myung-Hun To: libtool-patches@gnu.org Subject: [PATCH 00/10] Enhanced OS/2 ports Date: Fri, 15 Apr 2011 21:59:13 +0900 Message-Id: <1302872363-133-1-git-send-email-komh@chollian.net> X-Mailer: git-send-email 1.7.3.2 X-detected-operating-system: by eggs.gnu.org: Tru64 4.0 (or OS/2 Warp 4) X-Received-From: 211.211.79.186 X-BeenThere: libtool-patches@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Patch submission list for the GNU libtool shared library maintenance tool List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 15 Apr 2011 13:02:00 -0000 Hi/2. I attach the enhanced OS/2 ports. Review, please. [PATCH 01/10] Add -shortname option. [PATCH 02/10] Don't eliminate duplications in $postdeps and $predeps on OS/2 [PATCH 03/10] Set lt_prog_compiler_static to -Bstatic on OS/2 [PATCH 04/10] OS/2 uses other APIs to load a DLL than LoadLibrary() on Windows. [PATCH 05/10] OS/2 uses ld inherited from GNU ld [PATCH 06/10] There is no need to relink DLLs on OS/2 [PATCH 07/10] Set lt_cv_deplibs_check_method to pass_all on OS/2 [PATCH 08/10] Support -Zxxx options used on OS/2 [PATCH 09/10] Create import libraries instead of links to the real library on OS/2 [PATCH 10/10] Fix a problem that it fails to find proper libraries if .la is a dependency From MAILER-DAEMON Fri Apr 15 09:02:04 2011 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1QAiey-0003i2-1S for mharc-libtool-patches@gnu.org; Fri, 15 Apr 2011 09:02:04 -0400 Received: from eggs.gnu.org ([140.186.70.92]:36460) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QAieu-0003fW-QF for libtool-patches@gnu.org; Fri, 15 Apr 2011 09:02:02 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QAiet-0005Yl-IS for libtool-patches@gnu.org; Fri, 15 Apr 2011 09:02:00 -0400 Received: from [211.211.79.186] (port=61954 helo=localhost) by eggs.gnu.org with smtp (Exim 4.71) (envelope-from ) id 1QAies-0005YU-KW for libtool-patches@gnu.org; Fri, 15 Apr 2011 09:01:59 -0400 Received: from localhost.localdomain (localhost [127.0.0.1]) by smtp (InetPowerServer/2 v1.0.2.2) with SMTP id 4DC5C13F0018; Fri, 15 Apr 2011 22:01:36 +1000 From: KO Myung-Hun To: libtool-patches@gnu.org Subject: [PATCH 01/10] Add -shortname option. Date: Fri, 15 Apr 2011 21:59:14 +0900 Message-Id: <1302872363-133-2-git-send-email-komh@chollian.net> X-Mailer: git-send-email 1.7.3.2 In-Reply-To: <1302872363-133-1-git-send-email-komh@chollian.net> References: <1302872363-133-1-git-send-email-komh@chollian.net> X-detected-operating-system: by eggs.gnu.org: Tru64 4.0 (or OS/2 Warp 4) X-Received-From: 211.211.79.186 X-BeenThere: libtool-patches@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Patch submission list for the GNU libtool shared library maintenance tool List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 15 Apr 2011 13:02:02 -0000 OS/2 limits a length of a DLL base name up to 8 characters. If a name of a shared library is longer than 8 characters, OS/2 cannot load it. So the option to specify a short name is needed. --- NEWS | 1 + doc/libtool.texi | 4 ++++ libltdl/config/ltmain.m4sh | 11 +++++++++++ libltdl/m4/libtool.m4 | 38 ++++++++++++++++++++++++++++++++++---- 4 files changed, 50 insertions(+), 4 deletions(-) diff --git a/NEWS b/NEWS index 90d14b7..566eeb1 100644 --- a/NEWS +++ b/NEWS @@ -7,6 +7,7 @@ New in 2.4.2 2011-??-??: git version 2.4.1a, Libtool team: - The --with-pic configure option now supports a list of comma-separated package names. This can be used to build some static libraries with PIC objects while building others with non-PIC objects. + - Added -shortname option to specify a short name for a DLL (OS/2 only) - Initial support for Go, using the gccgo compiler. diff --git a/doc/libtool.texi b/doc/libtool.texi index 72bb0fc..2e4c88d 100644 --- a/doc/libtool.texi +++ b/doc/libtool.texi @@ -1583,6 +1583,10 @@ In the later case, libtool will signal an error if it was configured with @option{--disable-shared}, or if the host does not support shared libraries. +@item -shortname @var{name} +If @var{name} is specified, replace a name for a DLL with @var{suffix} (effect +on OS/2 only) + @item -shrext @var{suffix} If @var{output-file} is a libtool library, replace the system's standard file name extension for shared libraries with @var{suffix} (most systems diff --git a/libltdl/config/ltmain.m4sh b/libltdl/config/ltmain.m4sh index 9358ec5..371a973 100644 --- a/libltdl/config/ltmain.m4sh +++ b/libltdl/config/ltmain.m4sh @@ -1638,6 +1638,7 @@ The following components of LINK-COMMAND are treated specially: -rpath LIBDIR the created library will eventually be installed in LIBDIR -R[ ]LIBDIR add LIBDIR to the runtime path of programs and libraries -shared only do dynamic linking of libtool libraries + -shortname NAME specify a short name for a DLL(effect on OS/2 only) -shrext SUFFIX override the standard shared library file extension -static do not do any dynamic linking of uninstalled libtool libraries -static-libtool-libs @@ -4639,6 +4640,11 @@ func_mode_link () prev= continue ;; + shortname) + shortname_cmds="$ECHO $arg | cut -b -8" + prev= + continue + ;; shrext) shrext_cmds="$arg" prev= @@ -4959,6 +4965,11 @@ func_mode_link () continue ;; + -shortname) + prev=shortname + continue + ;; + -shrext) prev=shrext continue diff --git a/libltdl/m4/libtool.m4 b/libltdl/m4/libtool.m4 index 2ed41b7..c2814de 100644 --- a/libltdl/m4/libtool.m4 +++ b/libltdl/m4/libtool.m4 @@ -2225,6 +2225,7 @@ BEGIN {RS=" "; FS="/|\n";} { else sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" fi]) +shortname_cmds= library_names_spec= libname_spec='lib$name' soname_spec= @@ -2751,9 +2752,15 @@ os2*) libname_spec='$name' shrext_cmds=".dll" need_lib_prefix=no - library_names_spec='$libname${shared_ext} $libname.a' + # OS/2 limits a length of a DLL basename up to 8 characters. + # So there is need to use a short name instead of a original name + # longer than 8 characters. + shortname_cmds='$ECHO $libname | cut -b -8' + library_names_spec='`eval $shortname_cmds`${shared_ext} ${libname}_dll.$libext' dynamic_linker='OS/2 ld.exe' - shlibpath_var=LIBPATH + shlibpath_var=BEGINLIBPATH + sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" + sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" ;; osf3* | osf4* | osf5*) @@ -2899,6 +2906,7 @@ _LT_DECL([], [shlibpath_var], [0],[Shared library path variable]) _LT_DECL([], [shlibpath_overrides_runpath], [0], [Is shlibpath searched before the hard-coded library search path?]) _LT_DECL([], [libname_spec], [1], [Format of library name prefix]) +_LT_DECL([], [shortname_cmds], [2], [Command to make a short name]) _LT_DECL([], [library_names_spec], [1], [[List of archive names. First name is the real one, the rest are links. The last name is the one that the linker finds with -lNAME]]) @@ -4772,6 +4780,16 @@ _LT_EOF _LT_TAGVAR(link_all_deplibs, $1)=yes ;; + os2*) + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' + _LT_TAGVAR(hardcode_minus_L, $1)=yes + _LT_TAGVAR(allow_undefined_flag, $1)=unsupported + shrext_cmds=".dll" + _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY `eval $shortname_cmds` INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$ECHO DATA >> $output_objdir/$libname.def~$ECHO " MULTIPLE NONSHARED" >> $output_objdir/$libname.def~$ECHO EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def' + _LT_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def' + _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes + ;; + interix[[3-9]]*) _LT_TAGVAR(hardcode_direct, $1)=no _LT_TAGVAR(hardcode_shlibpath_var, $1)=no @@ -5395,8 +5413,10 @@ _LT_EOF _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' _LT_TAGVAR(hardcode_minus_L, $1)=yes _LT_TAGVAR(allow_undefined_flag, $1)=unsupported - _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~echo DATA >> $output_objdir/$libname.def~echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def' - _LT_TAGVAR(old_archive_from_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def' + shrext_cmds=".dll" + _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY `eval $shortname_cmds` INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$ECHO DATA >> $output_objdir/$libname.def~$ECHO " MULTIPLE NONSHARED" >> $output_objdir/$libname.def~$ECHO EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def' + _LT_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def' + _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes ;; osf3*) @@ -6188,6 +6208,16 @@ if test "$_lt_caught_CXX_error" != yes; then _LT_DARWIN_LINKER_FEATURES($1) ;; + os2*) + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' + _LT_TAGVAR(hardcode_minus_L, $1)=yes + _LT_TAGVAR(allow_undefined_flag, $1)=unsupported + shrext_cmds=".dll" + _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY `eval $shortname_cmds` INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$ECHO DATA >> $output_objdir/$libname.def~$ECHO " MULTIPLE NONSHARED" >> $output_objdir/$libname.def~$ECHO EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def' + _LT_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def' + _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes + ;; + dgux*) case $cc_basename in ec++*) -- 1.7.3.2 From MAILER-DAEMON Fri Apr 15 09:02:08 2011 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1QAif2-0003lL-5O for mharc-libtool-patches@gnu.org; Fri, 15 Apr 2011 09:02:08 -0400 Received: from eggs.gnu.org ([140.186.70.92]:36492) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QAiez-0003kG-Hu for libtool-patches@gnu.org; Fri, 15 Apr 2011 09:02:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QAiey-0005Zj-BI for libtool-patches@gnu.org; Fri, 15 Apr 2011 09:02:05 -0400 Received: from [211.211.79.186] (port=61955 helo=localhost) by eggs.gnu.org with smtp (Exim 4.71) (envelope-from ) id 1QAiex-0005ZO-Ox for libtool-patches@gnu.org; Fri, 15 Apr 2011 09:02:04 -0400 Received: from localhost.localdomain (localhost [127.0.0.1]) by smtp (InetPowerServer/2 v1.0.2.2) with SMTP id 4DC5C1410018; Fri, 15 Apr 2011 22:01:38 +1000 From: KO Myung-Hun To: libtool-patches@gnu.org Subject: [PATCH 02/10] Don't eliminate duplications in $postdeps and $predeps on OS/2 Date: Fri, 15 Apr 2011 21:59:15 +0900 Message-Id: <1302872363-133-3-git-send-email-komh@chollian.net> X-Mailer: git-send-email 1.7.3.2 In-Reply-To: <1302872363-133-1-git-send-email-komh@chollian.net> References: <1302872363-133-1-git-send-email-komh@chollian.net> X-detected-operating-system: by eggs.gnu.org: Tru64 4.0 (or OS/2 Warp 4) X-Received-From: 211.211.79.186 X-BeenThere: libtool-patches@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Patch submission list for the GNU libtool shared library maintenance tool List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 15 Apr 2011 13:02:06 -0000 --- libltdl/config/ltmain.m4sh | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/libltdl/config/ltmain.m4sh b/libltdl/config/ltmain.m4sh index 371a973..12e653f 100644 --- a/libltdl/config/ltmain.m4sh +++ b/libltdl/config/ltmain.m4sh @@ -395,7 +395,7 @@ M4SH_GETOPTS( test "$opt_debug" = : || func_append preserve_args " --debug" case $host in - *cygwin* | *mingw* | *pw32* | *cegcc*) + *cygwin* | *mingw* | *pw32* | *cegcc* | *os2*) # don't eliminate duplications in $postdeps and $predeps opt_duplicate_compiler_generated_deps=: ;; -- 1.7.3.2 From MAILER-DAEMON Fri Apr 15 09:02:13 2011 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1QAif7-0003mv-9M for mharc-libtool-patches@gnu.org; Fri, 15 Apr 2011 09:02:13 -0400 Received: from eggs.gnu.org ([140.186.70.92]:36541) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QAif5-0003mk-Vb for libtool-patches@gnu.org; Fri, 15 Apr 2011 09:02:13 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QAif4-0005b9-JE for libtool-patches@gnu.org; Fri, 15 Apr 2011 09:02:11 -0400 Received: from [211.211.79.186] (port=61957 helo=localhost) by eggs.gnu.org with smtp (Exim 4.71) (envelope-from ) id 1QAif3-0005al-P7 for libtool-patches@gnu.org; Fri, 15 Apr 2011 09:02:10 -0400 Received: from localhost.localdomain (localhost [127.0.0.1]) by smtp (InetPowerServer/2 v1.0.2.2) with SMTP id 4DC5C1440018; Fri, 15 Apr 2011 22:01:41 +1000 From: KO Myung-Hun To: libtool-patches@gnu.org Subject: [PATCH 04/10] OS/2 uses other APIs to load a DLL than LoadLibrary() on Windows. Date: Fri, 15 Apr 2011 21:59:17 +0900 Message-Id: <1302872363-133-5-git-send-email-komh@chollian.net> X-Mailer: git-send-email 1.7.3.2 In-Reply-To: <1302872363-133-1-git-send-email-komh@chollian.net> References: <1302872363-133-1-git-send-email-komh@chollian.net> X-detected-operating-system: by eggs.gnu.org: Tru64 4.0 (or OS/2 Warp 4) X-Received-From: 211.211.79.186 X-BeenThere: libtool-patches@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Patch submission list for the GNU libtool shared library maintenance tool List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 15 Apr 2011 13:02:13 -0000 --- libltdl/m4/ltdl.m4 | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/libltdl/m4/ltdl.m4 b/libltdl/m4/ltdl.m4 index ea76f4d..76f9919 100644 --- a/libltdl/m4/ltdl.m4 +++ b/libltdl/m4/ltdl.m4 @@ -703,7 +703,7 @@ darwin[[1567]].*) beos*) LT_DLLOADERS="$LT_DLLOADERS ${lt_dlopen_dir+$lt_dlopen_dir/}load_add_on.la" ;; -cygwin* | mingw* | os2* | pw32*) +cygwin* | mingw* | pw32*) AC_CHECK_DECLS([cygwin_conv_path], [], [], [[#include ]]) LT_DLLOADERS="$LT_DLLOADERS ${lt_dlopen_dir+$lt_dlopen_dir/}loadlibrary.la" ;; -- 1.7.3.2 From MAILER-DAEMON Fri Apr 15 09:02:16 2011 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1QAifA-0003pQ-BY for mharc-libtool-patches@gnu.org; Fri, 15 Apr 2011 09:02:16 -0400 Received: from eggs.gnu.org ([140.186.70.92]:36569) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QAif8-0003pB-Qs for libtool-patches@gnu.org; Fri, 15 Apr 2011 09:02:15 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QAif1-0005aV-CF for libtool-patches@gnu.org; Fri, 15 Apr 2011 09:02:14 -0400 Received: from [211.211.79.186] (port=61956 helo=localhost) by eggs.gnu.org with smtp (Exim 4.71) (envelope-from ) id 1QAif0-0005aG-RA for libtool-patches@gnu.org; Fri, 15 Apr 2011 09:02:07 -0400 Received: from localhost.localdomain (localhost [127.0.0.1]) by smtp (InetPowerServer/2 v1.0.2.2) with SMTP id 4DC5C1430018; Fri, 15 Apr 2011 22:01:39 +1000 From: KO Myung-Hun To: libtool-patches@gnu.org Subject: [PATCH 03/10] Set lt_prog_compiler_static to -Bstatic on OS/2 Date: Fri, 15 Apr 2011 21:59:16 +0900 Message-Id: <1302872363-133-4-git-send-email-komh@chollian.net> X-Mailer: git-send-email 1.7.3.2 In-Reply-To: <1302872363-133-1-git-send-email-komh@chollian.net> References: <1302872363-133-1-git-send-email-komh@chollian.net> X-detected-operating-system: by eggs.gnu.org: Tru64 4.0 (or OS/2 Warp 4) X-Received-From: 211.211.79.186 X-BeenThere: libtool-patches@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Patch submission list for the GNU libtool shared library maintenance tool List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 15 Apr 2011 13:02:15 -0000 --- libltdl/m4/libtool.m4 | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/libltdl/m4/libtool.m4 b/libltdl/m4/libtool.m4 index c2814de..2361831 100644 --- a/libltdl/m4/libtool.m4 +++ b/libltdl/m4/libtool.m4 @@ -3919,6 +3919,11 @@ m4_if([$1], [CXX], [ # (--disable-auto-import) libraries m4_if([$1], [GCJ], [], [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) + case $host_os in + os2*) + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + ;; + esac ;; darwin* | rhapsody*) # PIC is the default on this platform @@ -4237,6 +4242,11 @@ m4_if([$1], [CXX], [ # (--disable-auto-import) libraries m4_if([$1], [GCJ], [], [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) + case $host_os in + os2*) + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + ;; + esac ;; darwin* | rhapsody*) @@ -4320,6 +4330,11 @@ m4_if([$1], [CXX], [ # built for inclusion in a dll (and should export symbols for example). m4_if([$1], [GCJ], [], [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) + case $host_os in + os2*) + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + ;; + esac ;; hpux9* | hpux10* | hpux11*) -- 1.7.3.2 From MAILER-DAEMON Fri Apr 15 09:02:21 2011 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1QAifF-0003tU-TW for mharc-libtool-patches@gnu.org; Fri, 15 Apr 2011 09:02:21 -0400 Received: from eggs.gnu.org ([140.186.70.92]:36603) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QAifC-0003rf-Ti for libtool-patches@gnu.org; Fri, 15 Apr 2011 09:02:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QAifC-0005cs-51 for libtool-patches@gnu.org; Fri, 15 Apr 2011 09:02:18 -0400 Received: from [211.211.79.186] (port=61959 helo=localhost) by eggs.gnu.org with smtp (Exim 4.71) (envelope-from ) id 1QAifB-0005cX-I2 for libtool-patches@gnu.org; Fri, 15 Apr 2011 09:02:18 -0400 Received: from localhost.localdomain (localhost [127.0.0.1]) by smtp (InetPowerServer/2 v1.0.2.2) with SMTP id 4DC5C1470018; Fri, 15 Apr 2011 22:01:44 +1000 From: KO Myung-Hun To: libtool-patches@gnu.org Subject: [PATCH 06/10] There is no need to relink DLLs on OS/2 Date: Fri, 15 Apr 2011 21:59:19 +0900 Message-Id: <1302872363-133-7-git-send-email-komh@chollian.net> X-Mailer: git-send-email 1.7.3.2 In-Reply-To: <1302872363-133-1-git-send-email-komh@chollian.net> References: <1302872363-133-1-git-send-email-komh@chollian.net> X-detected-operating-system: by eggs.gnu.org: Tru64 4.0 (or OS/2 Warp 4) X-Received-From: 211.211.79.186 X-BeenThere: libtool-patches@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Patch submission list for the GNU libtool shared library maintenance tool List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 15 Apr 2011 13:02:19 -0000 --- libltdl/config/ltmain.m4sh | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/libltdl/config/ltmain.m4sh b/libltdl/config/ltmain.m4sh index 12e653f..03a4add 100644 --- a/libltdl/config/ltmain.m4sh +++ b/libltdl/config/ltmain.m4sh @@ -5910,7 +5910,7 @@ func_mode_link () if test -n "$library_names" && { test "$use_static_libs" = no || test -z "$old_library"; }; then case $host in - *cygwin* | *mingw* | *cegcc*) + *cygwin* | *mingw* | *cegcc* | *os2*) # No point in relinking DLLs because paths are not encoded func_append notinst_deplibs " $lib" need_relink=no -- 1.7.3.2 From MAILER-DAEMON Fri Apr 15 09:02:24 2011 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1QAifH-0003uo-WC for mharc-libtool-patches@gnu.org; Fri, 15 Apr 2011 09:02:23 -0400 Received: from eggs.gnu.org ([140.186.70.92]:36626) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QAifG-0003tq-0t for libtool-patches@gnu.org; Fri, 15 Apr 2011 09:02:22 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QAifF-0005dQ-6D for libtool-patches@gnu.org; Fri, 15 Apr 2011 09:02:21 -0400 Received: from [211.211.79.186] (port=61960 helo=localhost) by eggs.gnu.org with smtp (Exim 4.71) (envelope-from ) id 1QAifE-0005dH-Jk for libtool-patches@gnu.org; Fri, 15 Apr 2011 09:02:21 -0400 Received: from localhost.localdomain (localhost [127.0.0.1]) by smtp (InetPowerServer/2 v1.0.2.2) with SMTP id 4DC5C1490018; Fri, 15 Apr 2011 22:01:45 +1000 From: KO Myung-Hun To: libtool-patches@gnu.org Subject: [PATCH 07/10] Set lt_cv_deplibs_check_method to pass_all on OS/2 Date: Fri, 15 Apr 2011 21:59:20 +0900 Message-Id: <1302872363-133-8-git-send-email-komh@chollian.net> X-Mailer: git-send-email 1.7.3.2 In-Reply-To: <1302872363-133-1-git-send-email-komh@chollian.net> References: <1302872363-133-1-git-send-email-komh@chollian.net> X-detected-operating-system: by eggs.gnu.org: Tru64 4.0 (or OS/2 Warp 4) X-Received-From: 211.211.79.186 X-BeenThere: libtool-patches@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Patch submission list for the GNU libtool shared library maintenance tool List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 15 Apr 2011 13:02:22 -0000 --- libltdl/m4/libtool.m4 | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/libltdl/m4/libtool.m4 b/libltdl/m4/libtool.m4 index 9f0e5d7..0dc1055 100644 --- a/libltdl/m4/libtool.m4 +++ b/libltdl/m4/libtool.m4 @@ -3369,6 +3369,9 @@ sysv4 | sysv4.3*) tpf*) lt_cv_deplibs_check_method=pass_all ;; +os2*) + lt_cv_deplibs_check_method=pass_all + ;; esac ]) -- 1.7.3.2 From MAILER-DAEMON Fri Apr 15 09:02:25 2011 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1QAifJ-0003wr-2H for mharc-libtool-patches@gnu.org; Fri, 15 Apr 2011 09:02:25 -0400 Received: from eggs.gnu.org ([140.186.70.92]:36601) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QAifC-0003re-Sa for libtool-patches@gnu.org; Fri, 15 Apr 2011 09:02:23 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QAif8-0005c1-C8 for libtool-patches@gnu.org; Fri, 15 Apr 2011 09:02:18 -0400 Received: from [211.211.79.186] (port=61958 helo=localhost) by eggs.gnu.org with smtp (Exim 4.71) (envelope-from ) id 1QAif7-0005bb-K6 for libtool-patches@gnu.org; Fri, 15 Apr 2011 09:02:14 -0400 Received: from localhost.localdomain (localhost [127.0.0.1]) by smtp (InetPowerServer/2 v1.0.2.2) with SMTP id 4DC5C1460018; Fri, 15 Apr 2011 22:01:42 +1000 From: KO Myung-Hun To: libtool-patches@gnu.org Subject: [PATCH 05/10] OS/2 uses ld inherited from GNU ld Date: Fri, 15 Apr 2011 21:59:18 +0900 Message-Id: <1302872363-133-6-git-send-email-komh@chollian.net> X-Mailer: git-send-email 1.7.3.2 In-Reply-To: <1302872363-133-1-git-send-email-komh@chollian.net> References: <1302872363-133-1-git-send-email-komh@chollian.net> X-detected-operating-system: by eggs.gnu.org: Tru64 4.0 (or OS/2 Warp 4) X-Received-From: 211.211.79.186 X-BeenThere: libtool-patches@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Patch submission list for the GNU libtool shared library maintenance tool List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 15 Apr 2011 13:02:23 -0000 --- libltdl/m4/libtool.m4 | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/libltdl/m4/libtool.m4 b/libltdl/m4/libtool.m4 index 2361831..9f0e5d7 100644 --- a/libltdl/m4/libtool.m4 +++ b/libltdl/m4/libtool.m4 @@ -4656,6 +4656,9 @@ dnl Note also adjust exclude_expsyms for C++ above. with_gnu_ld=no fi ;; + os2*) + with_gnu_ld=yes + ;; interix*) # we just hope/assume this is gcc and not c89 (= MSVC++) with_gnu_ld=yes -- 1.7.3.2 From MAILER-DAEMON Fri Apr 15 09:02:29 2011 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1QAifN-000400-58 for mharc-libtool-patches@gnu.org; Fri, 15 Apr 2011 09:02:29 -0400 Received: from eggs.gnu.org ([140.186.70.92]:36672) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QAifL-0003z7-FG for libtool-patches@gnu.org; Fri, 15 Apr 2011 09:02:28 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QAifK-0005eq-MY for libtool-patches@gnu.org; Fri, 15 Apr 2011 09:02:27 -0400 Received: from [211.211.79.186] (port=61961 helo=localhost) by eggs.gnu.org with smtp (Exim 4.71) (envelope-from ) id 1QAifK-0005eI-46 for libtool-patches@gnu.org; Fri, 15 Apr 2011 09:02:26 -0400 Received: from localhost.localdomain (localhost [127.0.0.1]) by smtp (InetPowerServer/2 v1.0.2.2) with SMTP id 4DC5C14B0018; Fri, 15 Apr 2011 22:01:48 +1000 From: KO Myung-Hun To: libtool-patches@gnu.org Subject: [PATCH 08/10] Support -Zxxx options used on OS/2 Date: Fri, 15 Apr 2011 21:59:21 +0900 Message-Id: <1302872363-133-9-git-send-email-komh@chollian.net> X-Mailer: git-send-email 1.7.3.2 In-Reply-To: <1302872363-133-1-git-send-email-komh@chollian.net> References: <1302872363-133-1-git-send-email-komh@chollian.net> X-detected-operating-system: by eggs.gnu.org: Tru64 4.0 (or OS/2 Warp 4) X-Received-From: 211.211.79.186 X-BeenThere: libtool-patches@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Patch submission list for the GNU libtool shared library maintenance tool List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 15 Apr 2011 13:02:28 -0000 --- libltdl/config/ltmain.m4sh | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/libltdl/config/ltmain.m4sh b/libltdl/config/ltmain.m4sh index 03a4add..3619343 100644 --- a/libltdl/config/ltmain.m4sh +++ b/libltdl/config/ltmain.m4sh @@ -5083,6 +5083,17 @@ func_mode_link () continue ;; + # OS/2 uses -Zxxx to specify OS/2-specific options + -Z*) + compiler_flags="$compiler_flags $arg" + func_append compile_command " $arg" + func_append finalize_command " $arg" + case $arg in + -Zlinker | -Zstack) prev=xcompiler;; + esac + continue + ;; + # Some other compiler flag. -* | +*) func_quote_for_eval "$arg" -- 1.7.3.2 From MAILER-DAEMON Fri Apr 15 09:02:33 2011 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1QAifR-00042U-Av for mharc-libtool-patches@gnu.org; Fri, 15 Apr 2011 09:02:33 -0400 Received: from eggs.gnu.org ([140.186.70.92]:36691) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QAifP-00041S-6a for libtool-patches@gnu.org; Fri, 15 Apr 2011 09:02:32 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QAifO-0005fN-AI for libtool-patches@gnu.org; Fri, 15 Apr 2011 09:02:31 -0400 Received: from [211.211.79.186] (port=61962 helo=localhost) by eggs.gnu.org with smtp (Exim 4.71) (envelope-from ) id 1QAifN-0005f6-PM for libtool-patches@gnu.org; Fri, 15 Apr 2011 09:02:30 -0400 Received: from localhost.localdomain (localhost [127.0.0.1]) by smtp (InetPowerServer/2 v1.0.2.2) with SMTP id 4DC5C14C0018; Fri, 15 Apr 2011 22:01:49 +1000 From: KO Myung-Hun To: libtool-patches@gnu.org Subject: [PATCH 09/10] Create import libraries instead of links to the real library on OS/2 Date: Fri, 15 Apr 2011 21:59:22 +0900 Message-Id: <1302872363-133-10-git-send-email-komh@chollian.net> X-Mailer: git-send-email 1.7.3.2 In-Reply-To: <1302872363-133-1-git-send-email-komh@chollian.net> References: <1302872363-133-1-git-send-email-komh@chollian.net> X-detected-operating-system: by eggs.gnu.org: Tru64 4.0 (or OS/2 Warp 4) X-Received-From: 211.211.79.186 X-BeenThere: libtool-patches@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Patch submission list for the GNU libtool shared library maintenance tool List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 15 Apr 2011 13:02:32 -0000 --- libltdl/config/ltmain.m4sh | 23 ++++++++++++++++++++--- 1 files changed, 20 insertions(+), 3 deletions(-) diff --git a/libltdl/config/ltmain.m4sh b/libltdl/config/ltmain.m4sh index 3619343..9052a9d 100644 --- a/libltdl/config/ltmain.m4sh +++ b/libltdl/config/ltmain.m4sh @@ -2222,8 +2222,17 @@ func_mode_install () # so we also need to try rm && ln -s. for linkname do - test "$linkname" != "$realname" \ - && func_show_eval "(cd $destdir && { $LN_S -f $realname $linkname || { $RM $linkname && $LN_S $realname $linkname; }; })" + if test "$linkname" != "$realname"; then + case $host_os in + os2*) + # Create import libraries instead of links on OS/2 + func_show_eval "(emximp -o $destdir/$linkname $dir/${linkname%%_dll.$libext}.def)" + ;; + *) + func_show_eval "(cd $destdir && { $LN_S -f $realname $linkname || { $RM $linkname && $LN_S $realname $linkname; }; })" + ;; + esac + fi done fi @@ -7799,7 +7808,15 @@ EOF # Create links to the real library. for linkname in $linknames; do if test "$realname" != "$linkname"; then - func_show_eval '(cd "$output_objdir" && $RM "$linkname" && $LN_S "$realname" "$linkname")' 'exit $?' + case $host_os in + os2*) + # Create import libraries instead of links on OS/2 + func_show_eval '(emximp -o $output_objdir/$linkname $output_objdir/$libname.def)' 'exit $?' + ;; + *) + func_show_eval '(cd "$output_objdir" && $RM "$linkname" && $LN_S "$realname" "$linkname")' 'exit $?' + ;; + esac fi done -- 1.7.3.2 From MAILER-DAEMON Fri Apr 15 09:02:40 2011 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1QAifY-00044O-EN for mharc-libtool-patches@gnu.org; Fri, 15 Apr 2011 09:02:40 -0400 Received: from eggs.gnu.org ([140.186.70.92]:36733) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QAifW-00044A-SO for libtool-patches@gnu.org; Fri, 15 Apr 2011 09:02:39 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QAifR-0005gD-Tb for libtool-patches@gnu.org; Fri, 15 Apr 2011 09:02:38 -0400 Received: from [211.211.79.186] (port=61963 helo=localhost) by eggs.gnu.org with smtp (Exim 4.71) (envelope-from ) id 1QAifR-0005fm-AO for libtool-patches@gnu.org; Fri, 15 Apr 2011 09:02:33 -0400 Received: from localhost.localdomain (localhost [127.0.0.1]) by smtp (InetPowerServer/2 v1.0.2.2) with SMTP id 4DC5C14E0018; Fri, 15 Apr 2011 22:01:51 +1000 From: KO Myung-Hun To: libtool-patches@gnu.org Subject: [PATCH 10/10] Fix a problem that it fails to find proper libraries if .la is a dependency on OS/2 Date: Fri, 15 Apr 2011 21:59:23 +0900 Message-Id: <1302872363-133-11-git-send-email-komh@chollian.net> X-Mailer: git-send-email 1.7.3.2 In-Reply-To: <1302872363-133-1-git-send-email-komh@chollian.net> References: <1302872363-133-1-git-send-email-komh@chollian.net> X-detected-operating-system: by eggs.gnu.org: Tru64 4.0 (or OS/2 Warp 4) X-Received-From: 211.211.79.186 X-BeenThere: libtool-patches@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Patch submission list for the GNU libtool shared library maintenance tool List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 15 Apr 2011 13:02:39 -0000 --- libltdl/config/ltmain.m4sh | 103 +++++++++++++++++++++++++++++++++---------- 1 files changed, 79 insertions(+), 24 deletions(-) diff --git a/libltdl/config/ltmain.m4sh b/libltdl/config/ltmain.m4sh index 9052a9d..19b816a 100644 --- a/libltdl/config/ltmain.m4sh +++ b/libltdl/config/ltmain.m4sh @@ -5457,33 +5457,66 @@ func_mode_link () # If $allow_libtool_libs_with_static_runtimes && $deplib is a stdlib, # We need to do some special things here, and not later. if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then - case " $predeps $postdeps " in - *" $deplib "*) - if func_lalib_p "$lib"; then - library_names= - old_library= - func_source "$lib" - for l in $old_library $library_names; do - ll="$l" - done - if test "X$ll" = "X$old_library" ; then # only static version available - found=no - func_dirname "$lib" "" "." - ladir="$func_dirname_result" - lib=$ladir/$old_library - if test "$linkmode,$pass" = "prog,link"; then - compile_deplibs="$deplib $compile_deplibs" - finalize_deplibs="$deplib $finalize_deplibs" - else - deplibs="$deplib $deplibs" - test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs" + case $host_os in + os2*) + case " $predeps $postdeps " in + *" $deplib "*) ;; + *) + if func_lalib_p "$lib"; then + library_names= + old_library= + func_source "$lib" + for l in $old_library $library_names; do + ll="$l" + done + if test "X$ll" = "X$old_library" ; then # only static version available + found=no + func_dirname "$lib" "" "." + ladir="$func_dirname_result" + lib=$ladir/$old_library + if test "$linkmode,$pass" = "prog,link"; then + compile_deplibs="$deplib $compile_deplibs" + finalize_deplibs="$deplib $finalize_deplibs" + else + deplibs="$deplib $deplibs" + test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs" + fi + continue fi - continue fi - fi + ;; + esac ;; - *) ;; - esac + *) + case " $predeps $postdeps " in + *" $deplib "*) + if func_lalib_p "$lib"; then + library_names= + old_library= + func_source "$lib" + for l in $old_library $library_names; do + ll="$l" + done + if test "X$ll" = "X$old_library" ; then # only static version available + found=no + func_dirname "$lib" "" "." + ladir="$func_dirname_result" + lib=$ladir/$old_library + if test "$linkmode,$pass" = "prog,link"; then + compile_deplibs="$deplib $compile_deplibs" + finalize_deplibs="$deplib $finalize_deplibs" + else + deplibs="$deplib $deplibs" + test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs" + fi + continue + fi + fi + ;; + *) ;; + esac + ;; + esac # case $host_os in fi fi ;; # -l @@ -6313,6 +6346,28 @@ func_mode_link () fi fi ;; + *-*-os2*) + depdepl= + deplibrary_names= + if test "$build_old_libs" != yes && test "$link_static" != yes ; then + eval deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib` + fi + if test -z "$deplibrary_names" ; then + # fall back to static library + eval deplibrary_names=`${SED} -n -e 's/^old_library=\(.*\)$/\1/p' $deplib` + fi + if test -n "$deplibrary_names" ; then + for tmp in $deplibrary_names ; do + depdepl=$tmp + done + if test -f "$absdir/$objdir/$depdepl" ; then + depdepl="$absdir/$objdir/$depdepl" + compiler_flags="$compiler_flags $depdepl" + linker_flags="$linker_flags $depdepl" + fi + fi + path= + ;; *) path="-L$absdir/$objdir" ;; -- 1.7.3.2 From MAILER-DAEMON Fri Apr 15 09:46:47 2011 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1QAjMF-0006uc-Ba for mharc-libtool-patches@gnu.org; Fri, 15 Apr 2011 09:46:47 -0400 Received: from eggs.gnu.org ([140.186.70.92]:49893) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QAjMC-0006uW-Vt for libtool-patches@gnu.org; Fri, 15 Apr 2011 09:46:46 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QAjM8-0006YE-Vs for libtool-patches@gnu.org; Fri, 15 Apr 2011 09:46:44 -0400 Received: from mx1.redhat.com ([209.132.183.28]:36064) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QAjM8-0006Y6-LK for libtool-patches@gnu.org; Fri, 15 Apr 2011 09:46:40 -0400 Received: from int-mx12.intmail.prod.int.phx2.redhat.com (int-mx12.intmail.prod.int.phx2.redhat.com [10.5.11.25]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id p3FDkYW7010596 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Fri, 15 Apr 2011 09:46:35 -0400 Received: from [10.3.113.38] (ovpn-113-38.phx2.redhat.com [10.3.113.38]) by int-mx12.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id p3FDkXQf017489; Fri, 15 Apr 2011 09:46:34 -0400 Message-ID: <4DA84C39.5060100@redhat.com> Date: Fri, 15 Apr 2011 07:46:33 -0600 From: Eric Blake Organization: Red Hat User-Agent: Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.2.15) Gecko/20110307 Fedora/3.1.9-0.39.b3pre.fc14 Lightning/1.0b3pre Mnenhy/0.8.3 Thunderbird/3.1.9 MIME-Version: 1.0 To: KO Myung-Hun Subject: Re: [PATCH 01/10] Add -shortname option. References: <1302872363-133-1-git-send-email-komh@chollian.net> <1302872363-133-2-git-send-email-komh@chollian.net> In-Reply-To: <1302872363-133-2-git-send-email-komh@chollian.net> X-Enigmail-Version: 1.1.2 OpenPGP: url=http://people.redhat.com/eblake/eblake.gpg Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="------------enig1CDE633BC93EBE63079E714C" X-Scanned-By: MIMEDefang 2.68 on 10.5.11.25 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.132.183.28 Cc: libtool-patches@gnu.org X-BeenThere: libtool-patches@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Patch submission list for the GNU libtool shared library maintenance tool List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 15 Apr 2011 13:46:46 -0000 This is an OpenPGP/MIME signed message (RFC 2440 and 3156) --------------enig1CDE633BC93EBE63079E714C Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable On 04/15/2011 06:59 AM, KO Myung-Hun wrote: > OS/2 limits a length of a DLL base name up to 8 characters. If a name o= f > a shared library is longer than 8 characters, OS/2 cannot load it. So t= he > option to specify a short name is needed. > --- > NEWS | 1 + > doc/libtool.texi | 4 ++++ > libltdl/config/ltmain.m4sh | 11 +++++++++++ > libltdl/m4/libtool.m4 | 38 ++++++++++++++++++++++++++++++++++--= -- > 4 files changed, 50 insertions(+), 4 deletions(-) >=20 > diff --git a/NEWS b/NEWS > index 90d14b7..566eeb1 100644 > --- a/NEWS > +++ b/NEWS > @@ -7,6 +7,7 @@ New in 2.4.2 2011-??-??: git version 2.4.1a, Libtool te= am: > - The --with-pic configure option now supports a list of comma-separ= ated > package names. This can be used to build some static libraries wi= th PIC > objects while building others with non-PIC objects. > + - Added -shortname option to specify a short name for a DLL (OS/2 on= ly) Long options should start with --, not -, per GNU coding conventions (gcc is an exception, but libtool should not be). --=20 Eric Blake eblake@redhat.com +1-801-349-2682 Libvirt virtualization library http://libvirt.org --------------enig1CDE633BC93EBE63079E714C Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (GNU/Linux) Comment: Public key at http://people.redhat.com/eblake/eblake.gpg Comment: Using GnuPG with Fedora - http://enigmail.mozdev.org/ iQEcBAEBCAAGBQJNqEw5AAoJEKeha0olJ0NqnXoH/01f0ieg7Ek7dfOnF6H896Yv f6SU0VEezWOYtSPNlLzlXDwKsHCcSeNd6IeIpxwCaOhPZ4BEzNFV8tCDIfwAI9go kmuMv4el/9uLvBEcBrvF47G3SCKKNRBs3AuRN7g/4R3hU1HuOyKh5x1twh07Mjac 9CSO9AOaNCiX/oupwOr00OkZCyZqWGLn/KV9CFXhOk2s2OhE0M8sPhjt9WIGSztI aDCUcqXxyTarLDeZNgd2Wi2b1fasOAPKFH1lJ++E4uisnn4dWPyits4r4DvmcCuT 07970730U9kLoelG2WXkx8nBnbPj6o3B+6qtZ0qtxEW78gl3vv4OHOU+4wQVgY8= =LRuM -----END PGP SIGNATURE----- --------------enig1CDE633BC93EBE63079E714C-- From MAILER-DAEMON Fri Apr 15 14:24:25 2011 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1QAngv-0000TN-Ad for mharc-libtool-patches@gnu.org; Fri, 15 Apr 2011 14:24:25 -0400 Received: from eggs.gnu.org ([140.186.70.92]:57437) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QAngt-0000SP-Ja for libtool-patches@gnu.org; Fri, 15 Apr 2011 14:24:24 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QAngs-00079b-Pw for libtool-patches@gnu.org; Fri, 15 Apr 2011 14:24:23 -0400 Received: from mailout-de.gmx.net ([213.165.64.22]:42893) by eggs.gnu.org with smtp (Exim 4.71) (envelope-from ) id 1QAngs-00079V-Dq for libtool-patches@gnu.org; Fri, 15 Apr 2011 14:24:22 -0400 Received: (qmail invoked by alias); 15 Apr 2011 18:24:20 -0000 Received: from xdsl-89-0-191-27.netcologne.de (EHLO localhost.localdomain) [89.0.191.27] by mail.gmx.net (mp072) with SMTP; 15 Apr 2011 20:24:20 +0200 X-Authenticated: #13673931 X-Provags-ID: V01U2FsdGVkX1/9qLhsQ8T9WJw5LsZGaYgzkdy/kCCPYxmpn7IVEH le4fpFsjvQU53z Received: from ralf by localhost.localdomain with local (Exim 4.72) (envelope-from ) id 1QAngo-0002tE-9O; Fri, 15 Apr 2011 20:24:18 +0200 Date: Fri, 15 Apr 2011 20:24:18 +0200 From: Ralf Wildenhues To: Eric Blake Subject: Re: [PATCH 01/10] Add -shortname option. Message-ID: <20110415182418.GE10803@gmx.de> Mail-Followup-To: Eric Blake , KO Myung-Hun , libtool-patches@gnu.org References: <1302872363-133-1-git-send-email-komh@chollian.net> <1302872363-133-2-git-send-email-komh@chollian.net> <4DA84C39.5060100@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <4DA84C39.5060100@redhat.com> Organization: Institute for Numerical Simulation, University of Bonn User-Agent: Mutt/1.5.20 (2010-08-04) X-Y-GMX-Trusted: 0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 213.165.64.22 Cc: KO Myung-Hun , libtool-patches@gnu.org X-BeenThere: libtool-patches@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Patch submission list for the GNU libtool shared library maintenance tool List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 15 Apr 2011 18:24:24 -0000 Hello, * Eric Blake wrote on Fri, Apr 15, 2011 at 03:46:33PM CEST: > On 04/15/2011 06:59 AM, KO Myung-Hun wrote: > > OS/2 limits a length of a DLL base name up to 8 characters. If a name of > > a shared library is longer than 8 characters, OS/2 cannot load it. So the > > option to specify a short name is needed. > > --- a/NEWS > > +++ b/NEWS > > @@ -7,6 +7,7 @@ New in 2.4.2 2011-??-??: git version 2.4.1a, Libtool team: > > - The --with-pic configure option now supports a list of comma-separated > > package names. This can be used to build some static libraries with PIC > > objects while building others with non-PIC objects. > > + - Added -shortname option to specify a short name for a DLL (OS/2 only) > > Long options should start with --, not -, per GNU coding conventions > (gcc is an exception, but libtool should not be). libtool traditionally has been an exception too, however. I'm not sure it's worthwhile moving from that at this point. Other than that, sorry about my lack of review; now that the copyright issue has been pending-cleared I should put it higher up in my todo list ... Thanks, Ralf