From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Alan Third Newsgroups: gmane.emacs.devel Subject: Re: master 5dd2d50: Fix NS native compilation builds Date: Sat, 26 Jun 2021 12:42:36 +0100 Message-ID: References: <20210626093722.32209.46548@vcs0.savannah.gnu.org> <20210626093724.2934420D0A@vcs0.savannah.gnu.org> <87fsx4dgh1.fsf@gnus.org> <83eecorhoo.fsf@gnu.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="4339"; mail-complaints-to="usenet@ciao.gmane.io" Cc: Lars Ingebrigtsen , emacs-devel@gnu.org To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Sat Jun 26 13:44:08 2021 Return-path: Envelope-to: ged-emacs-devel@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1lx6jH-0000s8-C4 for ged-emacs-devel@m.gmane-mx.org; Sat, 26 Jun 2021 13:44:07 +0200 Original-Received: from localhost ([::1]:53428 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lx6jF-0000QL-UV for ged-emacs-devel@m.gmane-mx.org; Sat, 26 Jun 2021 07:44:05 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:51462) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lx6i6-00086p-BD for emacs-devel@gnu.org; Sat, 26 Jun 2021 07:42:54 -0400 Original-Received: from outbound.soverin.net ([116.202.126.228]:42647) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lx6i0-00050W-E5; Sat, 26 Jun 2021 07:42:53 -0400 Original-Received: from smtp.soverin.net (unknown [10.10.3.24]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by outbound.soverin.net (Postfix) with ESMTPS id 3F103903; Sat, 26 Jun 2021 11:42:40 +0000 (UTC) Original-Received: from smtp.soverin.net (smtp.soverin.net [159.69.232.138]) by soverin.net DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=idiocy.org; s=soverin; t=1624707759; bh=fM7V7e8A1HbbhkOSg6wh+1r4weTjjph6W8YTYI0jPs4=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=Rir+CuRZvlZY4xJdIGh6N2zR2OrdL4E9XDx+uLS/Wi/HNGR3UDSRMlwCpj5BHEkaX lgn5Oy/FWn3s30fEpjZbIvpdBrWtx8X2o7nKHbOiyYy1uKPDEMfkE5dWHgvKP9ORvA qDky5jkuTmYM/qvpNaaKwvoKNa7EPZX+ySzRLtYddpjk9sv2LmRgkjLpfeUEehKrmy cD712IJAcJAmmJd7y4qEqk4K8B5sMEsYweMGrQnbyLTBPrfF6yKf0BY/ZzKd+dLVyj LldRNaE0E2otJuwT6OisPEo0J2PH0Q1tsThmoA9Ip/Dl5PuP/kYdCSXTLO5Z4PRb6x zc585rVKD7dng== Original-Received: from alan by faroe.holly.idiocy.org with local (Exim 4.94.2) (envelope-from ) id 1lx6ho-001c4m-KU; Sat, 26 Jun 2021 12:42:36 +0100 Mail-Followup-To: Alan Third , Eli Zaretskii , Lars Ingebrigtsen , emacs-devel@gnu.org Content-Disposition: inline In-Reply-To: <83eecorhoo.fsf@gnu.org> Received-SPF: pass client-ip=116.202.126.228; envelope-from=alan@idiocy.org; helo=outbound.soverin.net X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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-mx.org@gnu.org Original-Sender: "Emacs-devel" Xref: news.gmane.io gmane.emacs.devel:271025 Archived-At: On Sat, Jun 26, 2021 at 02:25:43PM +0300, Eli Zaretskii wrote: > > From: Lars Ingebrigtsen > > Date: Sat, 26 Jun 2021 13:15:38 +0200 > > Cc: Alan Third > > > > alan@idiocy.org (Alan Third) writes: > > > > > +# A NextStep style app bundle is relocatable, so instead of > > > +# hard-coding paths try to generate them at run-time. > > > +# > > > +# The paths are mostly the same, and the bundle paths are different > > > +# between macOS and GNUstep, so just replace any references to the app > > > +# bundle root itself with the relative path. > > > +epaths-force-ns-self-contained: epaths-force > > > + @(sed < ${srcdir}/src/epaths.h > epaths.h.$$$$ \ > > > + -e 's;${ns_appdir}/;;') && \ > > > + ${srcdir}/build-aux/move-if-change epaths.h.$$$$ src/epaths.h > > > > This (or something else in this patch) leads to the src/epaths.h file > > being invalid. It starts like this: > > > > * Hey Emacs, this is -*- C -*- code! */ > > * > > Copyright (C) 1993, 1995, 1997, 1999, 2001-2021 Free Software > > Foundation, Inc. > > > > This file is part of GNU Emacs. > > > > > > Note the * instead of /* as the comment starter. > > I think this is because EN_NS_SELF_CONTAINED ends up being "yes" on > systems where it shouldn't. I guess it's because it defaults to on. That never occurred to me I'm afraid. This should fix it: modified configure.ac @@ -6021,12 +6021,12 @@ m4_define AC_CONFIG_COMMANDS([src/epaths.h], [ if test "${opsys}" = "mingw32"; then ${MAKE-make} MAKEFILE_NAME=do-not-make-Makefile epaths-force-w32 -elif test "$EN_NS_SELF_CONTAINED" = "yes"; then +elif test "$HAVE_NS" = "yes" && test "$EN_NS_SELF_CONTAINED" = "yes"; then ${MAKE-make} MAKEFILE_NAME=do-not-make-Makefile epaths-force-ns-self-contained else ${MAKE-make} MAKEFILE_NAME=do-not-make-Makefile epaths-force fi || AC_MSG_ERROR(['src/epaths.h' could not be made.]) -], [GCC="$GCC" CPPFLAGS="$CPPFLAGS" opsys="$opsys" +], [GCC="$GCC" CPPFLAGS="$CPPFLAGS" opsys="$opsys" HAVE_NS="$HAVE_NS" EN_NS_SELF_CONTAINED="$EN_NS_SELF_CONTAINED"]) -- Alan Third