1
0
forked from pool/xfsdump

Accepting request 500241 from home:jeff_mahoney:branches:filesystems

Fixes build failure against updated xfsprogs-devel.

OBS-URL: https://build.opensuse.org/request/show/500241
OBS-URL: https://build.opensuse.org/package/show/filesystems/xfsdump?expand=0&rev=26
This commit is contained in:
David Sterba 2017-06-05 14:30:14 +00:00 committed by Git OBS Bridge
parent 14be51afee
commit 8d1d702852
3 changed files with 46 additions and 1 deletions

View File

@ -0,0 +1,32 @@
From: Eric Sandeen <sandeen@sandeen.net>
Subject: xfsdump: fix build on 32-bit platforms
Patch-mainlne: Submitted to linux-xfs, 17 Feb 2017
Now that xfsprogs requires anyone using the headers to
properly define 64-bit file access, xfsdump has stopped
building on 32-bit platforms.
I think this is all it needs; works for me here.
Signed-off-by: Eric Sandeen <sandeen@redhat.com>
Acked-by: Jeff Mahoney <jeffm@suse.com>
---
cc: Eric Biggers because he seems to enjoy this stuff :)
configure.ac | 2 ++
1 file changed, 2 insertions(+)
diff --git a/configure.ac b/configure.ac
index 7bb6f1d..8d78ed4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6,6 +6,8 @@ AC_CONFIG_SRCDIR([common/main.c])
AC_CONFIG_HEADER(include/config.h)
AC_PREFIX_DEFAULT(/usr)
+AC_SYS_LARGEFILE
+
AC_PROG_LIBTOOL
AC_ARG_ENABLE(shared,

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Wed May 31 19:29:27 UTC 2017 - jeffm@suse.com
- Fix building on 32-bit architectures with updated xfsprogs.
- Added xfsdump-fix-build-on-32-bit-platforms.patch
-------------------------------------------------------------------
Thu Nov 19 18:42:47 UTC 2015 - jeffm@suse.com

View File

@ -1,7 +1,7 @@
#
# spec file for package xfsdump
#
# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -27,8 +27,12 @@ Source0: ftp://oss.sgi.com/projects/xfs/cmd_tars/xfsdump-%{version}.tar.g
Source1: ftp://oss.sgi.com/projects/xfs/cmd_tars/xfsdump-%{version}.tar.gz.sig
Source2: %{name}.keyring
Patch0: xfsdump-docdir.diff
Patch1: xfsdump-fix-build-on-32-bit-platforms.patch
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: e2fsprogs-devel
BuildRequires: libattr-devel
BuildRequires: libtool
BuildRequires: ncurses-devel
BuildRequires: xfsprogs-devel
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@ -53,8 +57,11 @@ subtrees may be restored from full or partial backups.
%prep
%setup -q
%patch0
%patch1 -p1
%build
rm -f configure
make configure
export DEBUG=-DNDEBUG
%configure --bindir=%{_sbindir}
make %{?_smp_mflags}