Building on __sun, was: Re: mdocml-1.12.2 release announcement

[Ingo Schwarze <schwarze@usta.de>]

Hi Thomas,

Thomas Klausner wrote on Sun, Oct 06, 2013 at 01:32:25PM +0200:

> Since pkgsrc has been upgraded, we also have SunOS testing now :)
> It fails due to missing endian.h, details at
> http://us-east.manta.joyent.com/pkgsrc/public/reports/upstream-trunk32/20131005.2027/mdocml-1.12.2/build.log

Oh boy.  That's not even a 1.12.2 regression, it's a 1.12.1 regression,
so nobody on __sun notived for one and a half years.

Can you try this, please?

I pulled a tree from git://github.com/illumos/illumos-gate.git
and according to what i see in there, it ought to work,
but i can't really test compilation on __sun ...

Thank you,
  Ingo


Index: apropos_db.c
===================================================================
RCS file: /usr/vhosts/mdocml.bsd.lv/cvs/mdocml/Attic/apropos_db.c,v
retrieving revision 1.32.2.2
diff -u -p -r1.32.2.2 apropos_db.c
--- apropos_db.c	5 Oct 2013 20:30:05 -0000	1.32.2.2
+++ apropos_db.c	6 Oct 2013 15:25:29 -0000
@@ -30,14 +30,19 @@
 #include <string.h>
 #include <unistd.h>
 
-#if defined(__linux__)
-# include <endian.h>
-# include <db_185.h>
-#elif defined(__APPLE__)
+#if defined(__APPLE__)
 # include <libkern/OSByteOrder.h>
-# include <db.h>
+#elif defined(__linux__)
+# include <endian.h>
+#elif defined(__sun)
+# include <sys/byteorder.h>
 #else
 # include <sys/endian.h>
+#endif
+
+#if defined(__linux__)
+# include <db_185.h>
+#else
 # include <db.h>
 #endif
 
Index: config.h.post
===================================================================
RCS file: /usr/vhosts/mdocml.bsd.lv/cvs/mdocml/config.h.post,v
retrieving revision 1.6.2.2
diff -u -p -r1.6.2.2 config.h.post
--- config.h.post	3 Oct 2013 00:46:36 -0000	1.6.2.2
+++ config.h.post	6 Oct 2013 15:25:29 -0000
@@ -19,6 +19,9 @@
 #  if defined(__APPLE__)
 #    define betoh64(x) OSSwapBigToHostInt64(x)
 #    define htobe64(x) OSSwapHostToBigInt64(x)
+#  elif defined(__sun)
+#    define betoh64(x) BE_64(x)
+#    define htobe64(x) BE_64(x)
 #  else
 #    define betoh64(x) be64toh(x)
 #  endif
Index: mandocdb.c
===================================================================
RCS file: /usr/vhosts/mdocml.bsd.lv/cvs/mdocml/mandocdb.c,v
retrieving revision 1.49.2.8
diff -u -p -r1.49.2.8 mandocdb.c
--- mandocdb.c	5 Oct 2013 20:30:05 -0000	1.49.2.8
+++ mandocdb.c	6 Oct 2013 15:25:34 -0000
@@ -34,19 +34,21 @@
 #include <string.h>
 #include <unistd.h>
 
-#if defined(__linux__) || defined(__sun)
-# include <endian.h>
-# include <db_185.h>
-#elif defined(__APPLE__)
+#if defined(__APPLE__)
 # include <libkern/OSByteOrder.h>
-# include <db.h>
+#elif defined(__linux__)
+# include <endian.h>
+#elif defined(__sun)
+# include <sys/byteorder.h>
+# include <sys/stat.h>
 #else
 # include <sys/endian.h>
-# include <db.h>
 #endif
 
-#if defined(__sun)
-#include <sys/stat.h>
+#if defined(__linux__)
+# include <db_185.h>
+#else
+# include <db.h>
 #endif
 
 #include "man.h"
--
 To unsubscribe send an email to discuss+unsubscribe@mdocml.bsd.lv