diff options
author | Ross Burton <ross.burton@intel.com> | 2016-04-11 20:49:23 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-04-12 22:50:21 +0100 |
commit | acc1f968a047f83442aac1ac876212b2512756d9 (patch) | |
tree | 1f541292bfad56a92010856d797e72fb3fd6c301 /meta/recipes-bsp | |
parent | 92759d8662b21785ae84375dc698b762c4e1cc9b (diff) | |
download | poky-acc1f968a047f83442aac1ac876212b2512756d9.tar.gz |
meta: remove redundant ac_cv_sizeof_off_t assignments
ac_cv_sizeof_off_t was previously in the site cache files, which was breaking
large file support and required a workaround in each recipe that actually wanted
to use large files.
Now that the entry has been removed from the site cache, we can remove the
workarounds.
(From OE-Core rev: 1485d7cae88adb3575c6eaa47784fe50820d2740)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-bsp')
-rw-r--r-- | meta/recipes-bsp/grub/grub-efi_2.00.bb | 2 | ||||
-rw-r--r-- | meta/recipes-bsp/grub/grub_2.00.bb | 2 | ||||
-rw-r--r-- | meta/recipes-bsp/grub/grub_git.bb | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/meta/recipes-bsp/grub/grub-efi_2.00.bb b/meta/recipes-bsp/grub/grub-efi_2.00.bb index dbc034ce54..5a0dc954a3 100644 --- a/meta/recipes-bsp/grub/grub-efi_2.00.bb +++ b/meta/recipes-bsp/grub/grub-efi_2.00.bb | |||
@@ -33,7 +33,7 @@ EXTRA_OECONF = "--with-platform=efi --disable-grub-mkfont \ | |||
33 | --enable-efiemu=no --program-prefix='' \ | 33 | --enable-efiemu=no --program-prefix='' \ |
34 | --enable-liblzma=no --enable-device-mapper=no --enable-libzfs=no" | 34 | --enable-liblzma=no --enable-device-mapper=no --enable-libzfs=no" |
35 | 35 | ||
36 | EXTRA_OECONF += "${@bb.utils.contains('DISTRO_FEATURES', 'largefile', '--enable-largefile ac_cv_sizeof_off_t=8', '--disable-largefile', d)}" | 36 | EXTRA_OECONF += "${@bb.utils.contains('DISTRO_FEATURES', 'largefile', '--enable-largefile', '--disable-largefile', d)}" |
37 | 37 | ||
38 | # ldm.c:114:7: error: trampoline generated for nested function 'hook' [-Werror=trampolines] | 38 | # ldm.c:114:7: error: trampoline generated for nested function 'hook' [-Werror=trampolines] |
39 | # and many other places in the grub code when compiled with some native gcc compilers (specifically, gentoo) | 39 | # and many other places in the grub code when compiled with some native gcc compilers (specifically, gentoo) |
diff --git a/meta/recipes-bsp/grub/grub_2.00.bb b/meta/recipes-bsp/grub/grub_2.00.bb index addc1b2833..778074a387 100644 --- a/meta/recipes-bsp/grub/grub_2.00.bb +++ b/meta/recipes-bsp/grub/grub_2.00.bb | |||
@@ -6,7 +6,7 @@ PR = "r1" | |||
6 | EXTRA_OECONF = "--with-platform=pc --disable-grub-mkfont --program-prefix="" \ | 6 | EXTRA_OECONF = "--with-platform=pc --disable-grub-mkfont --program-prefix="" \ |
7 | --enable-liblzma=no --enable-device-mapper=no --enable-libzfs=no" | 7 | --enable-liblzma=no --enable-device-mapper=no --enable-libzfs=no" |
8 | 8 | ||
9 | EXTRA_OECONF += "${@bb.utils.contains('DISTRO_FEATURES', 'largefile', '--enable-largefile ac_cv_sizeof_off_t=8', '--disable-largefile', d)}" | 9 | EXTRA_OECONF += "${@bb.utils.contains('DISTRO_FEATURES', 'largefile', '--enable-largefile', '--disable-largefile', d)}" |
10 | 10 | ||
11 | do_install_append () { | 11 | do_install_append () { |
12 | install -d ${D}${sysconfdir}/grub.d | 12 | install -d ${D}${sysconfdir}/grub.d |
diff --git a/meta/recipes-bsp/grub/grub_git.bb b/meta/recipes-bsp/grub/grub_git.bb index 3ebab7f2f8..6919c9a351 100644 --- a/meta/recipes-bsp/grub/grub_git.bb +++ b/meta/recipes-bsp/grub/grub_git.bb | |||
@@ -31,7 +31,7 @@ GRUBPLATFORM ??= "pc" | |||
31 | EXTRA_OECONF = "--with-platform=${GRUBPLATFORM} --disable-grub-mkfont --program-prefix="" \ | 31 | EXTRA_OECONF = "--with-platform=${GRUBPLATFORM} --disable-grub-mkfont --program-prefix="" \ |
32 | --enable-liblzma=no --enable-device-mapper=no --enable-libzfs=no" | 32 | --enable-liblzma=no --enable-device-mapper=no --enable-libzfs=no" |
33 | 33 | ||
34 | EXTRA_OECONF += "${@bb.utils.contains('DISTRO_FEATURES', 'largefile', '--enable-largefile ac_cv_sizeof_off_t=8', '--disable-largefile', d)}" | 34 | EXTRA_OECONF += "${@bb.utils.contains('DISTRO_FEATURES', 'largefile', '--enable-largefile', '--disable-largefile', d)}" |
35 | 35 | ||
36 | do_configure_prepend() { | 36 | do_configure_prepend() { |
37 | ( cd ${S} | 37 | ( cd ${S} |