aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2010-07-07 17:08:56 -0700
committerKhem Raj <raj.khem@gmail.com>2010-07-08 17:23:56 -0700
commit1df15db347b0950694e78289b4a4cdd12d774658 (patch)
tree4f14de27080a0b97311355a6c1e23294a67af165
parenta0be67df8b14446d4972e1b864d9b2c358f7218a (diff)
downloadopenembedded-1df15db347b0950694e78289b4a4cdd12d774658.tar.gz
openembedded-1df15db347b0950694e78289b4a4cdd12d774658.tar.bz2
openembedded-1df15db347b0950694e78289b4a4cdd12d774658.zip
libsndfile1_1.0.21.bb: Partially undo 21cc37782c0624d1efc9b56e94d1012557dce871
commit 21cc37782c0624d1efc9b56e94d1012557dce871 Author: Frans Meulenbroeks <fransmeulenbroeks@gmail.com> Date: Thu Mar 11 09:46:25 2010 +0100 libsndfile1: updated to 1.0.21 also fixed download location and moved two config vars to arm-common (not sure about ac_cv_sizeof_off_t=8, this seems odd or recipe specific, so left that one) Problem is that ac_cv_sys_file_offset_bits should not be cached blindly as the same var is used by glib-2.0 to detect large file system support if cached then glib-2.0 configure tests are not perfored and it assumes that large file support is there. uclibc is configurable to not have large file support compiled in hence this breaks glib-2.0 in a obscure way hence moving back to where they were. Signed-off-by: Khem Raj <raj.khem@gmail.com>
-rw-r--r--recipes/libsndfile/libsndfile1_1.0.21.bb8
-rw-r--r--site/arm-common4
2 files changed, 7 insertions, 5 deletions
diff --git a/recipes/libsndfile/libsndfile1_1.0.21.bb b/recipes/libsndfile/libsndfile1_1.0.21.bb
index 5144e1fba0..05fcea841c 100644
--- a/recipes/libsndfile/libsndfile1_1.0.21.bb
+++ b/recipes/libsndfile/libsndfile1_1.0.21.bb
@@ -4,7 +4,7 @@ AUTHOR = "Erik de Castro Lopo"
SECTION = "libs/multimedia"
LICENSE = "LGPL"
DEPENDS = "sqlite3"
-PR = "r0"
+PR = "r1"
SRC_URI = "http://www.mega-nerd.com/libsndfile/files/libsndfile-${PV}.tar.gz;name=libsndfile1021targz"
SRC_URI[libsndfile1021targz.md5sum] = "880a40ec636ab2185b97f8927299b292"
@@ -16,6 +16,12 @@ inherit autotools_stage lib_package pkgconfig
do_configure_prepend_arm() {
ac_cv_sizeof_off_t=8
+ # they are not in one of site/ files because they are common with
+ # glib-2.0 if they are moved to common site files then they break
+ # glib-2.0 build if largefile support is not available (.e.g. uclibc
+ # can be tuned to not have it.
+ export ac_cv_sys_largefile_source=1
+ export ac_cv_sys_file_offset_bits=64
}
do_configure_prepend_chinook-compat () {
diff --git a/site/arm-common b/site/arm-common
index 00497239c3..20de8c5261 100644
--- a/site/arm-common
+++ b/site/arm-common
@@ -126,10 +126,6 @@ ac_libnet_have_packet_socket=${ac_libnet_have_packet_socket=yes}
# libpcap
ac_cv_linux_vers=${ac_cv_linux_vers=2}
-# libsndfile
-ac_cv_sys_largefile_source=${ac_cv_sys_largefile_source=1}
-ac_cv_sys_file_offset_bits=${ac_cv_sys_file_offset_bits=64}
-
# libxfce4util
with_broken_putenv=${with_broken_putenv=no}