From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED.blaine.gmane.org!not-for-mail From: Paul Eggert Newsgroups: gmane.emacs.devel Subject: Re: master 7555f93: Remove src/macuvs.h from Git repository Date: Fri, 21 Jun 2019 16:33:19 -0700 Organization: UCLA Computer Science Department Message-ID: References: <20190621220118.16051.70712@vcs0.savannah.gnu.org> <20190621220121.8B68D209DE@vcs0.savannah.gnu.org> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="------------8A75C439BEB99193CB3E38DA" Injection-Info: blaine.gmane.org; posting-host="blaine.gmane.org:195.159.176.226"; logging-data="257598"; mail-complaints-to="usenet@blaine.gmane.org" User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.7.0 Cc: emacs-devel@gnu.org To: Glenn Morris Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sat Jun 22 01:33:57 2019 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([209.51.188.17]) by blaine.gmane.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.89) (envelope-from ) id 1heT2Z-0014tw-Vj for ged-emacs-devel@m.gmane.org; Sat, 22 Jun 2019 01:33:56 +0200 Original-Received: from localhost ([::1]:38428 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1heT2Z-0007Cp-11 for ged-emacs-devel@m.gmane.org; Fri, 21 Jun 2019 19:33:55 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:39055) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1heT28-0007CX-3d for emacs-devel@gnu.org; Fri, 21 Jun 2019 19:33:29 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1heT27-0005Qb-3u for emacs-devel@gnu.org; Fri, 21 Jun 2019 19:33:28 -0400 Original-Received: from zimbra.cs.ucla.edu ([131.179.128.68]:42678) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1heT26-0005PS-R7; Fri, 21 Jun 2019 19:33:27 -0400 Original-Received: from localhost (localhost [127.0.0.1]) by zimbra.cs.ucla.edu (Postfix) with ESMTP id BD1EC161C41; Fri, 21 Jun 2019 16:33:23 -0700 (PDT) Original-Received: from zimbra.cs.ucla.edu ([127.0.0.1]) by localhost (zimbra.cs.ucla.edu [127.0.0.1]) (amavisd-new, port 10032) with ESMTP id zobundCHn_vG; Fri, 21 Jun 2019 16:33:20 -0700 (PDT) Original-Received: from localhost (localhost [127.0.0.1]) by zimbra.cs.ucla.edu (Postfix) with ESMTP id 33901161C18; Fri, 21 Jun 2019 16:33:20 -0700 (PDT) X-Virus-Scanned: amavisd-new at zimbra.cs.ucla.edu Original-Received: from zimbra.cs.ucla.edu ([127.0.0.1]) by localhost (zimbra.cs.ucla.edu [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id Bq9L2yAyQTQz; Fri, 21 Jun 2019 16:33:20 -0700 (PDT) Original-Received: from Penguin.CS.UCLA.EDU (Penguin.CS.UCLA.EDU [131.179.64.200]) by zimbra.cs.ucla.edu (Postfix) with ESMTPSA id 12F3F1617D8; Fri, 21 Jun 2019 16:33:20 -0700 (PDT) Openpgp: preference=signencrypt Autocrypt: addr=eggert@cs.ucla.edu; prefer-encrypt=mutual; keydata= xsFNBEyAcmQBEADAAyH2xoTu7ppG5D3a8FMZEon74dCvc4+q1XA2J2tBy2pwaTqfhpxxdGA9 Jj50UJ3PD4bSUEgN8tLZ0san47l5XTAFLi2456ciSl5m8sKaHlGdt9XmAAtmXqeZVIYX/UFS 96fDzf4xhEmm/y7LbYEPQdUdxu47xA5KhTYp5bltF3WYDz1Ygd7gx07Auwp7iw7eNvnoDTAl KAl8KYDZzbDNCQGEbpY3efZIvPdeI+FWQN4W+kghy+P6au6PrIIhYraeua7XDdb2LS1en3Ss mE3QjqfRqI/A2ue8JMwsvXe/WK38Ezs6x74iTaqI3AFH6ilAhDqpMnd/msSESNFt76DiO1ZK QMr9amVPknjfPmJISqdhgB1DlEdw34sROf6V8mZw0xfqT6PKE46LcFefzs0kbg4GORf8vjG2 Sf1tk5eU8MBiyN/bZ03bKNjNYMpODDQQwuP84kYLkX2wBxxMAhBxwbDVZudzxDZJ1C2VXujC OJVxq2kljBM9ETYuUGqd75AW2LXrLw6+MuIsHFAYAgRr7+KcwDgBAfwhPBYX34nSSiHlmLC+ KaHLeCLF5ZI2vKm3HEeCTtlOg7xZEONgwzL+fdKo+D6SoC8RRxJKs8a3sVfI4t6CnrQzvJbB n6gxdgCu5i29J1QCYrCYvql2UyFPAK+do99/1jOXT4m2836j1wARAQABzSBQYXVsIEVnZ2Vy dCA8ZWdnZXJ0QGNzLnVjbGEuZWR1PsLBfgQTAQIAKAUCTIByZAIbAwUJEswDAAYLCQgHAwIG FQgCCQoLBBYCAwECH In-Reply-To: Content-Language: en-US X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 131.179.128.68 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: "Emacs-devel" Xref: news.gmane.org gmane.emacs.devel:238013 Archived-At: This is a multi-part message in MIME format. --------------8A75C439BEB99193CB3E38DA Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit On 6/21/19 4:02 PM, Glenn Morris wrote: > src/macuvs.h is generated by an Emacs lisp script. > So won't this cause a bootstrap failure on platforms where the emacs > excutable requires src/macuvs.h in order to build; ie Mac OS? Ouch, thanks, I didn't think of that. I installed the attached patch to work around the immediate problem. We could do something fancier to better automate a headlesss-then-headful build process, though that would require someone who can easily test on macOS. Alternatively, I could bring back macuvs.h even though it's ugly to commit that generated file into Git. --------------8A75C439BEB99193CB3E38DA Content-Type: text/x-patch; name="0001-Fix-default-build-from-Git-on-macOS.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="0001-Fix-default-build-from-Git-on-macOS.patch" >From 9b170060ba80c62a3a38e39d0c9692bdddd6ae47 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Fri, 21 Jun 2019 16:22:26 -0700 Subject: [PATCH] Fix default build-from-Git on macOS * configure.ac (NS_IMPL_COCOA): Do not default to "yes" if src/macuvs.h is absent, which is possible in a build from Git. --- configure.ac | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index be5c4e35b1..c1c4970002 100644 --- a/configure.ac +++ b/configure.ac @@ -1960,7 +1960,10 @@ AC_DEFUN GNU_OBJC_CFLAGS= LIBS_GNUSTEP= if test "${with_ns}" != no; then - if test "${opsys}" = darwin; then + # macfont.o requires macuvs.h which is absent in the repository, + # so avoid NS_IMPL_COCOA if macuvs.h is absent. + # Even a headless Emacs can build macuvs.h, so this lets you bootstrap. + if test "${opsys}" = darwin && test -f "$srcdir/src/macuvs.h"; then NS_IMPL_COCOA=yes ns_appdir=`pwd`/nextstep/Emacs.app ns_appbindir=${ns_appdir}/Contents/MacOS -- 2.21.0 --------------8A75C439BEB99193CB3E38DA--