Portability fixes found needed for SunOS 4.1.x:

SunOS has tas(), but not memmove or strerror, and its sprintf() doesn't
return int.  Also, older versions of GNU Make don't like rules with
empty left-hand sides...

diff --git a/src/Makefile.shlib b/src/Makefile.shlib
index d1cf4390e2101b65d485585d48de021c5a469d5c..d6d864e3e49371c8c963df06945f5d93bb983fa5 100644 (file)
--- a/src/Makefile.shlib
+++ b/src/Makefile.shlib
@@ -171,8 +171,10 @@ else
 endif
        $(RANLIB) $@
 
+ifneq ($(shlib),)
 $(shlib): $(OBJS)
        $(LD) $(LDFLAGS_SL) -o $@ $(OBJS) $(SHLIB_LINK)
+endif
 
 # Rules to install regular and shared libraries
 

diff --git a/src/bin/psql/Makefile.in b/src/bin/psql/Makefile.in
index 6f3e39e9edf8faa431abb6bf8c65daf059a517fb..20639e3f85c121a09a9e12810db63c735c2d0e74 100644 (file)
--- a/src/bin/psql/Makefile.in
+++ b/src/bin/psql/Makefile.in
@@ -28,7 +28,7 @@ ifdef MULTIBYTE
 CFLAGS+= $(MBFLAGS)
 endif
 
-OBJS= psql.o stringutils.o @STRDUP@ 
+OBJS= psql.o stringutils.o @STRDUP@ @STRERROR2@
 
 all: submake psql
 

diff --git a/src/include/port/sunos4.h b/src/include/port/sunos4.h
index f08580cfafc2201a5927ca00bf69a037e8a511fb..e9c0ec29d44f30cfa44f29ab99916377df7c6d6d 100644 (file)
--- a/src/include/port/sunos4.h
+++ b/src/include/port/sunos4.h
@@ -1,4 +1,9 @@
 #define USE_POSIX_TIME
+#define HAS_TEST_AND_SET
+typedef unsigned char slock_t;
+
+/* sprintf() returns char *, not int, on SunOS 4.1.x */
+#define SPRINTF_CHAR
 
 #ifndef                        BIG_ENDIAN
 #define                        BIG_ENDIAN              4321

diff --git a/src/include/regex/utils.h b/src/include/regex/utils.h
index e6f169065fb599ffddb775ab7a8682f778464db1..de36c6ffb5623a5ab097aae1b93ed2b167e77f29 100644 (file)
--- a/src/include/regex/utils.h
+++ b/src/include/regex/utils.h
@@ -58,6 +58,6 @@ typedef unsigned char uch;
 #endif
 
 /* for old systems with bcopy() but no memmove() */
-#if !defined(HAVE_MEMMOVE)
+#if !defined(HAVE_MEMMOVE) && !defined(memmove)
 #define memmove(d, s, c)               bcopy(s, d, c)
 #endif