* Ralf Wildenhues wrote on Fri, Nov 18, 2005 at 06:13:00PM CET:
>
> Interix support in Libtool:
Applied to branch-1-5 and HEAD, respectively.
Cheers,
Ralf
branch-1-5:
* tests/link-order.test [ aix, interix ]: Skip command line
grep.
Reported by Thorsten Glaser <[EMAIL PROTECTED]>.
Index: tests/link-order.test
===================================================================
RCS file: /cvsroot/libtool/libtool/tests/Attic/link-order.test,v
retrieving revision 1.1.2.1
diff -u -r1.1.2.1 link-order.test
--- tests/link-order.test 8 Apr 2005 15:17:28 -0000 1.1.2.1
+++ tests/link-order.test 18 Nov 2005 17:41:47 -0000
@@ -58,13 +58,18 @@
cat $srcdir/stderr >&2
done
-# Do not error if we do not relink (e.g. static-only systems)
-if $EGREP relinking $srcdir/stderr; then
- if $EGREP ' -L.*\/new\/lib -lb -L.*\/old\/lib -lcee' $srcdir/stdout; then :;
else
- echo "$0: wrong link order" 1>&2
- retcode=1
+case $host in
+*-*-aix* | *-*-interix*) ;; # These systems have different path syntax
+*)
+ # Do not error if we do not relink (e.g. static-only systems)
+ if $EGREP relinking $srcdir/stderr; then
+ if $EGREP ' -L.*\/new\/lib -lb -L.*\/old\/lib -lcee' $srcdir/stdout; then
:; else
+ echo "$0: wrong link order" 1>&2
+ retcode=1
+ fi
fi
-fi
+ ;;
+esac
for i in old new; do
cat >$srcdir/main_$i.c <<EOF
HEAD:
* tests/link-order.at [ interix ]: Skip command line grep.
* tests/deplibs-ident.at [ interix ]: Not broken here.
Reported by Thorsten Glaser <[EMAIL PROTECTED]>.
Index: tests/deplibs-ident.at
===================================================================
RCS file: /cvsroot/libtool/libtool/tests/deplibs-ident.at,v
retrieving revision 1.2
diff -u -r1.2 deplibs-ident.at
--- tests/deplibs-ident.at 14 Nov 2005 22:19:40 -0000 1.2
+++ tests/deplibs-ident.at 20 Nov 2005 08:14:36 -0000
@@ -58,7 +58,7 @@
AT_CHECK([$LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o b b.$OBJEXT
../liba1.la ../liba2.la ../liba3.la ../../c/libcee.la -rpath /nowhere],
[0],[stdout],[ignore])
AT_CHECK([$EGREP 'cee.*cee' stdout], 1, [ignore], [ignore])
- AT_XFAIL_IF([case $host_os in aix*) false;; *):;; esac])
+ AT_XFAIL_IF([case $host_os in aix*|interix*) false;; *):;; esac])
dnl This is currently broken in libtool
)
Index: tests/link-order.at
===================================================================
RCS file: /cvsroot/libtool/libtool/tests/link-order.at,v
retrieving revision 1.7
diff -u -r1.7 link-order.at
--- tests/link-order.at 5 Oct 2005 08:58:19 -0000 1.7
+++ tests/link-order.at 20 Nov 2005 08:14:36 -0000
@@ -64,7 +64,7 @@
$LIBTOOL --mode=clean rm -f src/liba.la
case $host_os in
-aix*) ;; # AIX has different path syntax
+aix* | interix*) ;; # These systems have different path syntax
*)
# Do not error if we do not relink (e.g. static-only systems)
AT_CHECK([if $EGREP relinking stderr; then
