From 000859d97b174b5d49692e04c1d4490b4abbbf4c Mon Sep 17 00:00:00 2001 From: Siteshwar Vashisht Date: Thu, 3 Aug 2017 14:21:43 +0200 Subject: [PATCH] Fix build failures caused by update in glibc Resolves: #1477082 --- ksh-20120801-glibc-build-fix.patch | 38 ++++++++++++++++++++++++++++++ ksh.spec | 9 ++++++- 2 files changed, 46 insertions(+), 1 deletion(-) create mode 100644 ksh-20120801-glibc-build-fix.patch diff --git a/ksh-20120801-glibc-build-fix.patch b/ksh-20120801-glibc-build-fix.patch new file mode 100644 index 0000000..28be43b --- /dev/null +++ b/ksh-20120801-glibc-build-fix.patch @@ -0,0 +1,38 @@ +diff --git a/src/lib/libast/features/stdio b/src/lib/libast/features/stdio +--- a/src/lib/libast/features/stdio ++++ b/src/lib/libast/features/stdio +@@ -6,6 +6,8 @@ cat{ + #define _FILE_DEFINED 1 + #define _FILE_defined 1 + #define _FILEDEFED 1 ++ #define __FILE_defined 1 ++ #define ____FILE_defined 1 + + #ifndef __FILE_TAG + #define __FILE_TAG _sfio_s +diff --git a/src/lib/libast/include/ast.h b/src/lib/libast/include/ast.h +index ebf82d7..f4bbe6d 100644 +--- a/src/lib/libast/include/ast.h ++++ b/src/lib/libast/include/ast.h +@@ -59,9 +59,21 @@ struct _sfio_s; + #ifndef __FILE_typedef + #define __FILE_typedef 1 + #endif ++#ifndef _FILE_DEFINED ++#define _FILE_DEFINED 1 ++#endif ++#ifndef _FILE_defined ++#define _FILE_defined 1 ++#endif + #ifndef _FILEDEFED + #define _FILEDEFED 1 + #endif ++#ifndef __FILE_defined ++#define __FILE_defined 1 ++#endif ++#ifndef ____FILE_defined ++#define ____FILE_defined 1 ++#endif + #endif + + /* diff --git a/ksh.spec b/ksh.spec index 737d47d..ca2d5ea 100644 --- a/ksh.spec +++ b/ksh.spec @@ -8,7 +8,7 @@ URL: http://www.kornshell.com/ #CPL everywhere else (for KSH itself) License: CPL Version: %{releasedate} -Release: 37%{?dist} +Release: 38%{?dist} Source0: http://www.research.att.com/~gsf/download/tgz/ast-ksh.%{release_date}.tgz Source1: http://www.research.att.com/~gsf/download/tgz/INIT.%{release_date}.tgz Source2: kshcomp.conf @@ -187,6 +187,9 @@ Patch77: ksh-20120801-iso8859.patch # rhbz#1451057 Patch78: ksh-20120801-syntax-error.patch +# rhbz#1477082 +Patch79: ksh-20120801-glibc-build-fix.patch + Conflicts: pdksh Requires: coreutils, diffutils, chkconfig BuildRequires: bison @@ -310,6 +313,10 @@ fi %config(noreplace) %{_sysconfdir}/binfmt.d/kshcomp.conf %changelog +* Thu Aug 03 2017 Siteshwar Vashisht - 20120801-38 +- Fix build failures caused by update in glibc + Resolves: #1477082 + * Thu Aug 03 2017 Fedora Release Engineering - 20120801-37 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild