rpms/e2fsprogs
7
0
Fork 1
Code Issues Pull Requests Releases Activity

Remove multiarch wrappers

Browse Source 
Remove manually created multiarch wrappers and replace it with rpm
multilib_fix_c_header marco.

Signed-off-by: Lukas Czerner <lczerner@redhat.com>
This commit is contained in:
Lukas Czerner 2018-06-25 17:47:10 +02:00
parent 52e597d6f5
commit f7cf69f459
3 changed files with 3 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
blkid_types-wrapper.h
View File

@ -1,29 +0,0 @@
/* This file is here to prevent a file conflict on multiarch systems. A
* conflict will occur because blkid_types.h has arch-specific definitions.
*
* DO NOT INCLUDE THE NEW FILE DIRECTLY -- ALWAYS INCLUDE THIS ONE INSTEAD. */
#if defined(__i386__)
#include "blkid_types-i386.h"
#elif defined(__powerpc64__)
#include "blkid_types-ppc64.h"
#elif defined(__powerpc__)
#include "blkid_types-ppc.h"
#elif defined(__s390x__)
#include "blkid_types-s390x.h"
#elif defined(__s390__)
#include "blkid_types-s390.h"
#elif defined(__x86_64__)
#include "blkid_types-x86_64.h"
#elif defined(__alpha__)
#include "blkid_types-alpha.h"
#elif defined(__arm__)
#include "blkid_types-arm.h"
#elif defined(__sparc__) && defined(__arch64__)
#include "blkid_types-sparc64.h"
#elif defined(__sparc__)
#include "blkid_types-sparc.h"
#else
#error "This e2fsprogs-devel package does not work your architecture?"
#endif

12
e2fsprogs.spec
View File

@ -7,7 +7,6 @@ Release: 0%{?dist}
License: GPLv2
Group: System Environment/Base
Source0: https://www.kernel.org/pub/linux/kernel/people/tytso/%{name}/v%{version}/%{name}-%{version}.tar.xz
Source1: ext2_types-wrapper.h
Url: http://e2fsprogs.sourceforge.net/
Requires: e2fsprogs-libs%{?_isa} = %{version}-%{release}
@ -26,6 +25,7 @@ BuildRequires: libsepol-devel
BuildRequires: libblkid-devel
BuildRequires: libuuid-devel
BuildRequires: gettext
BuildRequires: multilib-rpm-config
%description
The e2fsprogs package contains a number of utilities for creating,
@ -157,14 +157,8 @@ export PATH=/sbin:$PATH
make install install-libs DESTDIR=%{buildroot} INSTALL="%{__install} -p" \
root_sbindir=%{_sbindir} root_libdir=%{_libdir}
# ugly hack to allow parallel install of 32-bit and 64-bit -devel packages:
%define multilib_arches %{ix86} x86_64 ppc ppc64 s390 s390x sparcv9 sparc64
%ifarch %{multilib_arches}
mv -f %{buildroot}%{_includedir}/ext2fs/ext2_types.h \
%{buildroot}%{_includedir}/ext2fs/ext2_types-%{_arch}.h
install -p -m 644 %{SOURCE1} %{buildroot}%{_includedir}/ext2fs/ext2_types.h
%endif
# Replace arch-dependent header file with arch-independent stub (when needed).
%multilib_fix_c_header --file %{_includedir}/ext2fs/ext2_types.h
# Hack for now, otherwise strip fails.
chmod +w %{buildroot}%{_libdir}/*.a

29
ext2_types-wrapper.h
View File

@ -1,29 +0,0 @@
/* This file is here to prevent a file conflict on multiarch systems. A
* conflict will occur because ext2_types.h has arch-specific definitions.
*
* DO NOT INCLUDE THE NEW FILE DIRECTLY -- ALWAYS INCLUDE THIS ONE INSTEAD. */
#if defined(__i386__)
#include "ext2_types-i386.h"
#elif defined(__powerpc64__)
#include "ext2_types-ppc64.h"
#elif defined(__powerpc__)
#include "ext2_types-ppc.h"
#elif defined(__s390x__)
#include "ext2_types-s390x.h"
#elif defined(__s390__)
#include "ext2_types-s390.h"
#elif defined(__x86_64__)
#include "ext2_types-x86_64.h"
#elif defined(__alpha__)
#include "ext2_types-alpha.h"
#elif defined(__arm__)
#include "ext2_types-arm.h"
#elif defined(__sparc__) && defined(__arch64__)
#include "ext2_types-sparc64.h"
#elif defined(__sparc__)
#include "ext2_types-sparc.h"
#else
#error "This e2fsprogs-devel package does not work your architecture?"
#endif