Skip to content

Commit

Permalink
Merge branch 'jb44579' into 'master'
Browse files Browse the repository at this point in the history
Add large-file support.

See merge request mer-core/coreutils!3
  • Loading branch information
Matti Kosola committed Jan 25, 2019
2 parents 969dd51 + 00fa121 commit 4b5b0f2
Show file tree
Hide file tree
Showing 3 changed files with 47 additions and 0 deletions.
33 changes: 33 additions & 0 deletions coreutils-large-file.patch
@@ -0,0 +1,33 @@
diff -Naur coreutils-6.9/Makefile.in coreutils-6.9-new/Makefile.in
--- coreutils-6.9/Makefile.in 2007-03-22 17:20:26.000000000 -0400
+++ coreutils-6.9-new/Makefile.in 2019-01-25 01:36:58.469869151 -0500
@@ -258,6 +258,7 @@
CFLAGS = @CFLAGS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
+CPPFLAGS += -D_FILE_OFFSET_BITS=64
CYGPATH_W = @CYGPATH_W@
DEFAULT_POSIX2_VERSION = @DEFAULT_POSIX2_VERSION@
DEFS = @DEFS@
diff -Naur coreutils-6.9/lib/Makefile.in coreutils-6.9-new/lib/Makefile.in
--- coreutils-6.9/lib/Makefile.in 2007-03-22 17:20:22.000000000 -0400
+++ coreutils-6.9-new/lib/Makefile.in 2019-01-25 01:36:58.288869079 -0500
@@ -272,6 +272,7 @@
CFLAGS = @CFLAGS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
+CPPFLAGS += -D_FILE_OFFSET_BITS=64
CYGPATH_W = @CYGPATH_W@
DEFAULT_POSIX2_VERSION = @DEFAULT_POSIX2_VERSION@
DEFS = @DEFS@
diff -Naur coreutils-6.9/src/Makefile.in coreutils-6.9-new/src/Makefile.in
--- coreutils-6.9/src/Makefile.in 2007-03-22 17:23:20.000000000 -0400
+++ coreutils-6.9-new/src/Makefile.in 2019-01-25 01:36:58.443869140 -0500
@@ -740,6 +740,7 @@
CFLAGS = @CFLAGS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
+CPPFLAGS += -D_FILE_OFFSET_BITS=64
CYGPATH_W = @CYGPATH_W@
DEFAULT_POSIX2_VERSION = @DEFAULT_POSIX2_VERSION@
DEFS = @DEFS@
4 changes: 4 additions & 0 deletions coreutils.spec
Expand Up @@ -43,6 +43,8 @@ Patch916: coreutils-getfacl-exit-code.patch

Patch1001: mktemp-1.5-build.patch
Patch1002: coreutils-aarch64.patch
Patch1003: mktemp-1.5-large-file.patch
Patch1004: coreutils-large-file.patch

BuildRequires: libacl-devel
BuildRequires: gettext bison
Expand Down Expand Up @@ -113,6 +115,7 @@ Man and info pages for %{name}.
%patch915 -p1 -b .splitl
%patch916 -p1 -b .getfacl-exit-code
%patch1002 -p1
%patch1004 -p1

# Don't run basic-1 test, since it breaks when run in the background
# (bug #102033).
Expand All @@ -126,6 +129,7 @@ cp build-aux/config.sub ../mktemp-1.5

pushd ../mktemp-1.5
patch -p1 < %{PATCH1001}
patch -p1 < %{PATCH1003}
%configure
make
popd
Expand Down
10 changes: 10 additions & 0 deletions mktemp-1.5-large-file.patch
@@ -0,0 +1,10 @@
--- mktemp-1.5/Makefile.in.orig 2019-01-24 09:32:57.765705894 -0500
+++ mktemp-1.5/Makefile.in 2019-01-24 09:33:49.539774295 -0500
@@ -54,6 +54,7 @@

# C preprocessor flags
CPPFLAGS = -I$(srcdir) -I. "-DMKTEMP_VERSION=\"$(VERSION)\"" @CPPFLAGS@
+CPPFLAGS += -D_FILE_OFFSET_BITS=64

# Usually -O and/or -g
CFLAGS = @CFLAGS@

0 comments on commit 4b5b0f2

Please sign in to comment.