Gentoo Archives: gentoo-commits

From: Jeroen Roovers <jer@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-fs/mac-fdisk/, sys-fs/mac-fdisk/files/
Date: Sun, 25 Nov 2018 20:08:25
Message-Id: 1543176495.51ea732868abe708e2fb20bfe4f6190e065847d6.jer@gentoo
1 commit: 51ea732868abe708e2fb20bfe4f6190e065847d6
2 Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
3 AuthorDate: Sun Nov 25 20:07:53 2018 +0000
4 Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
5 CommitDate: Sun Nov 25 20:08:15 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=51ea7328
7
8 sys-fs/mac-fdisk: Define lseek64 properly
9
10 Bug: https://bugs.gentoo.org/671860
11 Package-Manager: Portage-2.3.52, Repoman-2.3.12
12 Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org>
13
14 .../files/mac-fdisk-0.1_p18-lseek64.patch | 43 ++++++++++++++++++++++
15 sys-fs/mac-fdisk/mac-fdisk-0.1_p18.ebuild | 9 +++--
16 2 files changed, 48 insertions(+), 4 deletions(-)
17
18 diff --git a/sys-fs/mac-fdisk/files/mac-fdisk-0.1_p18-lseek64.patch b/sys-fs/mac-fdisk/files/mac-fdisk-0.1_p18-lseek64.patch
19 new file mode 100644
20 index 00000000000..d075d4760b8
21 --- /dev/null
22 +++ b/sys-fs/mac-fdisk/files/mac-fdisk-0.1_p18-lseek64.patch
23 @@ -0,0 +1,43 @@
24 +--- a/fdisk.c
25 ++++ b/fdisk.c
26 +@@ -59,6 +59,10 @@
27 + */
28 +
29 +
30 ++#ifndef _LARGEFILE64_SOURCE
31 ++#define _LARGEFILE64_SOURCE
32 ++#endif
33 ++#include <sys/types.h>
34 + #include <unistd.h>
35 + #include <stdio.h>
36 + #include <stdlib.h>
37 +--- a/fdisklabel.c
38 ++++ b/fdisklabel.c
39 +@@ -35,6 +35,9 @@
40 + SUCH DAMAGE.
41 + */
42 +
43 ++#ifndef _LARGEFILE64_SOURCE
44 ++#define _LARGEFILE64_SOURCE
45 ++#endif
46 + #include <sys/types.h>
47 + #include <unistd.h>
48 + #include <stdio.h>
49 +--- a/io.c
50 ++++ b/io.c
51 +@@ -25,6 +25,7 @@
52 + * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
53 + */
54 +
55 ++#define _LARGEFILE64_SOURCE
56 + #include <stdio.h>
57 + #include <stdlib.h>
58 + #include <fcntl.h>
59 +@@ -37,6 +38,7 @@
60 + #endif
61 + #endif
62 + #include <linux/unistd.h>
63 ++#include <sys/types.h>
64 + #include <unistd.h>
65 + #include <string.h>
66 + #include <stdarg.h>
67
68 diff --git a/sys-fs/mac-fdisk/mac-fdisk-0.1_p18.ebuild b/sys-fs/mac-fdisk/mac-fdisk-0.1_p18.ebuild
69 index 4860ff66c37..195bc833586 100644
70 --- a/sys-fs/mac-fdisk/mac-fdisk-0.1_p18.ebuild
71 +++ b/sys-fs/mac-fdisk/mac-fdisk-0.1_p18.ebuild
72 @@ -20,15 +20,16 @@ PATCHES=(
73 "${WORKDIR}"/${PN}_${PV/_p*}-${PV/*_p}.diff
74 "${FILESDIR}"/largerthan2gb.patch
75 "${FILESDIR}"/${PN}-0.1-headers.patch
76 - ### Patch for bug #142737
77 + # Patch for bug #142737
78 "${FILESDIR}"/${PN}-0.1_p16-ppc64.patch
79 ### Patch for building on amd64
80 "${FILESDIR}"/${PN}-amd64.patch
81 - ### Patch for large (>550GB disks)
82 - ### Note that >=2TB disks may not work due to limitations of the Mac
83 - ### Partition Table structure, this needs to be investigated
84 + # Patch for large (>550GB disks)
85 + # Note that >=2TB disks may not work due to limitations of the Mac
86 + # Partition Table structure, this needs to be investigated
87 "${FILESDIR}"/big_pt.patch
88 "${FILESDIR}"/${PN}-0.1_p16-ppc-inline.patch
89 + "${FILESDIR}"/${PN}-0.1_p18-lseek64.patch
90 )
91
92 src_compile() {