[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Minor patches for OS/2
From: |
Andreas Buening |
Subject: |
Minor patches for OS/2 |
Date: |
Tue, 06 Apr 2004 21:41:11 +0200 |
Hello!
I've played around with the autoconf testsuite and found some
(very) minor bugs/possible problems.
AFAIK autoconf puts SHELL = /bin/sh (or even $CONFIG_SHELL) into
all Makefiles. But when it tests for a working make it doesn't.
On non-Unix platform there might be no /bin/sh or make might use
a different non-sh-compatible shell by default which has a different
'echo' or quoting syntax.
lib/autoconf/programs.m4:
--------------------------
--- old/autoconf-2.59/lib/autoconf/programs.m4 Thu May 22 12:05:12 2003
+++ gnu/autoconf-2.59/lib/autoconf/programs.m4 Sun Apr 4 18:08:46 2004
@@ -463,6 +463,7 @@
set dummy ${MAKE-make}; ac_make=`echo "$[2]" | sed 'y,:./+-,___p_,'`
AC_CACHE_VAL(ac_cv_prog_make_${ac_make}_set,
[cat >conftest.make <<\_ACEOF
+SHELL = ${CONFIG_SHELL-/bin/sh}
all:
@echo 'ac_maketemp="$(MAKE)"'
_ACEOF
--------------------------
Use 'diff -a' when possible for systems where linefeed != "\n".
On OS/2-emx /dev/null is writeonly. I hope the following changes
won't affect anything else.
lib/autotest/general.m4:
-------------------------------
--- old/autoconf-2.59/lib/autotest/general.m4 Fri Sep 26 08:14:18 2003
+++ gnu/autoconf-2.59/lib/autotest/general.m4 Tue Apr 6 20:59:30 2004
@@ -566,7 +566,8 @@
at_devnull=/dev/null
else
at_devnull=$at_suite_dir/devnull
- cp /dev/null $at_devnull
+ cp /dev/null $at_devnull 2>/dev/null
+ test -f $at_devnull || touch $at_devnull
fi
# Use `diff -u' when possible.
@@ -575,7 +576,10 @@
else
at_diff=diff
fi
-
+# Use 'diff -a' when possible
+if $at_diff -a $at_devnull $at_devnull >/dev/null 2>&1; then
+ at_diff="$at_diff -a"
+fi
for at_group in $at_groups
do
-------------------------------
bin/autoupdate.in:
-------------------------------
--- old/autoconf-2.59/bin/autoupdate.in Wed Aug 27 11:26:32 2003
+++ gnu/autoconf-2.59/bin/autoupdate.in Sun Apr 4 16:17:14 2004
@@ -174,7 +174,7 @@
my $macros = new Autom4te::XFile ("$autoconf"
. " --trace AU_DEFUN:'AU:\$f:\$1'"
. " --trace define:'AC:\$f:\$1'"
- . " --melt /dev/null |");
+ . " --melt |");
while ($_ = $macros->getline)
{
chomp;
@@ -252,7 +252,7 @@
# au.m4 -- definitions the AU macros.
xsystem ("$autoconf --trace AU_DEFUN:'_au_defun(\@<:address@hidden@:>\@,
-\@<:address@hidden@:>\@)' --melt /dev/null "
+\@<:address@hidden@:>\@)' --melt "
. ">$tmp/au.m4");
-------------------------------
ChangeLog:
2004-04-06 Andreas Buening <address@hidden>
* lib/autoconf/programs.m4: Use $CONFIG_SHELL in AC_PROG_MAKE_SET
* support for systems where /dev/null is writeonly.
* use 'diff -a' for the testsuite when possible.
The testsuite fails if config.site prints anything to stdout.
Test 3 of the testsuite fails due to a non-existing problem:
tests/testsuite.dir/003/testsuite.log:
--------------------------------
3. tools.at:118: testing ...
tools.at:126: autom4te --language=m4sugar script.4s -o script
tools.at:134: autom4te --language=m4sugar script.4s -o script
stderr:
script.4s:1: E:/usr/bin/m4.exe: Cannot open foo: No such file or directory
autom4te: E:/usr/bin/m4.exe failed with exit status: 1
tools.at:134: sed -e 's,^\([^:]*\): *\([0-9][0-9]*\): *[^:]*m4: ,m4: \1: \2: ,'
\
-e 's,^[^:]*m4: *\([^:]*\): *\([0-9][0-9]*\): ,m4: \1: \2: ,' \
-e 's/^autom4te: [^ ]*m4 /autom4te: m4 /' \
-e 's/^autom4te: [^ ]*m4.exe /autom4te: m4 /' \
-e 's/ (E[A-Z]*)$//' \
stderr
--- - Thu Jan 1 00:00:00 1970
+++ /Development/gnu/autoconf-2.59/tests/testsuite.dir/at-stdout Sun Apr
4 18:32:28 2004
@@ -1,3 +1,3 @@
-m4: script.4s: 1: Cannot open foo: No such file or directory
+script.4s:1: E:/usr/bin/m4.exe: Cannot open foo: No such file or directory
autom4te: m4 failed with exit status: 1
3. tools.at:118: 3. autom4te cache (tools.at:118): FAILED (tools.at:134)
--------------------------------
Test 79 of the testsuite fails because a different object file
extension is expected but I don't know where to change this:
tests/testsuite.dir/079/testsuite.log:
--------------------------------
79. semantics.at:128: testing config.libobjs...
[...]
semantics.at:149: sed 's/ */ /g;s/^ //;s/ $//' config.libobjs
--- - Thu Jan 1 00:00:00 1970
+++ /Development/gnu/autoconf-2.59/tests/testsuite.dir/at-stdout Sun Apr
4 20:41:38 2004
@@ -1,2 +1,2 @@
-autoconf_ftnirp$U.o
+autoconf_ftnirp$U.obj
79. semantics.at:128: 79. AC_REPLACE_FUNCS (semantics.at:128): FAILED
(semantics.at:149)
--------------------------------
Bye,
Andreas
- Minor patches for OS/2,
Andreas Buening <=