From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Ali Bahrami Newsgroups: gmane.emacs.bugs Subject: bug#1191: How to contribute back changes for Emacs on Solaris Date: Thu, 23 Oct 2008 16:51:51 -0600 Message-ID: <49010007.2000607@emvision.com> References: <48F80A14.7010502@emvision.com> <200810170622.m9H6Mipv013865@mothra.ics.uci.edu> <48F8BD05.5010102@emvision.com> <200810172352.m9HNqwSb016244@mothra.ics.uci.edu> <48FAA706.2050806@emvision.com> <200810202229.m9KMTIjS025889@mothra.ics.uci.edu> <49001D97.3000602@emvision.com> <200810231935.m9NJZjZZ010299@mothra.ics.uci.edu> Reply-To: Ali Bahrami , 1191@emacsbugs.donarmstrong.com NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; format=flowed; charset=ISO-8859-1 Content-Transfer-Encoding: 7BIT X-Trace: ger.gmane.org 1224803426 4759 80.91.229.12 (23 Oct 2008 23:10:26 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Thu, 23 Oct 2008 23:10:26 +0000 (UTC) Cc: 1191@emacsbugs.donarmstrong.com To: Dan Nicolaescu Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Fri Oct 24 01:11:26 2008 connect(): Connection refused Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([199.232.76.165]) by lo.gmane.org with esmtp (Exim 4.50) id 1Kt9Ks-0006nD-D6 for geb-bug-gnu-emacs@m.gmane.org; Fri, 24 Oct 2008 01:11:23 +0200 Original-Received: from localhost ([127.0.0.1]:37437 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Kt9Jl-00016c-CR for geb-bug-gnu-emacs@m.gmane.org; Thu, 23 Oct 2008 19:10:13 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Kt9Jh-00016W-PL for bug-gnu-emacs@gnu.org; Thu, 23 Oct 2008 19:10:09 -0400 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1Kt9Jf-000164-L8 for bug-gnu-emacs@gnu.org; Thu, 23 Oct 2008 19:10:09 -0400 Original-Received: from [199.232.76.173] (port=40069 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Kt9Jf-00015w-Hz for bug-gnu-emacs@gnu.org; Thu, 23 Oct 2008 19:10:07 -0400 Original-Received: from rzlab.ucr.edu ([138.23.92.77]:42319) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1Kt9Je-00048u-DA for bug-gnu-emacs@gnu.org; Thu, 23 Oct 2008 19:10:07 -0400 Original-Received: from rzlab.ucr.edu (rzlab.ucr.edu [127.0.0.1]) by rzlab.ucr.edu (8.13.8/8.13.8/Debian-3) with ESMTP id m9NNA1KF018362; Thu, 23 Oct 2008 16:10:02 -0700 Original-Received: (from debbugs@localhost) by rzlab.ucr.edu (8.13.8/8.13.8/Submit) id m9NN03Ge015135; Thu, 23 Oct 2008 16:00:03 -0700 X-Loop: don@donarmstrong.com Resent-From: Ali Bahrami Original-Sender: Ali.Bahrami@Sun.COM Resent-To: bug-submit-list@donarmstrong.com Resent-CC: Emacs Bugs Resent-Date: Thu, 23 Oct 2008 23:00:03 +0000 Resent-Message-ID: Resent-Sender: don@donarmstrong.com X-Emacs-PR-Message: report 1191 X-Emacs-PR-Package: emacs X-Emacs-PR-Keywords: Original-Received: via spool by 1191-submit@emacsbugs.donarmstrong.com id=B1191.122480231713912 (code B ref 1191); Thu, 23 Oct 2008 23:00:03 +0000 Original-Received: (at 1191) by emacsbugs.donarmstrong.com; 23 Oct 2008 22:51:57 +0000 Original-Received: from brmea-mail-1.sun.com (brmea-mail-1.Sun.COM [192.18.98.31]) by rzlab.ucr.edu (8.13.8/8.13.8/Debian-3) with ESMTP id m9NMpruL013906 for <1191@emacsbugs.donarmstrong.com>; Thu, 23 Oct 2008 15:51:54 -0700 Original-Received: from fe-amer-10.sun.com ([192.18.109.80]) by brmea-mail-1.sun.com (8.13.6+Sun/8.12.9) with ESMTP id m9NMppRr009373 for <1191@emacsbugs.donarmstrong.com>; Thu, 23 Oct 2008 22:51:52 GMT Original-Received: from conversion-daemon.mail-amer.sun.com by mail-amer.sun.com (Sun Java System Messaging Server 6.2-8.04 (built Feb 28 2007)) id <0K9700601RF63M00@mail-amer.sun.com> (original mail from ali_gnu@emvision.com) for 1191@emacsbugs.donarmstrong.com; Thu, 23 Oct 2008 16:51:51 -0600 (MDT) Original-Received: from [172.20.25.67] by mail-amer.sun.com (Sun Java System Messaging Server 6.2-8.04 (built Feb 28 2007)) with ESMTPSA id <0K9700F5RRIFYD50@mail-amer.sun.com>; Thu, 23 Oct 2008 16:51:51 -0600 (MDT) In-reply-to: <200810231935.m9NJZjZZ010299@mothra.ics.uci.edu> User-Agent: Thunderbird 2.0.0.16 (X11/20080922) X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 3) Resent-Date: Thu, 23 Oct 2008 19:10:09 -0400 X-BeenThere: bug-gnu-emacs@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.bugs:21847 Archived-At: Dan Nicolaescu wrote: > Ali Bahrami 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