bug#1191: How to contribute back changes for Emacs on Solaris

[Ali Bahrami]

Dan Nicolaescu wrote:
> Ali Bahrami <ali_gnu@emvision.com> writes:
>
>   > Dan,
>   > 
>   >    I made the changes you suggested to the src/s/sol2-10.h. I
>   > pulled a copy of CVS head, and produced diffs for configure.in based
>   > on that. Both items are below, delimited by '=======' lines.
>
> Thanks, I checked this in, with some simplifications.
>
>   > =========================================================================
>   > *** configure.in.orig   Wed Oct 22 20:40:42 2008
>   > --- configure.in        Wed Oct 22 20:53:20 2008
>   > ***************
>   > *** 442,449 ****
>   >     ;;
>   > 
>   >     *-sun-solaris* \
>   > !     | i[3456]86-*-solaris2* | i[3456]86-*-sunos5* | powerpc*-*-solaris2* \
>   > !     | rs6000-*-solaris2*)
>   >       case "${canonical}" in
>   >         i[3456]86-*-* )     machine=intel386 ;;
>   >         amd64-*-*|x86_64-*-*)   machine=amdx86-64 ;;
>   > --- 442,450 ----
>   >     ;;
>   > 
>   >     *-sun-solaris* \
>   > !     | i[3456]86-*-solaris2* | i[3456]86-*-sunos5* \
>   > !     | x86_64-*-solaris2*    | x86_64-*-sunos5*    \
>   > !     | powerpc*-*-solaris2*  | rs6000-*-solaris2*)
>
> This hunk should not be necessary, *-sun-solaris* should match anyway.
> Please verify that things still work.

Dan,

   src/s/sol2-10.h is fine. There are some issues with the changes to
configure though.

The hunk you removed really is needed, at least the 'x86_64-*-solaris2*' part.
I put the 'x86_64-*-sunos5*' one in because it mirror how the 32-bit one
above is defined, but the 'x86_64-*-solaris2*' is needed to get a build.

The reason '*-sun-solaris*' isn't sufficient is that on X86
hardware, the "vendor" is not "sun":

    % ./config.guess
    i386-pc-solaris2.11
    % CC='gcc -m64' ./config.guess
    amd64-solaris2.11

There is a typo (missing ;; in a case statement), and the clause
for Solaris 7-9 fails because a bit got missed. I'm going to
show the part of the file I modified here, and mark the modified
lines with a '>' in column 1.

====================================================================

  *-sun-solaris* \
>   | i[3456]86-*-solaris2* | i[3456]86-*-sunos5* \
>   | x86_64-*-solaris2*    | x86_64-*-sunos5*    \
>   | powerpc*-*-solaris2*  | rs6000-*-solaris2*)
    case "${canonical}" in
      i[3456]86-*-* )     machine=intel386 ;;
      amd64-*-*|x86_64-*-*)     machine=amdx86-64 ;;
      powerpc* | rs6000* )  machine=ibmrs6000 ;;
      sparc* )          machine=sparc ;;
      * )               unported=yes ;;
    esac
    case "${canonical}" in
      *-sunos5.3* | *-solaris2.3* )
                opsys=sol2-3
                NON_GNU_CPP=/usr/ccs/lib/cpp
                ;;
      *-sunos5.4* | *-solaris2.4* )
                opsys=sol2-4
                NON_GNU_CPP=/usr/ccs/lib/cpp
                RANLIB="ar -ts"
                ;;
      *-sunos5.5* | *-solaris2.5* )
                opsys=sol2-5
                NON_GNU_CPP=/usr/ccs/lib/cpp
                RANLIB="ar -ts"
                ;;
      *-sunos5.6* | *-solaris2.6* )
                opsys=sol2-6
                NON_GNU_CPP=/usr/ccs/lib/cpp
                RANLIB="ar -ts"
                ;;
>     *-sunos5.[7-9]* | *-solaris2.[7-9]* )
                opsys=sol2-6
                emacs_check_sunpro_c=yes
                NON_GNU_CPP=/usr/ccs/lib/cpp
>            ;;
      *-sunos5* | *-solaris* )
====================================================================

Or expressed as diffs:

====================================================================
2555,2556c2555,2557
<     | i[3456]86-*-solaris2* | i[3456]86-*-sunos5* | powerpc*-*-solaris2* \
<     | rs6000-*-solaris2*)
---
>     | i[3456]86-*-solaris2* | i[3456]86-*-sunos5* \
>     | x86_64-*-solaris2*    | x86_64-*-sunos5*    \
>     | powerpc*-*-solaris2*  | rs6000-*-solaris2*)
2584c2585
<       *-sunos5.[7-9]* | *-solaris[7-9]* )
---
>       *-sunos5.[7-9]* | *-solaris2.[7-9]* )
2588c2589
<
---
>               ;;
====================================================================

Let me know and I'll retest. Thanks...

- Ali