solaris compile fixes
I would say this patch should pretty much explain itself. I see no reason why
it shouldn't be applied.
----BEGIN GEEK CODE BLOCK----
Version: 3.12
GCS d- s: a-- c+++ UL++++ P+ L++++ !E W+ M o+ K- W--- !O M- !V PS--
PE++ Y+ PGP++ t* 5++ X+ tv b+ D++ G e h*! !r z?
-----END GEEK CODE BLOCK-----
----BEGIN PGP INFO----
Adam Heath <doogie@debian.org> Finger Print | KeyID
67 01 42 93 CA 37 FB 1E 63 C9 80 1D 08 CF 84 0A | DE656B05 PGP
AD46 C888 F587 F8A3 A6DA 3261 8A2C 7DC2 8BD4 A489 | 8BD4A489 GPG
-----END PGP INFO-----
===
diff -ruN apt-0.3.15.orig/buildlib/configure.mak apt-0.3.15/buildlib/configure.mak
--- apt-0.3.15.orig/buildlib/configure.mak Sun Dec 6 00:06:19 1998
+++ apt-0.3.15/buildlib/configure.mak Thu Dec 9 11:09:44 1999
@@ -21,7 +21,7 @@
aclocal.m4:
aclocal -I buildlib
$(BUILDDIR)/config.status: configure
- test -e $(BUILDDIR) || mkdir $(BUILDDIR)
+ /usr/bin/test -e $(BUILDDIR) || mkdir $(BUILDDIR)
(HERE=`pwd`; cd $(BUILDDIR) && $$HERE/configure)
$(addprefix $(BUILDDIR)/,$(CONVERTED)):
(cd $(BUILDDIR) && ./config.status)
diff -ruN apt-0.3.15.orig/buildlib/tools.m4 apt-0.3.15/buildlib/tools.m4
--- apt-0.3.15.orig/buildlib/tools.m4 Mon Jul 13 00:05:53 1998
+++ apt-0.3.15/buildlib/tools.m4 Thu Dec 9 12:03:42 1999
@@ -102,7 +102,7 @@
fi
if test -n "$ac_tool_prefix" -a "`echo $CC | grep '$ac_tool_prefix'`" = "" \
-a "`echo $CC | grep -- '-b'`" = ""; then
- if test -z "$ac_cv_prog_CC_dir" && $CC -v 2>&1 | grep -q gcc; then
+ if test -z "$ac_cv_prog_CC_dir" && $CC -v 2>&1 | grep gcc >/dev/null 2>&1 ; then
AC_CACHE_CHECK([if $CC -b${ac_tool_dir} works], tl_cv_prog_cc_bhost,[
old_cc="${CC}"
CC="${CC} -b${ac_tool_dir}"
@@ -153,7 +153,7 @@
if test -n "$CXX"; then
if test -n "$ac_tool_prefix" -a "`echo $CXX | grep '$ac_tool_prefix'`" = "" \
-a "`echo $CXX | grep -- '-b'`" = ""; then
- if test -z "$ac_cv_prog_CXX_dir" && $CXX -v 2>&1 | grep -q gcc; then
+ if test -z "$ac_cv_prog_CXX_dir" && $CXX -v 2>&1 | grep gcc >/dev/null 2>&1; then
AC_CACHE_CHECK([if $CXX -b${ac_tool_dir} works], tl_cv_prog_cxx_bhost,[
old_cxx="${CXX}"
CXX="${CXX} -b${ac_tool_dir}"
diff -ruN apt-0.3.15.orig/configure.in apt-0.3.15/configure.in
--- apt-0.3.15.orig/configure.in Sat Dec 4 23:14:17 1999
+++ apt-0.3.15/configure.in Thu Dec 9 11:09:24 1999
@@ -70,7 +70,7 @@
dnl Converts the ARCH to be the same as dpkg
AC_MSG_CHECKING(system architecture)
-archset="`awk '$1 == "'$host_cpu'" { print $2 }' $srcdir/buildlib/archtable`"
+archset="`awk '$1 == \"$host_cpu\" { print $2 }' $srcdir/buildlib/archtable`"
if test "x$archset" = "x"; then
AC_MSG_ERROR(failed: use --host=)
fi
@@ -85,7 +85,7 @@
dnl Check the sizes etc. of the architecture
changequote(,)
-if archline="`sed -ne 's/^'$archset':[ ]\+\(.*\)/\1/gp' $srcdir/buildlib/sizetable`"; then
+if archline="`grep '^$archset' | cut -f 2- -d ' '`";then
changequote([,])
set $archline
if test "$1" = "little"; then
===
Reply to: