diff -Nru ace-6.4.5+dfsg/debian/changelog ace-6.4.5+dfsg/debian/changelog
--- ace-6.4.5+dfsg/debian/changelog 2017-09-16 17:29:35.0 +0200
+++ ace-6.4.5+dfsg/debian/changelog 2019-12-16 16:33:25.0 +0100
@@ -1,3 +1,11 @@
+ace (6.4.5+dfsg-2) UNRELEASED; urgency=medium
+
+ * debian/patches/git_stropts_build.patch:
+- backport an upstream patch to fix the build with the new glibc
+ (Closes: #946853)
+
+ -- Sebastien Bacher Mon, 16 Dec 2019 16:23:09 +0100
+
ace (6.4.5+dfsg-1) unstable; urgency=medium
[ Johnny Willemsen ]
diff -Nru ace-6.4.5+dfsg/debian/patches/git_stropts_build.patch ace-6.4.5+dfsg/debian/patches/git_stropts_build.patch
--- ace-6.4.5+dfsg/debian/patches/git_stropts_build.patch 1970-01-01 01:00:00.0 +0100
+++ ace-6.4.5+dfsg/debian/patches/git_stropts_build.patch 2019-12-16 16:02:12.0 +0100
@@ -0,0 +1,36 @@
+From e7e38f991ff56b3c628c1cb0b891be8a4c125b1d Mon Sep 17 00:00:00 2001
+From: Naveen Saini
+Date: Wed, 14 Aug 2019 13:15:09 +0800
+Subject: [PATCH] config-linux-common.h: fix glibc build failure
+
+Recent glibc v2.30 dropped XSI STREAMS declarations,
+which causing below build failure.
+
+poky/build/tmp/work/corei7-64-poky-linux/ace/6.5.6-r0/ACE_wrappers/ace/os_include/os_stropts.h:56:17: fatal error: stropts.h: No such file or directory
+ 56 | # include /**/
+ | ^~~
+compilation terminated.
+
+Added _XOPEN_STREAMS not defined checks for newer GLIBC releases.
+
+For more information about glibc v2.30 change, please check:
+https://sourceware.org/git/?p=glibc.git;a=commit;h=a0a0dc83173ce11ff45105fd32e5d14356cdfb9c
+
+Signed-off-by: Naveen Saini
+---
+ ACE/ace/config-linux-common.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/ACE/ace/config-linux-common.h b/ACE/ace/config-linux-common.h
+index b9d112602ad1..c0fb656c3219 100644
+--- a/ace/config-linux.h
b/ace/config-linux.h
+@@ -295,7 +295,7 @@
+
+ // Starting with FC9 rawhide this file is not available anymore but
+ // this define is set
+-#if defined _XOPEN_STREAMS && _XOPEN_STREAMS == -1
++#if !defined(_XOPEN_STREAMS) || (defined _XOPEN_STREAMS && _XOPEN_STREAMS == -1)
+ # define ACE_LACKS_STROPTS_H
+ # define ACE_LACKS_STRRECVFD
+ #endif
diff -Nru ace-6.4.5+dfsg/debian/patches/series ace-6.4.5+dfsg/debian/patches/series
--- ace-6.4.5+dfsg/debian/patches/series 2017-09-16 17:29:35.0 +0200
+++ ace-6.4.5+dfsg/debian/patches/series 2019-12-16 15:54:45.0 +0100
@@ -2,3 +2,4 @@
90-patch-mpc-basedir.diff
91-patch-dg-basedir.diff
92-default-ACE_ROOT.diff
+git_stropts_build.patch
