Re: Support for Interix 5.2 and 6.0?

[Ralf Wildenhues]

[ moving from the libtool to the libtool-patches list ]

Hello Martin, all,

* Martin Koeppe wrote on Thu, Mar 15, 2007 at 08:58:11PM CET:
> >>
> >>So please consider doing s/interix3/interix/ on libtool.m4 before 
> >>releasing 1.5.23.

I've applied the following patches to HEAD and branch-1-5, respectively.

Cheers,
Ralf


2007-03-18  Ralf Wildenhues  <address@hidden>

        * libltdl/m4/libtool.m4 (_LT_SYS_DYNAMIC_LINKER)
        (_LT_CHECK_MAGIC_METHOD, _LT_COMPILER_PIC, _LT_LINKER_SHLIBS)
        (_LT_LANG_CXX_CONFIG, _LT_SYS_HIDDEN_LIBDEPS) [ interix ]: When
        matching for interix, accept version range [3-9] instead of 3.
        * NEWS: Update.
        Report by Martin Koeppe <address@hidden>.

Index: NEWS
===================================================================
RCS file: /cvsroot/libtool/libtool/NEWS,v
retrieving revision 1.200
diff -u -r1.200 NEWS
--- NEWS        27 Feb 2007 22:15:45 -0000      1.200
+++ NEWS        18 Mar 2007 18:05:38 -0000
@@ -76,7 +76,7 @@
   - Basic support for PIE (position-independent executables).
   - Support for DragonFly BSD, improved support for FreeBSD.
   - Improved support for GNU/kFreeBSD and GNU/NetBSD.
-  - Support for Interix 3 (Windows SFU).
+  - Support for Interix 3 (Windows SFU) and newer versions.
   - Improved support for UnixWare.
   - Initial support for RDOS.
   - Initial Support for FC (modern Fortran).
Index: libltdl/m4/libtool.m4
===================================================================
RCS file: /cvsroot/libtool/libtool/libltdl/m4/libtool.m4,v
retrieving revision 1.99
diff -u -r1.99 libtool.m4
--- libltdl/m4/libtool.m4       18 Mar 2007 17:40:35 -0000      1.99
+++ libltdl/m4/libtool.m4       18 Mar 2007 18:05:41 -0000
@@ -2251,7 +2251,7 @@
   postinstall_cmds='chmod 555 $lib'
   ;;
 
-interix3*)
+interix[[3-9]]*)
   version_type=linux
   need_lib_prefix=no
   need_version=no
@@ -2903,7 +2903,7 @@
   esac
   ;;
 
-interix3*)
+interix[[3-9]]*)
   # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here
   lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|\.a)$'
   ;;
@@ -3424,7 +3424,7 @@
       # DJGPP does not support shared libraries at all
       _LT_TAGVAR(lt_prog_compiler_pic, $1)=
       ;;
-    interix3*)
+    interix[[3-9]]*)
       # Interix 3.x gcc -fpic/-fPIC options generate broken code.
       # Instead, we relocate shared libraries at runtime.
       ;;
@@ -3731,7 +3731,7 @@
       esac
       ;;
 
-    interix3*)
+    interix[[3-9]]*)
       # Interix 3.x gcc -fpic/-fPIC options generate broken code.
       # Instead, we relocate shared libraries at runtime.
       ;;
@@ -4154,7 +4154,7 @@
       fi
       ;;
 
-    interix3*)
+    interix[[3-9]]*)
       _LT_TAGVAR(hardcode_direct, $1)=no
       _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
       _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
@@ -5704,7 +5704,7 @@
         esac
         ;;
 
-      interix3*)
+      interix[[3-9]]*)
        _LT_TAGVAR(hardcode_direct, $1)=no
        _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
@@ -6375,7 +6375,7 @@
 # PORTME: override above test on systems where it is broken
 m4_if([$1], [CXX],
 [case $host_os in
-interix3*)
+interix[[3-9]]*)
   # Interix 3.5 installs completely hosed .la files for C++, so rather than
   # hack all around it, let's just trust "g++" to DTRT.
   _LT_TAGVAR(predep_objects,$1)=



2007-03-18  Ralf Wildenhues  <address@hidden>

        * libtool.m4 (AC_LIBTOOL_SYS_DYNAMIC_LINKER)
        (AC_DEPLIBS_CHECK_METHOD, _LT_AC_LANG_CXX_CONFIG)
        (AC_LIBTOOL_POSTDEP_PREDEP, AC_LIBTOOL_PROG_COMPILER_PIC)
        (AC_LIBTOOL_PROG_LD_SHLIBS) [ interix ]: When matching for
        interix, accept version range [3-9] instead of 3.
        * NEWS: Update.
        Report by Martin Koeppe <address@hidden>.

Index: NEWS
===================================================================
RCS file: /cvsroot/libtool/libtool/NEWS,v
retrieving revision 1.109.2.54
diff -u -r1.109.2.54 NEWS
--- NEWS        17 Feb 2007 09:43:36 -0000      1.109.2.54
+++ NEWS        18 Mar 2007 18:03:27 -0000
@@ -1,6 +1,7 @@
 NEWS - list of user-visible changes between releases of GNU Libtool
 
 New in 1.5.23c: 2007-??-??; CVS version 1.5.23c, Libtool team:
+* Initial support for Interix newer than version 3.
 * Bug Fixes.
 
 New in 1.5.23b: 2007-02-17; CVS version 1.5.23a, Libtool team:
Index: libtool.m4
===================================================================
RCS file: /cvsroot/libtool/libtool/Attic/libtool.m4,v
retrieving revision 1.314.2.173
diff -u -r1.314.2.173 libtool.m4
--- libtool.m4  17 Feb 2007 09:08:46 -0000      1.314.2.173
+++ libtool.m4  18 Mar 2007 18:03:30 -0000
@@ -1546,7 +1546,7 @@
   postinstall_cmds='chmod 555 $lib'
   ;;
 
-interix3*)
+interix[[3-9]]*)
   version_type=linux
   need_lib_prefix=no
   need_version=no
@@ -2384,7 +2384,7 @@
   esac
   ;;
 
-interix3*)
+interix[[3-9]]*)
   # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here
   lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|\.a)$'
   ;;
@@ -3277,7 +3277,7 @@
        ;;
     esac
     ;;
-  interix3*)
+  interix[[3-9]]*)
     _LT_AC_TAGVAR(hardcode_direct, $1)=no
     _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
     _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
@@ -3932,7 +3932,7 @@
 # PORTME: override above test on systems where it is broken
 ifelse([$1],[CXX],
 [case $host_os in
-interix3*)
+interix[[3-9]]*)
   # Interix 3.5 installs completely hosed .la files for C++, so rather than
   # hack all around it, let's just trust "g++" to DTRT.
   _LT_AC_TAGVAR(predep_objects,$1)=
@@ -4966,7 +4966,7 @@
       # DJGPP does not support shared libraries at all
       _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
       ;;
-    interix3*)
+    interix[[3-9]]*)
       # Interix 3.x gcc -fpic/-fPIC options generate broken code.
       # Instead, we relocate shared libraries at runtime.
       ;;
@@ -5248,7 +5248,7 @@
       _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
       ;;
 
-    interix3*)
+    interix[[3-9]]*)
       # Interix 3.x gcc -fpic/-fPIC options generate broken code.
       # Instead, we relocate shared libraries at runtime.
       ;;
@@ -5656,7 +5656,7 @@
       fi
       ;;
 
-    interix3*)
+    interix[[3-9]]*)
       _LT_AC_TAGVAR(hardcode_direct, $1)=no
       _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
       _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'