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. Signed-off-by: Ross Burton <[email protected]> --- meta/recipes-bsp/grub/grub-efi_2.00.bb | 2 +- meta/recipes-bsp/grub/grub_2.00.bb | 2 +- meta/recipes-bsp/grub/grub_git.bb | 2 +- meta/recipes-devtools/python/python.inc | 2 -- meta/recipes-devtools/python/python_2.7.11.bb | 3 +-- meta/recipes-extended/pax/pax_3.4.bb | 4 ---- meta/recipes-multimedia/libsndfile/libsndfile1_1.0.26.bb | 1 - meta/recipes-support/curl/curl_7.47.1.bb | 4 ---- 8 files changed, 4 insertions(+), 16 deletions(-) diff --git a/meta/recipes-bsp/grub/grub-efi_2.00.bb b/meta/recipes-bsp/grub/grub-efi_2.00.bb index dbc034c..5a0dc95 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 \ --enable-efiemu=no --program-prefix='' \ --enable-liblzma=no --enable-device-mapper=no --enable-libzfs=no" -EXTRA_OECONF += "${@bb.utils.contains('DISTRO_FEATURES', 'largefile', '--enable-largefile ac_cv_sizeof_off_t=8', '--disable-largefile', d)}" +EXTRA_OECONF += "${@bb.utils.contains('DISTRO_FEATURES', 'largefile', '--enable-largefile', '--disable-largefile', d)}" # ldm.c:114:7: error: trampoline generated for nested function 'hook' [-Werror=trampolines] # 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 addc1b2..778074a 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" EXTRA_OECONF = "--with-platform=pc --disable-grub-mkfont --program-prefix="" \ --enable-liblzma=no --enable-device-mapper=no --enable-libzfs=no" -EXTRA_OECONF += "${@bb.utils.contains('DISTRO_FEATURES', 'largefile', '--enable-largefile ac_cv_sizeof_off_t=8', '--disable-largefile', d)}" +EXTRA_OECONF += "${@bb.utils.contains('DISTRO_FEATURES', 'largefile', '--enable-largefile', '--disable-largefile', d)}" do_install_append () { 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 3ebab7f..6919c9a 100644 --- a/meta/recipes-bsp/grub/grub_git.bb +++ b/meta/recipes-bsp/grub/grub_git.bb @@ -31,7 +31,7 @@ GRUBPLATFORM ??= "pc" EXTRA_OECONF = "--with-platform=${GRUBPLATFORM} --disable-grub-mkfont --program-prefix="" \ --enable-liblzma=no --enable-device-mapper=no --enable-libzfs=no" -EXTRA_OECONF += "${@bb.utils.contains('DISTRO_FEATURES', 'largefile', '--enable-largefile ac_cv_sizeof_off_t=8', '--disable-largefile', d)}" +EXTRA_OECONF += "${@bb.utils.contains('DISTRO_FEATURES', 'largefile', '--enable-largefile', '--disable-largefile', d)}" do_configure_prepend() { ( cd ${S} diff --git a/meta/recipes-devtools/python/python.inc b/meta/recipes-devtools/python/python.inc index 52250d2..f4818c6 100644 --- a/meta/recipes-devtools/python/python.inc +++ b/meta/recipes-devtools/python/python.inc @@ -20,8 +20,6 @@ PYTHON_MAJMIN = "2.7" inherit autotools -PYTHONLSBOPTS_linuxstdbase = "ac_cv_sizeof_off_t=8" - EXTRA_OECONF = "\ --with-threads \ --with-pymalloc \ diff --git a/meta/recipes-devtools/python/python_2.7.11.bb b/meta/recipes-devtools/python/python_2.7.11.bb index 0c00d6e..606f153 100644 --- a/meta/recipes-devtools/python/python_2.7.11.bb +++ b/meta/recipes-devtools/python/python_2.7.11.bb @@ -35,8 +35,7 @@ inherit autotools multilib_header python-dir pythonnative CONFIGUREOPTS += " --with-system-ffi " -# The following is a hack until we drop ac_cv_sizeof_off_t from site files -EXTRA_OECONF += "${@bb.utils.contains('DISTRO_FEATURES', 'largefile', 'ac_cv_sizeof_off_t=8', '', d)} ac_cv_file__dev_ptmx=yes ac_cv_file__dev_ptc=no" +EXTRA_OECONF += "ac_cv_file__dev_ptmx=yes ac_cv_file__dev_ptc=no" do_configure_append() { rm -f ${S}/Makefile.orig diff --git a/meta/recipes-extended/pax/pax_3.4.bb b/meta/recipes-extended/pax/pax_3.4.bb index cee52e3..9d1abfb 100644 --- a/meta/recipes-extended/pax/pax_3.4.bb +++ b/meta/recipes-extended/pax/pax_3.4.bb @@ -25,8 +25,4 @@ SRC_URI_append_libc-musl = " file://0001-Fix-build-with-musl.patch \ SRC_URI[md5sum] = "fbd9023b590b45ac3ade95870702a0d6" SRC_URI[sha256sum] = "ac3c06048e02828077cf7757d3d142241429238893b91d529af29a2e8cc5623b" -# see https://lists.yoctoproject.org/pipermail/poky/2013-December/009435.html -# We should ideally drop ac_cv_sizeof_off_t from site files but until then -EXTRA_OECONF += "${@bb.utils.contains('DISTRO_FEATURES', 'largefile', 'ac_cv_sizeof_off_t=8', '', d)}" - inherit autotools diff --git a/meta/recipes-multimedia/libsndfile/libsndfile1_1.0.26.bb b/meta/recipes-multimedia/libsndfile/libsndfile1_1.0.26.bb index a5ac84e..80435d4 100644 --- a/meta/recipes-multimedia/libsndfile/libsndfile1_1.0.26.bb +++ b/meta/recipes-multimedia/libsndfile/libsndfile1_1.0.26.bb @@ -22,6 +22,5 @@ inherit autotools lib_package pkgconfig do_configure_prepend_arm() { export ac_cv_sys_largefile_source=1 export ac_cv_sys_file_offset_bits=64 - ac_cv_sizeof_off_t=8 } diff --git a/meta/recipes-support/curl/curl_7.47.1.bb b/meta/recipes-support/curl/curl_7.47.1.bb index 7e2664c..c2173d8 100644 --- a/meta/recipes-support/curl/curl_7.47.1.bb +++ b/meta/recipes-support/curl/curl_7.47.1.bb @@ -49,10 +49,6 @@ EXTRA_OECONF = " \ --without-nghttp2 \ " -# see https://lists.yoctoproject.org/pipermail/poky/2013-December/009435.html -# We should ideally drop ac_cv_sizeof_off_t from site files but until then -EXTRA_OECONF += "${@bb.utils.contains('DISTRO_FEATURES', 'largefile', 'ac_cv_sizeof_off_t=8', '', d)}" - do_install_append() { oe_multilib_header curl/curlbuild.h } -- 2.8.0.rc3 -- _______________________________________________ Openembedded-core mailing list [email protected] http://lists.openembedded.org/mailman/listinfo/openembedded-core
