This is an automated email from the git hooks/post-receive script. abe pushed a commit to branch master in repository libembperl-perl.
commit d8486080e18e0dd879fc9504859468b7cce80d94 Author: Axel Beckert <a...@deuxchevaux.org> Date: Fri Jan 15 19:43:34 2016 +0100 Yet untested patch to fix FTBFS on s390x Closes: #756655 --- debian/changelog | 1 + debian/patches/fix_s390_FTBFS.patch | 31 +++++++++++++++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 33 insertions(+) diff --git a/debian/changelog b/debian/changelog index 27bd08b..9380a83 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,7 @@ libembperl-perl (2.5.0-6) UNRELEASED; urgency=medium * Fix changelog attribution in previous changelog entry. * Fix comment in perl5.22-compat-PL_sv_objcount-removal.patch about CGI tests not passing. (They do now.) + * Add patch to fix FTBFS on s390x. (Closes: #756655) -- Axel Beckert <a...@debian.org> Fri, 15 Jan 2016 01:45:04 +0100 diff --git a/debian/patches/fix_s390_FTBFS.patch b/debian/patches/fix_s390_FTBFS.patch new file mode 100644 index 0000000..f34f5a7 --- /dev/null +++ b/debian/patches/fix_s390_FTBFS.patch @@ -0,0 +1,31 @@ +Description: Fix FTBFS on s390x by not calling not available flushing function in debug mode +Author: Axel Beckert <a...@debian.org> +Bug-Debian: https://bugs.debian.org/756655 +Forwarded: not yet + +Index: libembperl-perl/epio.c +=================================================================== +--- libembperl-perl.orig/epio.c 2014-10-13 23:44:08.653839074 +0200 ++++ libembperl-perl/epio.c 2016-01-15 12:52:37.657501767 +0100 +@@ -947,8 +947,10 @@ + if (n > 0) + { + n = ap_rwrite (ptr, n, r -> pApacheReq) ; ++#ifndef __s390x__ + if (r -> Component.Config.bDebug & dbgFlushOutput) + ap_rflush (r -> pApacheReq) ; ++#endif + return n ; + } + else +@@ -1018,8 +1020,10 @@ + if (r -> pApacheReq && r -> Component.pOutput -> ofd == NULL) + { + ap_rputc (c, r -> pApacheReq) ; ++#ifndef __s390x__ + if (r -> Component.Config.bDebug & dbgFlushOutput) + ap_rflush (r -> pApacheReq) ; ++#endif + return ; + } + #endif diff --git a/debian/patches/series b/debian/patches/series index 8b9a58b..2e43a3e 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -3,3 +3,4 @@ apache2.4-compat.patch perl5.20-compat.patch cgi-pm-4.04-compatibility.patch perl5.22-compat-PL_sv_objcount-removal.patch +fix_s390_FTBFS.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/libembperl-perl.git _______________________________________________ Pkg-perl-cvs-commits mailing list Pkg-perl-cvs-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-perl-cvs-commits