summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-bsp/grub/grub-efi_2.00.bb2
-rw-r--r--meta/recipes-bsp/grub/grub_2.00.bb2
-rw-r--r--meta/recipes-bsp/grub/grub_git.bb2
-rw-r--r--meta/recipes-devtools/python/python.inc2
-rw-r--r--meta/recipes-devtools/python/python_2.7.11.bb3
-rw-r--r--meta/recipes-extended/pax/pax_3.4.bb4
-rw-r--r--meta/recipes-multimedia/libsndfile/libsndfile1_1.0.26.bb1
-rw-r--r--meta/recipes-support/curl/curl_7.47.1.bb4
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 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
36EXTRA_OECONF += "${@bb.utils.contains('DISTRO_FEATURES', 'largefile', '--enable-largefile ac_cv_sizeof_off_t=8', '--disable-largefile', d)}" 36EXTRA_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"
6EXTRA_OECONF = "--with-platform=pc --disable-grub-mkfont --program-prefix="" \ 6EXTRA_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
9EXTRA_OECONF += "${@bb.utils.contains('DISTRO_FEATURES', 'largefile', '--enable-largefile ac_cv_sizeof_off_t=8', '--disable-largefile', d)}" 9EXTRA_OECONF += "${@bb.utils.contains('DISTRO_FEATURES', 'largefile', '--enable-largefile', '--disable-largefile', d)}"
10 10
11do_install_append () { 11do_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"
31EXTRA_OECONF = "--with-platform=${GRUBPLATFORM} --disable-grub-mkfont --program-prefix="" \ 31EXTRA_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
34EXTRA_OECONF += "${@bb.utils.contains('DISTRO_FEATURES', 'largefile', '--enable-largefile ac_cv_sizeof_off_t=8', '--disable-largefile', d)}" 34EXTRA_OECONF += "${@bb.utils.contains('DISTRO_FEATURES', 'largefile', '--enable-largefile', '--disable-largefile', d)}"
35 35
36do_configure_prepend() { 36do_configure_prepend() {
37 ( cd ${S} 37 ( cd ${S}
diff --git a/meta/recipes-devtools/python/python.inc b/meta/recipes-devtools/python/python.inc
index 52250d27bb..f4818c6a87 100644
--- a/meta/recipes-devtools/python/python.inc
+++ b/meta/recipes-devtools/python/python.inc
@@ -20,8 +20,6 @@ PYTHON_MAJMIN = "2.7"
20 20
21inherit autotools 21inherit autotools
22 22
23PYTHONLSBOPTS_linuxstdbase = "ac_cv_sizeof_off_t=8"
24
25EXTRA_OECONF = "\ 23EXTRA_OECONF = "\
26 --with-threads \ 24 --with-threads \
27 --with-pymalloc \ 25 --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 0c00d6e4e4..606f153623 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
35 35
36CONFIGUREOPTS += " --with-system-ffi " 36CONFIGUREOPTS += " --with-system-ffi "
37 37
38# The following is a hack until we drop ac_cv_sizeof_off_t from site files 38EXTRA_OECONF += "ac_cv_file__dev_ptmx=yes ac_cv_file__dev_ptc=no"
39EXTRA_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"
40 39
41do_configure_append() { 40do_configure_append() {
42 rm -f ${S}/Makefile.orig 41 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 cee52e3e57..9d1abfbb54 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 \
25SRC_URI[md5sum] = "fbd9023b590b45ac3ade95870702a0d6" 25SRC_URI[md5sum] = "fbd9023b590b45ac3ade95870702a0d6"
26SRC_URI[sha256sum] = "ac3c06048e02828077cf7757d3d142241429238893b91d529af29a2e8cc5623b" 26SRC_URI[sha256sum] = "ac3c06048e02828077cf7757d3d142241429238893b91d529af29a2e8cc5623b"
27 27
28# see https://lists.yoctoproject.org/pipermail/poky/2013-December/009435.html
29# We should ideally drop ac_cv_sizeof_off_t from site files but until then
30EXTRA_OECONF += "${@bb.utils.contains('DISTRO_FEATURES', 'largefile', 'ac_cv_sizeof_off_t=8', '', d)}"
31
32inherit autotools 28inherit autotools
diff --git a/meta/recipes-multimedia/libsndfile/libsndfile1_1.0.26.bb b/meta/recipes-multimedia/libsndfile/libsndfile1_1.0.26.bb
index a5ac84e301..80435d4b5b 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
22do_configure_prepend_arm() { 22do_configure_prepend_arm() {
23 export ac_cv_sys_largefile_source=1 23 export ac_cv_sys_largefile_source=1
24 export ac_cv_sys_file_offset_bits=64 24 export ac_cv_sys_file_offset_bits=64
25 ac_cv_sizeof_off_t=8
26} 25}
27 26
diff --git a/meta/recipes-support/curl/curl_7.47.1.bb b/meta/recipes-support/curl/curl_7.47.1.bb
index 7e2664c2d9..c2173d8a06 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 = " \
49 --without-nghttp2 \ 49 --without-nghttp2 \
50" 50"
51 51
52# see https://lists.yoctoproject.org/pipermail/poky/2013-December/009435.html
53# We should ideally drop ac_cv_sizeof_off_t from site files but until then
54EXTRA_OECONF += "${@bb.utils.contains('DISTRO_FEATURES', 'largefile', 'ac_cv_sizeof_off_t=8', '', d)}"
55
56do_install_append() { 52do_install_append() {
57 oe_multilib_header curl/curlbuild.h 53 oe_multilib_header curl/curlbuild.h
58} 54}