Attachment 649409 Details for Bug 477685 – multilib patch agains f19

[patch] multilib patch agains f19

0001-Move-event2-config.h-into-architecture-specific-file.patch (text/plain), 3.43 KB, created by Daniel McGregor on 2012-11-21 20:54:31 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Daniel McGregor

Created: 2012-11-21 20:54:31 UTC

Size: 3.43 KB

patch

obsolete

>From 9197180cd575b5fce70797c721f0a3570af26df2 Mon Sep 17 00:00:00 2001
>From: Dan McGregor <dan.mcgregor@usask.ca>
>Date: Tue, 20 Nov 2012 13:23:39 -0600
>Subject: [PATCH] Move event2-config.h into architecture specific files.
>
>---
> event2-config-multilib-placeholder.h | 35 +++++++++++++++++++++++++++++++++++
> libevent.spec                        | 10 +++++++++-
> 2 files changed, 44 insertions(+), 1 deletion(-)
> create mode 100644 event2-config-multilib-placeholder.h
>
>diff --git a/event2-config-multilib-placeholder.h b/event2-config-multilib-placeholder.h
>new file mode 100644
>index 0000000..9e85874
>--- /dev/null
>+++ b/event2-config-multilib-placeholder.h
>@@ -0,0 +1,35 @@
>+/* This file is here to prevent a file conflict on multiarch systems.  A
>+ * conflict will frequently occur because arch-specific build-time
>+ * configuration options are stored (and used, so they can't just be stripped
>+ * out) in event-config.h.  The original event-config.h has been renamed.
>+ * DO NOT INCLUDE THE NEW FILE DIRECTLY -- ALWAYS INCLUDE THIS ONE INSTEAD. */
>+
>+#ifdef event2_eventconfig_multilib_redirection_h
>+#error "Do not define event2_eventconfig_multilib_redirection_h!"
>+#endif
>+#define event2_eventconfig_multilib_redirection_h
>+
>+#if defined(__i386__)
>+#include "event2/event-config-i386.h"
>+#elif defined(__ia64__)
>+#include "event2/event-config-ia64.h"
>+#elif defined(__powerpc64__)
>+#include "event2/event-config-ppc64.h"
>+#elif defined(__powerpc__)
>+#include "event2/event-config-ppc.h"
>+#elif defined(__s390x__)
>+#include "event2/event-config-s390x.h"
>+#elif defined(__s390__)
>+#include "event2/event-config-s390.h"
>+#elif defined(__sparc__) && defined(__arch64__)
>+#include "event2/event-config-sparc64.h"
>+#elif defined(__sparc__)
>+#include "event2/event-config-sparc.h"
>+#elif defined(__x86_64__)
>+#include "event2/event-config-x86_64.h"
>+#else
>+#error "This openssl-devel package does not work your architecture?"
>+#endif
>+
>+#undef event2_eventconfig_multilib_redirection_h
>+
>diff --git a/libevent.spec b/libevent.spec
>index 14c33d4..bfe0116 100644
>--- a/libevent.spec
>+++ b/libevent.spec
>@@ -1,12 +1,13 @@
> Name:           libevent
> Version:        2.0.18
>-Release:        2%{?dist}
>+Release:        3%{?dist}
> Summary:        Abstract asynchronous event notification library
> 
> Group:          System Environment/Libraries
> License:        BSD
> URL:            http://sourceforge.net/projects/levent/        
> Source0:        http://downloads.sourceforge.net/levent/%{name}-%{version}-stable.tar.gz
>+Source1:        event2-config-multilib-placeholder.h
> 
> BuildRequires: doxygen openssl-devel
> 
>@@ -68,6 +69,10 @@ mkdir -p $RPM_BUILD_ROOT/%{_docdir}/%{name}-devel-%{version}/sample
> (cd sample; \
> 	install -p -m 644 *.c Makefile* $RPM_BUILD_ROOT/%{_docdir}/%{name}-devel-%{version}/sample)
> 
>+# multilib issue fix
>+cp $RPM_BUILD_ROOT/%{_includedir}/event2/event-config.h $RPM_BUILD_ROOT/%{_includedir}/event2/event-config-%{_target_cpu}.h
>+cp %{SOURCE1} $RPM_BUILD_ROOT/%{_includedir}/event2/event-config.h
>+
> %post -p /sbin/ldconfig
> 
> %postun -p /sbin/ldconfig
>@@ -106,6 +111,9 @@ mkdir -p $RPM_BUILD_ROOT/%{_docdir}/%{name}-devel-%{version}/sample
> %{_docdir}/%{name}-devel-%{version}/sample/*
> 
> %changelog
>+* Tue Nov 20 2012 Dan McGregor <dan.mcgregor@usask.ca> - 2.0.18-3
>+- Make event-config.h architecture specific
>+
> * Thu Jul 19 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.0.18-2
> - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
> 
>-- 
>1.8.0
>

Actions: View | Diff

Attachments on bug 477685: 649409