bug#43234: Patch: Fix QNX build in 28.x

bug#43234: Patch: Fix QNX build in 28.x

[Elad Lahav]

[-- Attachment #1: Type: text/plain, Size: 113 bytes --]

The QNX build is currently broken due to changes to
build-aux/config.sub and the default dumping option.

--Elad

[-- Attachment #2: 0001-Fix-QNX-build.patch --]
[-- Type: text/x-patch, Size: 2121 bytes --]

From 60250939099074c1e8e2b2b2115962d7f9fbffaf Mon Sep 17 00:00:00 2001
From: Elad Lahav <elahav@qnx.com>
Date: Sat, 5 Sep 2020 17:57:49 -0400
Subject: [PATCH] Fix QNX build

* Recent changes to config.sub broke the detection of QNX systems.
* The linker flag for increasing the main stack size is wrong.
  Also, the flag should be set unconditionally, now that the default dumper
  has changed.
* The __NO_EXT_QNX flag is no longer needed, and is masking the declaration
  of memset_s().
---
 build-aux/config.sub | 12 +++---------
 configure.ac         |  5 +----
 2 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/build-aux/config.sub b/build-aux/config.sub
index 0753e308458..e7b0e3566e0 100755
--- a/build-aux/config.sub
+++ b/build-aux/config.sub
@@ -2,7 +2,7 @@
 # Configuration validation subroutine script.
 #   Copyright 1992-2020 Free Software Foundation, Inc.
 
-timestamp='2020-08-17'
+timestamp='2020-09-05'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -1367,13 +1367,7 @@ IFS=
 		os=psos
 		;;
 	qnx*)
-		case $cpu in
-		    x86 | i*86)
-			;;
-		    *)
-			os=nto-$os
-			;;
-		esac
+		os=qnx
 		;;
 	hiux*)
 		os=hiuxwe2
@@ -1722,7 +1716,7 @@ kernel=
 	     | skyos* | haiku* | rdos* | toppers* | drops* | es* \
 	     | onefs* | tirtos* | phoenix* | fuchsia* | redox* | bme* \
 	     | midnightbsd* | amdhsa* | unleashed* | emscripten* | wasi* \
-	     | nsk* | powerunix* | genode* | zvmoe* )
+	     | nsk* | powerunix* | genode* | zvmoe* | qnx* )
 		;;
 	# This one is extra strict with allowed versions
 	sco3.2v2 | sco3.2v[4-9]* | sco5v6*)
diff --git a/configure.ac b/configure.ac
index 0bcff587e8a..33948fd7760 100644
--- a/configure.ac
+++ b/configure.ac
@@ -785,10 +785,7 @@ AC_DEFUN
   *-nto-qnx* )
     opsys=qnxnto
     test -z "$CC" && CC=qcc
-    CFLAGS="$CFLAGS -D__NO_EXT_QNX"
-    if test "$with_unexec" = yes; then
-      LDFLAGS="-N2MB $LDFLAGS"
-    fi
+    LDFLAGS="-N2M $LDFLAGS"
   ;;
 
   ## Intel 386 machines where we don't care about the manufacturer.
-- 
2.25.1

bug#43234: Patch: Fix QNX build in 28.x

[Eli Zaretskii]

> From: Elad Lahav <e2lahav@gmail.com>
> Date: Sat, 5 Sep 2020 18:05:03 -0400
> 
> The QNX build is currently broken due to changes to
> build-aux/config.sub and the default dumping option.

Thanks.

config.sub is maintained in Gnulib, AFAIK, so that part of the patch
should be submitted to the Gnulib folks.

bug#43234: Patch: Fix QNX build in 28.x

[Andreas Schwab]

On Sep 06 2020, Eli Zaretskii wrote:

> config.sub is maintained in Gnulib, AFAIK

It is maintained in its own project, config.

Andreas.

-- 
Andreas Schwab, schwab@linux-m68k.org
GPG Key fingerprint = 7578 EB47 D4E5 4D69 2510  2552 DF73 E780 A9DA AEC1
"And now for something completely different."

bug#43234: Patch: Fix QNX build in 28.x

[Elad Lahav]

I'll submit a patch to Gnulib.

Thanks,
--Elad

On Sun, 6 Sep 2020 at 10:25, Eli Zaretskii <eliz@gnu.org> wrote:
>
> > From: Elad Lahav <e2lahav@gmail.com>
> > Date: Sat, 5 Sep 2020 18:05:03 -0400
> >
> > The QNX build is currently broken due to changes to
> > build-aux/config.sub and the default dumping option.
>
> Thanks.
>
> config.sub is maintained in Gnulib, AFAIK, so that part of the patch
> should be submitted to the Gnulib folks.

bug#43234: Patch: Fix QNX build in 28.x

[Elad Lahav]

Thanks, I found the config project on Savannah.

--Elad

On Sun, 6 Sep 2020 at 13:05, Andreas Schwab <schwab@linux-m68k.org> wrote:
>
> On Sep 06 2020, Eli Zaretskii wrote:
>
> > config.sub is maintained in Gnulib, AFAIK
>
> It is maintained in its own project, config.
>
> Andreas.
>
> --
> Andreas Schwab, schwab@linux-m68k.org
> GPG Key fingerprint = 7578 EB47 D4E5 4D69 2510  2552 DF73 E780 A9DA AEC1
> "And now for something completely different."

bug#43234: Patch: Fix QNX build in 28.x

[Elad Lahav]

The fix has been pushed to the config project. What's the process for
pulling that into Emacs?
Also, what happens with the fix to configure.ac? Should I submit that
separately?

--Elad

On Sun, 6 Sep 2020 at 13:10, Elad Lahav <e2lahav@gmail.com> wrote:
>
> Thanks, I found the config project on Savannah.
>
> --Elad
>
> On Sun, 6 Sep 2020 at 13:05, Andreas Schwab <schwab@linux-m68k.org> wrote:
> >
> > On Sep 06 2020, Eli Zaretskii wrote:
> >
> > > config.sub is maintained in Gnulib, AFAIK
> >
> > It is maintained in its own project, config.
> >
> > Andreas.
> >
> > --
> > Andreas Schwab, schwab@linux-m68k.org
> > GPG Key fingerprint = 7578 EB47 D4E5 4D69 2510  2552 DF73 E780 A9DA AEC1
> > "And now for something completely different."

bug#43234: Patch: Fix QNX build in 28.x

[Eli Zaretskii]

> From: Elad Lahav <e2lahav@gmail.com>
> Date: Mon, 7 Sep 2020 20:10:42 -0400
> Cc: Eli Zaretskii <eliz@gnu.org>, 43234@debbugs.gnu.org
> 
> The fix has been pushed to the config project. What's the process for
> pulling that into Emacs?

The process is for you to sit tight and wait for a couple of days,
until we have time to install your changes ;-).

> Also, what happens with the fix to configure.ac? Should I submit that
> separately?

No need, we will use the part of the patch that you already submitted.

Thanks.

bug#43234: Patch: Fix QNX build in 28.x

[Elad Lahav]

Couple of days?! C'mon... I can't wait that long!

Sorry, I didn't mean to sound impatient or ungrateful. I do appreciate
the help and responsiveness of the team, especially on an issue that
really affects only a handful of people (and I'm being generous with
"handful").

--Elad

On Tue, 8 Sep 2020 at 10:14, Eli Zaretskii <eliz@gnu.org> wrote:
>
> > From: Elad Lahav <e2lahav@gmail.com>
> > Date: Mon, 7 Sep 2020 20:10:42 -0400
> > Cc: Eli Zaretskii <eliz@gnu.org>, 43234@debbugs.gnu.org
> >
> > The fix has been pushed to the config project. What's the process for
> > pulling that into Emacs?
>
> The process is for you to sit tight and wait for a couple of days,
> until we have time to install your changes ;-).
>
> > Also, what happens with the fix to configure.ac? Should I submit that
> > separately?
>
> No need, we will use the part of the patch that you already submitted.
>
> Thanks.

bug#43234: Patch: Fix QNX build in 28.x

[Lars Ingebrigtsen]

Eli Zaretskii <eliz@gnu.org> writes:

>> Also, what happens with the fix to configure.ac? Should I submit that
>> separately?
>
> No need, we will use the part of the patch that you already submitted.

I've now applied the configure.ac part of the patch to Emacs 28, so I
guess what remains is to wait for the config changes to be merged from
upstream.

-- 
(domestic pets only, the antidote for overdose, milk.)
   bloggy blog: http://lars.ingebrigtsen.no

bug#43234: Patch: Fix QNX build in 28.x

[Stefan Kangas]

Lars Ingebrigtsen <larsi@gnus.org> writes:

> Eli Zaretskii <eliz@gnu.org> writes:
>
>>> Also, what happens with the fix to configure.ac? Should I submit that
>>> separately?
>>
>> No need, we will use the part of the patch that you already submitted.
>
> I've now applied the configure.ac part of the patch to Emacs 28, so I
> guess what remains is to wait for the config changes to be merged from
> upstream.

Was the patch accepted upstream?  In any case, should we perhaps close
this on our end since this is submitted to gnulib?

bug#43234: Patch: Fix QNX build in 28.x

[Elad Lahav]

The fix to config.sub was applied to the config project back in September:

https://git.savannah.gnu.org/cgit/config.git/commit/?id=e072cc210e5d0584396f6c13ba34cb9c7bd8538d

--Elad

On Thu, 11 Mar 2021 at 20:07, Stefan Kangas <stefan@marxist.se> wrote:
>
> Lars Ingebrigtsen <larsi@gnus.org> writes:
>
> > Eli Zaretskii <eliz@gnu.org> writes:
> >
> >>> Also, what happens with the fix to configure.ac? Should I submit that
> >>> separately?
> >>
> >> No need, we will use the part of the patch that you already submitted.
> >
> > I've now applied the configure.ac part of the patch to Emacs 28, so I
> > guess what remains is to wait for the config changes to be merged from
> > upstream.
>
> Was the patch accepted upstream?  In any case, should we perhaps close
> this on our end since this is submitted to gnulib?

bug#43234: Patch: Fix QNX build in 28.x

[Stefan Kangas]

tags 43234 fixed
close 43234 28.1
thanks

Elad Lahav <e2lahav@gmail.com> writes:

> The fix to config.sub was applied to the config project back in September:
>
> https://git.savannah.gnu.org/cgit/config.git/commit/?id=e072cc210e5d0584396f6c13ba34cb9c7bd8538d

Thanks.

This seems to be also merged on our side, so I'm closing this bug now.