From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Giorgos Keramidas Newsgroups: gmane.emacs.devel Subject: Re: utmp.h obsoleted in FreeBSD 9.0 Date: Sat, 23 Jan 2010 22:06:25 +0200 Message-ID: <874omctwla.fsf@kobe.laptop> References: <87ljfvqick.fsf@kobe.laptop> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha1; protocol="application/pgp-signature" X-Trace: ger.gmane.org 1264277225 26845 80.91.229.12 (23 Jan 2010 20:07:05 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sat, 23 Jan 2010 20:07:05 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sat Jan 23 21:06:57 2010 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([199.232.76.165]) by lo.gmane.org with esmtp (Exim 4.50) id 1NYmFt-0004uC-VI for ged-emacs-devel@m.gmane.org; Sat, 23 Jan 2010 21:06:50 +0100 Original-Received: from localhost ([127.0.0.1]:33415 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NYmFu-0005uC-Ti for ged-emacs-devel@m.gmane.org; Sat, 23 Jan 2010 15:06:50 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NYmFq-0005u7-JH for emacs-devel@gnu.org; Sat, 23 Jan 2010 15:06:46 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NYmFl-0005tk-5s for emacs-devel@gnu.org; Sat, 23 Jan 2010 15:06:45 -0500 Original-Received: from [199.232.76.173] (port=41002 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NYmFk-0005th-Uw for emacs-devel@gnu.org; Sat, 23 Jan 2010 15:06:41 -0500 Original-Received: from poseidon.ceid.upatras.gr ([150.140.141.169]:57224) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NYmFk-0003Qg-20 for emacs-devel@gnu.org; Sat, 23 Jan 2010 15:06:40 -0500 Original-Received: from mail.ceid.upatras.gr (unknown [10.1.0.143]) by poseidon.ceid.upatras.gr (Postfix) with ESMTP id 34EFAEB47FD for ; Sat, 23 Jan 2010 22:06:39 +0200 (EET) Original-Received: from localhost (europa.ceid.upatras.gr [127.0.0.1]) by mail.ceid.upatras.gr (Postfix) with ESMTP id 1CA91160C86 for ; Sat, 23 Jan 2010 22:06:39 +0200 (EET) X-Virus-Scanned: amavisd-new at ceid.upatras.gr Original-Received: from mail.ceid.upatras.gr ([127.0.0.1]) by localhost (europa.ceid.upatras.gr [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 8fRjze37z3R7 for ; Sat, 23 Jan 2010 22:06:38 +0200 (EET) Original-Received: from kobe.laptop (ppp-94-64-229-17.home.otenet.gr [94.64.229.17]) by mail.ceid.upatras.gr (Postfix) with ESMTP id B5616160C7C for ; Sat, 23 Jan 2010 22:06:38 +0200 (EET) Original-Received: from kobe.laptop (kobe.laptop [127.0.0.1]) by kobe.laptop (8.14.3/8.14.3) with ESMTP id o0NK6bHD004224 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Sat, 23 Jan 2010 22:06:37 +0200 (EET) (envelope-from keramida@ceid.upatras.gr) Original-Received: (from keramida@localhost) by kobe.laptop (8.14.3/8.14.3/Submit) id o0NK6a3V004219; Sat, 23 Jan 2010 22:06:36 +0200 (EET) (envelope-from keramida@ceid.upatras.gr) In-Reply-To: <87ljfvqick.fsf@kobe.laptop> (Giorgos Keramidas's message of "Mon, 18 Jan 2010 22:16:27 +0200") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.1.91 (berkeley-unix) X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 3) X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:120309 Archived-At: --=-=-= After running a patched Emacs build or a couple of days, I've submitted the patch below to the editors/emacs and editors/emacs-devel packages of FreeBSD. Since it's a good idea to keep the "local patches" as small and few as possible, does anyone from the list feel like pushing this to the bzr branch for the next pretest too? Regards, Giorgos On Mon, 18 Jan 2010 22:16:27 +0200, Giorgos Keramidas wrote: > Hi all, > > utmp.h has been removed from FreeBSD 9.0-CURRENT. This means Emacs from > trunk can no longer build on FreeBSD 9.X or newer because src/filelock.c > tries to include . > > The filelock.c code uses the sysctl interface in FreeBSD, so we don't > really need utmp.h to have a working Emacs version. So I patched > configure.in to check for availability of utmp.h and then filelock.c to > use HAVE_UTMP_H around the include statement. > > This seems to work fine, but before updating the packages of Emacs on > FreeBSD I thought I'd ask: does this seem like a reasonable fix? Should > we patch the Emacs trunk too? > > The following patch should apply cleanly on the bzr-trunk of Emacs at > revision lekktu@gmail.com-20100118044436-c8dozy11mbqky3qh > > Then 'configure' has to be regenerated too, and we should be set :-) > > %%% > === modified file 'ChangeLog' > --- ChangeLog 2010-01-13 08:35:10 +0000 > +++ ChangeLog 2010-01-18 20:12:39 +0000 > @@ -1,3 +1,8 @@ > +2010-01-18 Giorgos Keramidas (tiny change) > + > + * configure.in: Check for utmp.h availability, since some > + systems don't have one (e.g. FreeBSD 9.X and later versions). > + > 2010-01-12 Juanma Barranquero > > * .bzrignore: Ignore all .exe, instead of individual files. > > === modified file 'configure.in' > --- configure.in 2010-01-13 08:35:10 +0000 > +++ configure.in 2010-01-18 18:10:31 +0000 > @@ -1106,7 +1106,7 @@ > linux/version.h sys/systeminfo.h termios.h limits.h string.h stdlib.h \ > termcap.h stdio_ext.h fcntl.h strings.h coff.h pty.h sys/mman.h \ > sys/param.h sys/vlimit.h sys/resource.h locale.h sys/_mbstate_t.h \ > - sys/utsname.h pwd.h) > + sys/utsname.h pwd.h utmp.h) > > AC_MSG_CHECKING(if personality LINUX32 can be set) > AC_TRY_COMPILE([#include ], [personality (PER_LINUX32)], > > === modified file 'src/ChangeLog' > --- src/ChangeLog 2010-01-16 20:20:32 +0000 > +++ src/ChangeLog 2010-01-18 20:11:39 +0000 > @@ -1,3 +1,9 @@ > +2010-01-18 Giorgos Keramidas (tiny change) > + > + * filelock.c: Include utmp.h only when HAVE_UTMP_H is true, > + since some systems don't have one (e.g. FreeBSD 9.X and later > + versions). > + > 2010-01-16 Stefan Monnier > > * xterm.c (event_handler_gdk): Block input (Bug#5037). > > === modified file 'src/filelock.c' > --- src/filelock.c 2010-01-13 08:35:10 +0000 > +++ src/filelock.c 2010-01-18 20:09:52 +0000 > @@ -63,7 +63,9 @@ > > #ifdef CLASH_DETECTION > > +#ifdef HAVE_UTMP_H > #include > +#endif > > #if !defined (S_ISLNK) && defined (S_IFLNK) > #define S_ISLNK(m) (((m) & S_IFMT) == S_IFLNK) > > %%% --=-=-= Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.11 (FreeBSD) iEYEARECAAYFAktbVswACgkQ1g+UGjGGA7aQIgCgu/fK4dHanookicsc2hhRZfBr zToAn1J95eOzLtmRY60CgWQfYl8D5sfH =oKuS -----END PGP SIGNATURE----- --=-=-=--