Control: tags 946853 + pending
X-Debbugs-CC: Thomas Girard <thomas.g.gir...@free.fr>, Johnny Willemsen 
<jwillem...@remedy.nl>

Dear maintainer,

I've prepared an NMU for ace (versioned as 6.4.5+dfsg-1.1) and
uploaded it to mentors for sponsoring. Please feel free to tell me if I
should remove it.

--
Regards
Sudip

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 16:29:35.000000000 +0100
+++ ace-6.4.5+dfsg/debian/changelog     2020-04-07 11:55:27.000000000 +0100
@@ -1,3 +1,10 @@
+ace (6.4.5+dfsg-1.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix build failure. (Closes: #946853)
+
+ -- Sudip Mukherjee <sudipm.mukher...@gmail.com>  Tue, 07 Apr 2020 11:55:27 
+0100
+
 ace (6.4.5+dfsg-1) unstable; urgency=medium
 
   [ Johnny Willemsen ]
diff -Nru ace-6.4.5+dfsg/debian/patches/fix_stropt.patch 
ace-6.4.5+dfsg/debian/patches/fix_stropt.patch
--- ace-6.4.5+dfsg/debian/patches/fix_stropt.patch      1970-01-01 
01:00:00.000000000 +0100
+++ ace-6.4.5+dfsg/debian/patches/fix_stropt.patch      2020-04-07 
11:55:20.000000000 +0100
@@ -0,0 +1,24 @@
+Description: Fix build failure
+ glibc removed obsolete, never-implemented XSI STREAMS declarations via:
+ 
https://sourceware.org/git/?p=glibc.git;a=commit;h=a0a0dc83173ce11ff45105fd32e5d14356cdfb9c
+ And so stropts.h file is not available anymore.
+
+ Adopt the change yocto did on ace and apply it here.
+ ref: https://www.yoctoproject.org/pipermail/meta-intel/2019-August/006081.html
+
+Author: Sudip Mukherjee <sudipm.mukher...@gmail.com>
+Bug-Debian: https://bugs.debian.org/946853
+
+---
+
+--- ace-6.4.5+dfsg.orig/ace/config-linux.h
++++ ace-6.4.5+dfsg/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(__GLIBC__) && (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 30)) || 
(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 16:29:35.000000000 
+0100
+++ ace-6.4.5+dfsg/debian/patches/series        2020-04-07 11:40:25.000000000 
+0100
@@ -2,3 +2,4 @@
 90-patch-mpc-basedir.diff
 91-patch-dg-basedir.diff
 92-default-ACE_ROOT.diff
+fix_stropt.patch

Reply via email to