From 3237ff5922e9b49fadcab3aaa8d6bfb539c0431f Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Jul 28 2017 18:40:55 +0000 Subject: use -D_FILE_OFFSET_BITS=64 to force off_t to be 64bit on 32bit arches --- diff --git a/fuse.spec b/fuse.spec index d9ede43..c9f93be 100644 --- a/fuse.spec +++ b/fuse.spec @@ -4,7 +4,7 @@ Name: fuse Version: %{fuse2ver} -Release: 6%{?dist} +Release: 7%{?dist} Summary: File System in Userspace (FUSE) v2 utilities License: GPL+ URL: http://fuse.sf.net @@ -13,7 +13,6 @@ Source0: https://github.com/libfuse/libfuse/archive/%{name}-%{fuse2ver}.tar.gz #fuse3 sources Source1: https://github.com/libfuse/libfuse/archive/%{name}-%{fuse3ver}.tar.gz Source2: %{name}.conf -Source3: printsize.c Patch1: fuse-3.0.0-More-parentheses.patch Patch2: fuse-0001-More-parentheses.patch @@ -102,11 +101,6 @@ Common files for FUSE v2 and FUSE v3. %prep %setup -q -T -c -n fuse2and3 -a0 -a1 -cp %{SOURCE3} . -gcc -o printsize printsize.c -echo "%{_arch}" -./printsize - # fuse 3 pushd lib%{name}-%{name}-%{fuse3ver} ./makeconf.sh @@ -129,7 +123,7 @@ popd pushd lib%{name}-%{name}-%{fuse3ver} # Can't pass --disable-static here, or else the utils don't build export MOUNT_FUSE_PATH="%{_sbindir}" -CFLAGS="%{optflags} -D_GNU_SOURCE" %configure +CFLAGS="%{optflags} -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64" %configure make %{?_smp_mflags} popd @@ -232,6 +226,9 @@ rm -f %{buildroot}%{_libdir}/udev/rules.d/99-fuse3.rules %{_includedir}/fuse3/ %changelog +* Fri Jul 28 2017 Tom Callaway - 2.9.7-7 +- use -D_FILE_OFFSET_BITS=64 to force off_t to be 64bit on 32bit arches + * Wed Jul 26 2017 Fedora Release Engineering - 2.9.7-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild diff --git a/printsize.c b/printsize.c deleted file mode 100644 index bc0f629..0000000 --- a/printsize.c +++ /dev/null @@ -1,12 +0,0 @@ -#include -#include -#include - -void main() { - int sizeof_off_t = sizeof(off_t); - int sizeof_uint64_t = sizeof(uint64_t); - int sizeof_uintptr_t = sizeof(uintptr_t); - printf("Size of off_t is: %d\n", sizeof_off_t); - printf("Size of uint64_t is: %d\n", sizeof_uint64_t); - printf("Size of uintptr_t is: %d\n", sizeof_uintptr_t); -}