<div dir="ltr"><br><div class="gmail_extra"><br><div class="gmail_quote">On Sun, Nov 5, 2017 at 1:38 AM, Alan Coopersmith <span dir="ltr"><<a href="mailto:alan.coopersmith@oracle.com" target="_blank">alan.coopersmith@oracle.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">I believe this patch should not break you, and should in fact make it easier for<br>
you to decide whether or not to follow our lead in reverting from the SysV man<br>
page sections to the classic Bell Labs/BSD ones that everyone else uses, but I've only tested on Solaris 11.3 & 11.4, not OI or any other illumos distros,<br>
so let me know if it breaks for you.<br>
<br>
It should apply to the upstream git repo from<br>
git://<a href="http://anongit.freedesktop.org/xorg/util/macros" rel="noreferrer" target="_blank">anongit.freedesktop.org/<wbr>xorg/util/macros</a><br>
which OI packages via <a href="https://github.com/OpenIndiana/oi-userland/tree/oi/hipster/components/x11/util-macros" rel="noreferrer" target="_blank">https://github.com/OpenIndiana<wbr>/oi-userland/tree/oi/hipster/<wbr>components/x11/util-macros</a><span class="HOEnZb"><font color="#888888"><br></font></span></blockquote><div><br></div><div>Thank you Alan for the heads-up, I will test next week.<br></div><div>Kind regards<br><br></div><div>Aurelien<br></div><div><br> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><span class="HOEnZb"><font color="#888888">
<br>
-alan-<br>
</font></span><br><br>---------- Forwarded message ----------<br>From: Alan Coopersmith <<a href="mailto:alan.coopersmith@oracle.com">alan.coopersmith@oracle.com</a>><br>To: <a href="mailto:xorg-devel@lists.x.org">xorg-devel@lists.x.org</a><br>Cc: <br>Bcc: <br>Date: Sat, 4 Nov 2017 17:33:56 -0700<br>Subject: [PATCH:macros] Update check for manpage section numbers to not rely on Solaris version<br>Check for a specific file instead of a specific set of versions from<br>
uname, to cope with manpage section alignment coming to 11.4 instead<br>
of 12.0.<br>
<br>
Signed-off-by: Alan Coopersmith <<a href="mailto:alan.coopersmith@oracle.com">alan.coopersmith@oracle.com</a>><br>
---<br>
<a href="http://xorg-macros.m4.in" rel="noreferrer" target="_blank">xorg-macros.m4.in</a> | 31 +++++++++++++++++++-----------<wbr>-<br>
1 file changed, 19 insertions(+), 12 deletions(-)<br>
<br>
diff --git a/<a href="http://xorg-macros.m4.in" rel="noreferrer" target="_blank">xorg-macros.m4.in</a> b/<a href="http://xorg-macros.m4.in" rel="noreferrer" target="_blank">xorg-macros.m4.in</a><br>
index 7935426..efce888 100644<br>
--- a/<a href="http://xorg-macros.m4.in" rel="noreferrer" target="_blank">xorg-macros.m4.in</a><br>
+++ b/<a href="http://xorg-macros.m4.in" rel="noreferrer" target="_blank">xorg-macros.m4.in</a><br>
@@ -114,6 +114,17 @@ AC_DEFUN([XORG_MANPAGE_<wbr>SECTIONS],[<br>
AC_REQUIRE([AC_CANONICAL_HOST]<wbr>)<br>
AC_REQUIRE([AC_PROG_SED])<br>
<br>
+case $host_os in<br>
+ solaris*)<br>
+ # Solaris 2.0 - 11.3 use SysV man page section numbers, so we<br>
+ # check for a man page file found in later versions that use<br>
+ # traditional section numbers instead<br>
+ AC_CHECK_FILE([/usr/share/man/<wbr>man7/attributes.7],<br>
+ [SYSV_MAN_SECTIONS=false], [SYSV_MAN_SECTIONS=true])<br>
+ ;;<br>
+ *) SYSV_MAN_SECTIONS=false ;;<br>
+esac<br>
+<br>
if test x$APP_MAN_SUFFIX = x ; then<br>
APP_MAN_SUFFIX=1<br>
fi<br>
@@ -129,9 +140,8 @@ if test x$LIB_MAN_DIR = x ; then<br>
fi<br>
<br>
if test x$FILE_MAN_SUFFIX = x ; then<br>
- case $host_os in<br>
- # Solaris 2.0 - 11 use SysV man page sections<br>
- solaris2.?|solaris2.1[[01]]) FILE_MAN_SUFFIX=4 ;;<br>
+ case $SYSV_MAN_SECTIONS in<br>
+ true) FILE_MAN_SUFFIX=4 ;;<br>
*) FILE_MAN_SUFFIX=5 ;;<br>
esac<br>
fi<br>
@@ -140,9 +150,8 @@ if test x$FILE_MAN_DIR = x ; then<br>
fi<br>
<br>
if test x$MISC_MAN_SUFFIX = x ; then<br>
- case $host_os in<br>
- # Solaris 2.0 - 11 use SysV man page sections<br>
- solaris2.?|solaris2.1[[01]]) MISC_MAN_SUFFIX=5 ;;<br>
+ case $SYSV_MAN_SECTIONS in<br>
+ true) MISC_MAN_SUFFIX=5 ;;<br>
*) MISC_MAN_SUFFIX=7 ;;<br>
esac<br>
fi<br>
@@ -151,9 +160,8 @@ if test x$MISC_MAN_DIR = x ; then<br>
fi<br>
<br>
if test x$DRIVER_MAN_SUFFIX = x ; then<br>
- case $host_os in<br>
- # Solaris 2.0 - 11 use SysV man page sections<br>
- solaris2.?|solaris2.1[[01]]) DRIVER_MAN_SUFFIX=7 ;;<br>
+ case $SYSV_MAN_SECTIONS in<br>
+ true) DRIVER_MAN_SUFFIX=7 ;;<br>
*) DRIVER_MAN_SUFFIX=4 ;;<br>
esac<br>
fi<br>
@@ -162,9 +170,8 @@ if test x$DRIVER_MAN_DIR = x ; then<br>
fi<br>
<br>
if test x$ADMIN_MAN_SUFFIX = x ; then<br>
- case $host_os in<br>
- # Solaris 2.0 - 11 use SysV man page sections<br>
- solaris2.?|solaris2.1[[01]]) ADMIN_MAN_SUFFIX=1m ;;<br>
+ case $SYSV_MAN_SECTIONS in<br>
+ true) ADMIN_MAN_SUFFIX=1m ;;<br>
*) ADMIN_MAN_SUFFIX=8 ;;<br>
esac<br>
fi<br>
--<br>
2.13.0<br>
<br>
______________________________<wbr>_________________<br>
<a href="mailto:xorg-devel@lists.x.org">xorg-devel@lists.x.org</a>: X.Org development<br>
Archives: <a href="http://lists.x.org/archives/xorg-devel" rel="noreferrer" target="_blank">http://lists.x.org/archives/<wbr>xorg-devel</a><br>
Info: <a href="https://lists.x.org/mailman/listinfo/xorg-devel" rel="noreferrer" target="_blank">https://lists.x.org/mailman/<wbr>listinfo/xorg-devel</a><br>______________________________<wbr>_________________<br>
oi-dev mailing list<br>
<a href="mailto:oi-dev@openindiana.org">oi-dev@openindiana.org</a><br>
<a href="https://openindiana.org/mailman/listinfo/oi-dev" rel="noreferrer" target="_blank">https://openindiana.org/<wbr>mailman/listinfo/oi-dev</a><br></blockquote></div><br><br clear="all"><br>-- <br><div class="gmail_signature" data-smartmail="gmail_signature"><div dir="ltr"><div><div dir="ltr"><font style="font-family:courier new,monospace" size="1">---<br>Praise the Caffeine embeddings<br></font></div></div></div></div>
</div></div>