diff options
-rw-r--r-- | meta-filesystems/recipes-utils/fatresize/fatresize/0001-configure-Do-not-add-D_FILE_OFFSET_BITS-to-CFLAGS.patch | 34 | ||||
-rw-r--r-- | meta-filesystems/recipes-utils/fatresize/fatresize_1.1.0.bb | 3 |
2 files changed, 35 insertions, 2 deletions
diff --git a/meta-filesystems/recipes-utils/fatresize/fatresize/0001-configure-Do-not-add-D_FILE_OFFSET_BITS-to-CFLAGS.patch b/meta-filesystems/recipes-utils/fatresize/fatresize/0001-configure-Do-not-add-D_FILE_OFFSET_BITS-to-CFLAGS.patch new file mode 100644 index 000000000..d0ecdcba4 --- /dev/null +++ b/meta-filesystems/recipes-utils/fatresize/fatresize/0001-configure-Do-not-add-D_FILE_OFFSET_BITS-to-CFLAGS.patch | |||
@@ -0,0 +1,34 @@ | |||
1 | From 69647e5d393a52ed3892eccc172ee750d6aaa45d Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Fri, 30 Dec 2022 21:08:25 -0800 | ||
4 | Subject: [PATCH] configure: Do not add -D_FILE_OFFSET_BITS to CFLAGS | ||
5 | |||
6 | AC_SYS_LARGEFILE macro is in use and this will add a definition for | ||
7 | _FILE_OFFSET_BITS in generated config.h which is already included as | ||
8 | first include file in fatresize.c hence its not required to be added via | ||
9 | CFLAGS, this also fixes a case when -D_FILE_OFFSET_BITS=64 is passed via | ||
10 | CC from environment, where the autoconf macros set | ||
11 | ac_cv_sys_file_offset_bits=no and that means we will have | ||
12 | -D_FILE_OFFSET_BITS=no added to CFLAGS which messes up builds. | ||
13 | |||
14 | Upstream-Status: Submitted [https://salsa.debian.org/parted-team/fatresize/-/merge_requests/3] | ||
15 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
16 | --- | ||
17 | configure.ac | 1 - | ||
18 | 1 file changed, 1 deletion(-) | ||
19 | |||
20 | diff --git a/configure.ac b/configure.ac | ||
21 | index d6e6cb2..4dcec28 100644 | ||
22 | --- a/configure.ac | ||
23 | +++ b/configure.ac | ||
24 | @@ -29,7 +29,6 @@ AC_CHECK_FUNCS([memset strtoll]) | ||
25 | |||
26 | # Check for LFS | ||
27 | AC_SYS_LARGEFILE | ||
28 | -CFLAGS="$CFLAGS -D_FILE_OFFSET_BITS=${ac_cv_sys_file_offset_bits}" | ||
29 | |||
30 | dnl libparted | ||
31 | # hack | ||
32 | -- | ||
33 | 2.39.0 | ||
34 | |||
diff --git a/meta-filesystems/recipes-utils/fatresize/fatresize_1.1.0.bb b/meta-filesystems/recipes-utils/fatresize/fatresize_1.1.0.bb index 1ca8bb3fe..cf7ac62be 100644 --- a/meta-filesystems/recipes-utils/fatresize/fatresize_1.1.0.bb +++ b/meta-filesystems/recipes-utils/fatresize/fatresize_1.1.0.bb | |||
@@ -5,11 +5,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" | |||
5 | 5 | ||
6 | SRC_URI = "git://salsa.debian.org/parted-team/fatresize.git;protocol=https;branch=master \ | 6 | SRC_URI = "git://salsa.debian.org/parted-team/fatresize.git;protocol=https;branch=master \ |
7 | file://0001-build-Do-not-build-.sgml-file.patch \ | 7 | file://0001-build-Do-not-build-.sgml-file.patch \ |
8 | file://0001-configure-Do-not-add-D_FILE_OFFSET_BITS-to-CFLAGS.patch \ | ||
8 | " | 9 | " |
9 | SRCREV = "12da22087de2ec43f0fe5af1237389e94619c483" | 10 | SRCREV = "12da22087de2ec43f0fe5af1237389e94619c483" |
10 | 11 | ||
11 | PV = "1.1.0" | ||
12 | |||
13 | S = "${WORKDIR}/git" | 12 | S = "${WORKDIR}/git" |
14 | 13 | ||
15 | DEPENDS = "parted" | 14 | DEPENDS = "parted" |