diff -Nru gridengine-8.1.9+dfsg/debian/changelog gridengine-8.1.9+dfsg/debian/changelog
--- gridengine-8.1.9+dfsg/debian/changelog	2019-12-04 11:06:18.000000000 +0000
+++ gridengine-8.1.9+dfsg/debian/changelog	2021-03-25 11:27:18.000000000 +0000
@@ -1,14 +1,17 @@
-gridengine (8.1.9+dfsg-9build2) focal; urgency=medium
+gridengine (8.1.9+dfsg-9.1ubuntu1) hirsute; urgency=medium
 
-  * Rebuild against new lhwloc 15.
+  * Fix build with glibc >= 2.32
 
- -- Gianfranco Costamagna <locutusofborg@debian.org>  Wed, 04 Dec 2019 12:06:18 +0100
+ -- Graham Inggs <ginggs@ubuntu.com>  Thu, 25 Mar 2021 11:27:18 +0000
 
-gridengine (8.1.9+dfsg-9build1) eoan; urgency=medium
+gridengine (8.1.9+dfsg-9.1) unstable; urgency=medium
 
-  * No-change upload with strops.h and sys/strops.h removed in glibc.
+  * Non-maintainer upload.
+  * debian/patches/extern_qualifier.patch: add; fixes FTBFS with g++-10.
+    Patch by Pierre Gruet <pgtdebian@free.fr>, updated by Wouter Verhelst
+    <wouter@debian.org> for qmake (Closes: #957310).
 
- -- Matthias Klose <doko@ubuntu.com>  Thu, 05 Sep 2019 10:52:47 +0000
+ -- Wouter Verhelst <wouter@debian.org>  Sun, 31 Jan 2021 14:08:55 +0200
 
 gridengine (8.1.9+dfsg-9) unstable; urgency=medium
 
diff -Nru gridengine-8.1.9+dfsg/debian/control gridengine-8.1.9+dfsg/debian/control
--- gridengine-8.1.9+dfsg/debian/control	2019-01-12 23:57:52.000000000 +0000
+++ gridengine-8.1.9+dfsg/debian/control	2021-03-25 11:04:01.000000000 +0000
@@ -1,7 +1,8 @@
 Source: gridengine
 Section: utils
 Priority: optional
-Maintainer: Debian HPC Team <debian-hpc@lists.debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian HPC Team <debian-hpc@lists.debian.org>
 Uploaders: Dave Love <d.love@liverpool.ac.uk>,
 	   Afif Elghraoui <afif@debian.org>,
            Laszlo Kajan <lkajan@debian.org>,
@@ -28,6 +29,7 @@
 	libjemalloc-dev,
 	libxft-dev,
 	libmunge-dev,
+	libtirpc-dev
 Standards-Version: 4.1.1
 Homepage: https://arc.liv.ac.uk/trac/SGE/
 Vcs-Git: https://salsa.debian.org/hpc-team/gridengine
diff -Nru gridengine-8.1.9+dfsg/debian/patches/extern_qualifier.patch gridengine-8.1.9+dfsg/debian/patches/extern_qualifier.patch
--- gridengine-8.1.9+dfsg/debian/patches/extern_qualifier.patch	1970-01-01 00:00:00.000000000 +0000
+++ gridengine-8.1.9+dfsg/debian/patches/extern_qualifier.patch	2021-01-31 12:08:55.000000000 +0000
@@ -0,0 +1,38 @@
+Description: Fix FTBFS with g++ 10
+Author: Pierre Gruet <pgtdebian@free.fr>
+Bug-Debian: https://bugs.debian.org/957310
+Forwarded: no
+Last-Update: 2020-11-26
+--- a/source/libs/japi/drmaa2_list_dict.h
++++ b/source/libs/japi/drmaa2_list_dict.h
+@@ -10,7 +10,7 @@
+    struct _drmaa2_node *next;
+ } _drmaa2_Node;
+ 
+-/* static */ struct drmaa2_list_s
++/* static */ extern struct drmaa2_list_s
+ {
+    _drmaa2_Node   *head;
+    _drmaa2_Node   *tail;
+@@ -33,7 +33,7 @@
+   struct _drmaa2_dictentry_t* next;
+ } _drmaa2_dictentry_t;
+ 
+-/* static */ struct drmaa2_dict_s
++/* static */ extern struct drmaa2_dict_s
+ {
+   _drmaa2_dictentry_t    *head;
+   _drmaa2_dictentry_t    *tail;
+diff --git a/source/3rdparty/qmake/make.h b/source/3rdparty/qmake/make.h
+index 46d523a4c..87e871bc6 100644
+--- a/source/3rdparty/qmake/make.h
++++ b/source/3rdparty/qmake/make.h
+@@ -348,7 +348,7 @@ extern int unixy_shell;
+ #endif
+ #ifdef SET_STACK_SIZE
+ # include <sys/resource.h>
+-struct rlimit stack_limit;
++extern struct rlimit stack_limit;
+ #endif
+ 
+ struct floc
diff -Nru gridengine-8.1.9+dfsg/debian/patches/glibc-2.32.patch gridengine-8.1.9+dfsg/debian/patches/glibc-2.32.patch
--- gridengine-8.1.9+dfsg/debian/patches/glibc-2.32.patch	1970-01-01 00:00:00.000000000 +0000
+++ gridengine-8.1.9+dfsg/debian/patches/glibc-2.32.patch	2021-03-25 11:27:18.000000000 +0000
@@ -0,0 +1,25 @@
+Description: Fix build with glibc >= 2.32
+Forwarded: no
+Author: Graham Inggs <ginggs@debian.org>
+Last-Update: 2021-03-25
+
+--- a/source/aimk
++++ b/source/aimk
+@@ -1392,7 +1392,8 @@
+    set AUTHLIBS = "-lcrypt -lpam"
+    set HWLOC = 1
+ 
+-   set CFLAGS = "$CFLAGS"
++   set CFLAGS = "$CFLAGS -I/usr/include/tirpc"
++   set LIBS = "$LIBS -ltirpc"
+ 
+    set COMPILE_DC = 1
+ 
+@@ -2671,6 +2672,7 @@
+       case CYGWIN_X86:
+       case CYGWIN_X86_64:
+       # Cygwin needs the tirpc libs which are defined in the common Cygwin part
++      case LINUX*:
+          set SGE_LIBS = "$SGE_LIBS $LIBS"
+          breaksw
+    endsw
diff -Nru gridengine-8.1.9+dfsg/debian/patches/series gridengine-8.1.9+dfsg/debian/patches/series
--- gridengine-8.1.9+dfsg/debian/patches/series	2019-02-05 05:15:16.000000000 +0000
+++ gridengine-8.1.9+dfsg/debian/patches/series	2021-03-25 10:59:15.000000000 +0000
@@ -8,3 +8,5 @@
 qmake-glob-glibc227.patch
 armhf-java.patch
 skip-jgdi-with-recent-java.patch
+extern_qualifier.patch
+glibc-2.32.patch