Attachment 910634 Details for Bug 1111453 – Patch fixing this bug

[patch] Patch fixing this bug

0001-Fixed-build-on-ppc64-le-added-missing-define-and-bui.patch (text/plain), 4.67 KB, created by Jakub Čajka on 2014-06-20 05:31:51 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jakub Čajka

Created: 2014-06-20 05:31:51 UTC

Size: 4.67 KB

patch

obsolete

>From 9eb6f2bcda06050909938a928c603c6eae934351 Mon Sep 17 00:00:00 2001
>From: =?UTF-8?q?Jakub=20=C4=8Cajka?= <jcajka@redhat.com>
>Date: Fri, 20 Jun 2014 07:06:39 +0200
>Subject: [PATCH] Fixed build on ppc64(le)(added missing define and build dep)
> Fixed build on AArch64(fixed/added defines) Added font cache refresh in %prep
> to prevent font related problems(s390(x))
>
>---
> libexplain.spec | 16 +++++++++++++--
> secArch.patch   | 62 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
> 2 files changed, 76 insertions(+), 2 deletions(-)
> create mode 100644 secArch.patch
>
>diff --git a/libexplain.spec b/libexplain.spec
>index 591ac64..ab8ba77 100644
>--- a/libexplain.spec
>+++ b/libexplain.spec
>@@ -1,15 +1,19 @@
> Name:           libexplain
> Version:        1.2
>-Release:        4%{?dist}
>+Release:        5%{?dist}
> Summary:        Library functions to explain system call errors
> URL:            http://libexplain.sourceforge.net
> 
> Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
> 
>+#   Patch enable build on ppc64 and aarch64 by adding/fixing preprocessor macros
>+Patch0:		secArch.patch
>+
> License:        LGPLv3+
> Group:          System Environment/Libraries
> 
>-BuildRequires:  bison libcap-devel libtool groff gettext ghostscript
>+#   lyx-fonts fixes missing fonts on ppc
>+BuildRequires:  bison libcap-devel libtool groff gettext ghostscript lyx-fonts  
> 
> %{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}}
> 
>@@ -47,6 +51,11 @@ Development files for the libexplain library.
> %prep
> %setup -q
> 
>+# refresh font cache because of s390(x) related to BZ#921706 
>+fc-cache -v /usr/share/fonts/default/
>+
>+%patch0 -p1 -b .ppc
>+
> # In some releases of libexplain, some tests fail in a way that does
> # not indicate a fault in libexplain. Skip those tests.  Note that
> # Makefile.in is automatically generated upstream, and if we use a
>@@ -125,6 +134,9 @@ install -m 0664 README LICENSE %{buildroot}%{_pkgdocdir}
> # provides a wrapper for mktemp, not because it is used.
> 
> %changelog
>+* Tue Jun 17 2014 Jakub Äajka <jcajka@redhat.com> - 1.2-5
>+- Fixed build on ppc64 and aarch64
>+
> * Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.2-4
> - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
> 
>diff --git a/secArch.patch b/secArch.patch
>new file mode 100644
>index 0000000..ec8e301
>--- /dev/null
>+++ b/secArch.patch
>@@ -0,0 +1,62 @@
>+diff -up libexplain-1.2/explain/syscall/ustat.c.ppc libexplain-1.2/explain/syscall/ustat.c
>+--- libexplain-1.2/explain/syscall/ustat.c.ppc	2013-03-15 02:34:07.000000000 +0100
>++++ libexplain-1.2/explain/syscall/ustat.c	2014-06-18 08:40:35.222891260 +0200
>+@@ -30,7 +30,7 @@
>+ #include <explain/syscall/ustat.h>
>+ 
>+ 
>+-#ifndef HAVE_USTAT
>++#ifndef HAVE_USTAT_H
>+ 
>+ struct ustat
>+ {
>+diff -up libexplain-1.2/libexplain/ac/fcntl.h.ppc libexplain-1.2/libexplain/ac/fcntl.h
>+--- libexplain-1.2/libexplain/ac/fcntl.h.ppc	2013-03-15 02:34:07.000000000 +0100
>++++ libexplain-1.2/libexplain/ac/fcntl.h	2014-06-18 08:40:35.221891257 +0200
>+@@ -16,7 +16,6 @@
>+  * You should have received a copy of the GNU Lesser General Public License
>+  * along with this program. If not, see <http://www.gnu.org/licenses/>.
>+  */
>+-
>+ #ifndef LIBEXPLAIN_AC_FCNTL_H
>+ #define LIBEXPLAIN_AC_FCNTL_H
>+ 
>+@@ -65,8 +64,14 @@
>+  * flags values returned by the kernel.
>+  */
>+ #if defined(__linux__) && (O_LARGEFILE == 0)
>++#if defined(__powerpc64__)
>++#define O_LARGEFILE_HIDDEN 0200000
>++#elif defined(__aarch64__)
>++#define O_LARGEFILE_HIDDEN 0400000
>++#else
>+ #define O_LARGEFILE_HIDDEN 0100000
>+ #endif
>++#endif
>+ 
>+ 
>+ /*
>+diff -up libexplain-1.2/libexplain/buffer/enfile.c.ppc libexplain-1.2/libexplain/buffer/enfile.c
>+--- libexplain-1.2/libexplain/buffer/enfile.c.ppc	2013-03-15 02:34:07.000000000 +0100
>++++ libexplain-1.2/libexplain/buffer/enfile.c	2014-06-18 08:40:35.222891260 +0200
>+@@ -38,7 +38,7 @@ get_maxfile(void)
>+ {
>+     if (explain_option_dialect_specific())
>+     {
>+-#ifdef __linux__
>++#if defined( __linux__) && !defined(__aarch64__) 
>+         /*
>+          * In the linux kernel, if get_empty_filp() returns NULL, the open
>+          * system call (and others) will return ENFILE.
>+diff -up libexplain-1.2/libexplain/buffer/errno/listen.c.ppc libexplain-1.2/libexplain/buffer/errno/listen.c
>+--- libexplain-1.2/libexplain/buffer/errno/listen.c.ppc	2013-03-15 02:34:07.000000000 +0100
>++++ libexplain-1.2/libexplain/buffer/errno/listen.c	2014-06-18 08:40:35.223891263 +0200
>+@@ -72,7 +72,7 @@ append_getsockname(explain_string_buffer
>+ static int
>+ get_somaxconn(void)
>+ {
>+-#ifdef __linux__
>++#if defined( __linux__) && !defined(__aarch64__)
>+     struct __sysctl_args args;
>+     long somaxconn;
>+     size_t somaxconn_size = sizeof(somaxconn);
>-- 
>1.9.3
>

Actions: View | Diff

Attachments on bug 1111453: 910634