From d02e19ac91643fe63900d2c48e52d4585fe13432 Mon Sep 17 00:00:00 2001 From: Qing He Date: Fri, 31 Dec 2010 11:07:52 +0800 Subject: lzo: upgrade to version 2.04 from 2.03 lzo: fix LIC_FILES_CHKSUM Signed-off-by: Qing He Signed-off-by: Saul Wold --- meta/recipes-support/lzo/lzo-2.03/acinclude.m4 | 358 ----------------------- meta/recipes-support/lzo/lzo-2.03/autofoo.patch | 17 -- meta/recipes-support/lzo/lzo-2.04/acinclude.m4 | 358 +++++++++++++++++++++++ meta/recipes-support/lzo/lzo-2.04/autoconf.patch | 19 ++ meta/recipes-support/lzo/lzo_2.03.bb | 25 -- meta/recipes-support/lzo/lzo_2.04.bb | 26 ++ 6 files changed, 403 insertions(+), 400 deletions(-) delete mode 100644 meta/recipes-support/lzo/lzo-2.03/acinclude.m4 delete mode 100644 meta/recipes-support/lzo/lzo-2.03/autofoo.patch create mode 100644 meta/recipes-support/lzo/lzo-2.04/acinclude.m4 create mode 100644 meta/recipes-support/lzo/lzo-2.04/autoconf.patch delete mode 100644 meta/recipes-support/lzo/lzo_2.03.bb create mode 100644 meta/recipes-support/lzo/lzo_2.04.bb diff --git a/meta/recipes-support/lzo/lzo-2.03/acinclude.m4 b/meta/recipes-support/lzo/lzo-2.03/acinclude.m4 deleted file mode 100644 index c4d2ccd5b..000000000 --- a/meta/recipes-support/lzo/lzo-2.03/acinclude.m4 +++ /dev/null @@ -1,358 +0,0 @@ - -AC_DEFUN([mfx_ACC_CHECK_ENDIAN], [ -AC_C_BIGENDIAN([AC_DEFINE(ACC_ABI_BIG_ENDIAN,1,[Define to 1 if your machine is big endian.])],[AC_DEFINE(ACC_ABI_LITTLE_ENDIAN,1,[Define to 1 if your machine is little endian.])]) -])# - -AC_DEFUN([mfx_ACC_CHECK_HEADERS], [ -AC_HEADER_TIME -AC_CHECK_HEADERS([assert.h ctype.h dirent.h errno.h fcntl.h float.h limits.h malloc.h memory.h setjmp.h signal.h stdarg.h stddef.h stdint.h stdio.h stdlib.h string.h strings.h time.h unistd.h utime.h sys/stat.h sys/time.h sys/types.h sys/wait.h]) -])# - -AC_DEFUN([mfx_ACC_CHECK_FUNCS], [ -AC_CHECK_FUNCS(access alloca atexit atoi atol chmod chown ctime difftime fstat gettimeofday gmtime localtime longjmp lstat memcmp memcpy memmove memset mktime qsort raise setjmp signal snprintf strcasecmp strchr strdup strerror strftime stricmp strncasecmp strnicmp strrchr strstr time umask utime vsnprintf) -])# - - -AC_DEFUN([mfx_ACC_CHECK_SIZEOF], [ -AC_CHECK_SIZEOF(short) -AC_CHECK_SIZEOF(int) -AC_CHECK_SIZEOF(long) - -AC_CHECK_SIZEOF(long long) -AC_CHECK_SIZEOF(__int16) -AC_CHECK_SIZEOF(__int32) -AC_CHECK_SIZEOF(__int64) - -AC_CHECK_SIZEOF(void *) -AC_CHECK_SIZEOF(size_t) -AC_CHECK_SIZEOF(ptrdiff_t) -])# - - -# /*********************************************************************** -# // Check for ACC_conformance -# ************************************************************************/ - -AC_DEFUN([mfx_ACC_ACCCHK], [ -mfx_tmp=$1 -mfx_save_CPPFLAGS=$CPPFLAGS -dnl in Makefile.in $(INCLUDES) will be before $(CPPFLAGS), so we mimic this here -test "X$mfx_tmp" = "X" || CPPFLAGS="$mfx_tmp $CPPFLAGS" - -AC_MSG_CHECKING([whether your compiler passes the ACC conformance test]) - -AC_LANG_CONFTEST([AC_LANG_PROGRAM( -[[#define ACC_CONFIG_NO_HEADER 1 -#include "acc/acc.h" -#include "acc/acc_incd.h" -#undef ACCCHK_ASSERT -#define ACCCHK_ASSERT(expr) ACC_COMPILE_TIME_ASSERT_HEADER(expr) -#include "acc/acc_chk.ch" -#undef ACCCHK_ASSERT -static void test_acc_compile_time_assert(void) { -#define ACCCHK_ASSERT(expr) ACC_COMPILE_TIME_ASSERT(expr) -#include "acc/acc_chk.ch" -#undef ACCCHK_ASSERT -} -#undef NDEBUG -#include -static int test_acc_run_time_assert(int r) { -#define ACCCHK_ASSERT(expr) assert(expr); -#include "acc/acc_chk.ch" -#undef ACCCHK_ASSERT -return r; -} -]], [[ -test_acc_compile_time_assert(); -if (test_acc_run_time_assert(1) != 1) return 1; -]] -)]) - -mfx_tmp=FAILED -_AC_COMPILE_IFELSE([], [mfx_tmp=yes]) -rm -f conftest.$ac_ext conftest.$ac_objext - -CPPFLAGS=$mfx_save_CPPFLAGS - -AC_MSG_RESULT([$mfx_tmp]) -case x$mfx_tmp in - xpassed | xyes) ;; - *) - AC_MSG_NOTICE([]) - AC_MSG_NOTICE([Your compiler failed the ACC conformance test - for details see ]) - AC_MSG_NOTICE([`config.log'. Please check that log file and consider sending]) - AC_MSG_NOTICE([a patch or bug-report to <${PACKAGE_BUGREPORT}>.]) - AC_MSG_NOTICE([Thanks for your support.]) - AC_MSG_NOTICE([]) - AC_MSG_ERROR([ACC conformance test failed. Stop.]) -dnl AS_EXIT - ;; -esac -])# mfx_ACC_ACCCHK - - -# /*********************************************************************** -# // Check for ACC_conformance -# ************************************************************************/ - -AC_DEFUN([mfx_MINIACC_ACCCHK], [ -mfx_tmp=$1 -mfx_save_CPPFLAGS=$CPPFLAGS -dnl in Makefile.in $(INCLUDES) will be before $(CPPFLAGS), so we mimic this here -test "X$mfx_tmp" = "X" || CPPFLAGS="$mfx_tmp $CPPFLAGS" - -AC_MSG_CHECKING([whether your compiler passes the ACC conformance test]) - -AC_LANG_CONFTEST([AC_LANG_PROGRAM( -[[#define ACC_CONFIG_NO_HEADER 1 -#define ACC_WANT_ACC_INCD_H 1 -#include $2 - -#define ACC_WANT_ACC_CHK_CH 1 -#undef ACCCHK_ASSERT -#define ACCCHK_ASSERT(expr) ACC_COMPILE_TIME_ASSERT_HEADER(expr) -#include $2 - -#define ACC_WANT_ACC_CHK_CH 1 -#undef ACCCHK_ASSERT -#define ACCCHK_ASSERT(expr) ACC_COMPILE_TIME_ASSERT(expr) -static void test_acc_compile_time_assert(void) { -#include $2 -} - -#undef NDEBUG -#include -#define ACC_WANT_ACC_CHK_CH 1 -#undef ACCCHK_ASSERT -#define ACCCHK_ASSERT(expr) assert(expr); -static int test_acc_run_time_assert(int r) { -#include $2 -return r; -} -]], [[ -test_acc_compile_time_assert(); -if (test_acc_run_time_assert(1) != 1) return 1; -]] -)]) - -mfx_tmp=FAILED -_AC_COMPILE_IFELSE([], [mfx_tmp=yes]) -rm -f conftest.$ac_ext conftest.$ac_objext - -CPPFLAGS=$mfx_save_CPPFLAGS - -AC_MSG_RESULT([$mfx_tmp]) -case x$mfx_tmp in - xpassed | xyes) ;; - *) - AC_MSG_NOTICE([]) - AC_MSG_NOTICE([Your compiler failed the ACC conformance test - for details see ]) - AC_MSG_NOTICE([`config.log'. Please check that log file and consider sending]) - AC_MSG_NOTICE([a patch or bug-report to <${PACKAGE_BUGREPORT}>.]) - AC_MSG_NOTICE([Thanks for your support.]) - AC_MSG_NOTICE([]) - AC_MSG_ERROR([ACC conformance test failed. Stop.]) -dnl AS_EXIT - ;; -esac -])# mfx_MINIACC_ACCCHK - - - -# serial 1 - -AC_DEFUN([mfx_PROG_CPPFLAGS], [ -AC_MSG_CHECKING([whether the C preprocessor needs special flags]) - -AC_LANG_CONFTEST([AC_LANG_PROGRAM( -[[#include -#if (32767 >= 4294967295ul) || (65535u >= 4294967295ul) -# include "your C preprocessor is broken 1" -#elif (0xffffu == 0xfffffffful) -# include "your C preprocessor is broken 2" -#elif (32767 >= ULONG_MAX) || (65535u >= ULONG_MAX) -# include "your C preprocessor is broken 3" -#endif -]], [[ ]] -)]) - -mfx_save_CPPFLAGS=$CPPFLAGS -mfx_tmp=ERROR -for mfx_arg in "" -no-cpp-precomp -do - CPPFLAGS="$mfx_arg $mfx_save_CPPFLAGS" - _AC_COMPILE_IFELSE([], -[mfx_tmp=$mfx_arg -break]) -done -CPPFLAGS=$mfx_save_CPPFLAGS -rm -f conftest.$ac_ext conftest.$ac_objext -case x$mfx_tmp in - x) - AC_MSG_RESULT([none needed]) ;; - xERROR) - AC_MSG_RESULT([ERROR]) - AC_MSG_ERROR([your C preprocessor is broken - for details see config.log]) - ;; - *) - AC_MSG_RESULT([$mfx_tmp]) - CPPFLAGS="$mfx_tmp $CPPFLAGS" - ;; -esac -])# mfx_PROG_CPPFLAGS - - - -# serial 3 - -AC_DEFUN([mfx_CHECK_HEADER_SANE_LIMITS_H], [ -AC_CACHE_CHECK([whether limits.h is sane], -mfx_cv_header_sane_limits_h, -[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include -#if (32767 >= 4294967295ul) || (65535u >= 4294967295ul) -# if defined(__APPLE__) && defined(__GNUC__) -# error "your preprocessor is broken - use compiler option -no-cpp-precomp" -# else -# include "your preprocessor is broken" -# endif -#endif -#define MFX_0xffff 0xffff -#define MFX_0xffffffffL 4294967295ul -#if !defined(CHAR_BIT) || (CHAR_BIT != 8) -# include "error CHAR_BIT" -#endif -#if !defined(UCHAR_MAX) -# include "error UCHAR_MAX 1" -#endif -#if !defined(USHRT_MAX) -# include "error USHRT_MAX 1" -#endif -#if !defined(UINT_MAX) -# include "error UINT_MAX 1" -#endif -#if !defined(ULONG_MAX) -# include "error ULONG_MAX 1" -#endif -#if !defined(SHRT_MAX) -# include "error SHRT_MAX 1" -#endif -#if !defined(INT_MAX) -# include "error INT_MAX 1" -#endif -#if !defined(LONG_MAX) -# include "error LONG_MAX 1" -#endif -#if (UCHAR_MAX < 1) -# include "error UCHAR_MAX 2" -#endif -#if (USHRT_MAX < 1) -# include "error USHRT_MAX 2" -#endif -#if (UINT_MAX < 1) -# include "error UINT_MAX 2" -#endif -#if (ULONG_MAX < 1) -# include "error ULONG_MAX 2" -#endif -#if (UCHAR_MAX < 0xff) -# include "error UCHAR_MAX 3" -#endif -#if (USHRT_MAX < MFX_0xffff) -# include "error USHRT_MAX 3" -#endif -#if (UINT_MAX < MFX_0xffff) -# include "error UINT_MAX 3" -#endif -#if (ULONG_MAX < MFX_0xffffffffL) -# include "error ULONG_MAX 3" -#endif -#if (USHRT_MAX > UINT_MAX) -# include "error USHRT_MAX vs UINT_MAX" -#endif -#if (UINT_MAX > ULONG_MAX) -# include "error UINT_MAX vs ULONG_MAX" -#endif -]], [[ -#if (USHRT_MAX == MFX_0xffff) -{ typedef char a_short2a[1 - 2 * !(sizeof(short) == 2)]; } -#elif (USHRT_MAX >= MFX_0xffff) -{ typedef char a_short2b[1 - 2 * !(sizeof(short) > 2)]; } -#endif -#if (UINT_MAX == MFX_0xffff) -{ typedef char a_int2a[1 - 2 * !(sizeof(int) == 2)]; } -#elif (UINT_MAX >= MFX_0xffff) -{ typedef char a_int2b[1 - 2 * !(sizeof(int) > 2)]; } -#endif -#if (ULONG_MAX == MFX_0xffff) -{ typedef char a_long2a[1 - 2 * !(sizeof(long) == 2)]; } -#elif (ULONG_MAX >= MFX_0xffff) -{ typedef char a_long2b[1 - 2 * !(sizeof(long) > 2)]; } -#endif -#if (USHRT_MAX == MFX_0xffffffffL) -{ typedef char a_short4a[1 - 2 * !(sizeof(short) == 4)]; } -#elif (USHRT_MAX >= MFX_0xffffffffL) -{ typedef char a_short4b[1 - 2 * !(sizeof(short) > 4)]; } -#endif -#if (UINT_MAX == MFX_0xffffffffL) -{ typedef char a_int4a[1 - 2 * !(sizeof(int) == 4)]; } -#elif (UINT_MAX >= MFX_0xffffffffL) -{ typedef char a_int4b[1 - 2 * !(sizeof(int) > 4)]; } -#endif -#if (ULONG_MAX == MFX_0xffffffffL) -{ typedef char a_long4a[1 - 2 * !(sizeof(long) == 4)]; } -#elif (ULONG_MAX >= MFX_0xffffffffL) -{ typedef char a_long4b[1 - 2 * !(sizeof(long) > 4)]; } -#endif -]])], -[mfx_cv_header_sane_limits_h=yes], -[mfx_cv_header_sane_limits_h=no])]) -]) - -# /*********************************************************************** -# // standard -# ************************************************************************/ - -AC_DEFUN([mfx_LZO_CHECK_ENDIAN], [ -AC_C_BIGENDIAN([AC_DEFINE(LZO_ABI_BIG_ENDIAN,1,[Define to 1 if your machine is big endian.])],[AC_DEFINE(LZO_ABI_LITTLE_ENDIAN,1,[Define to 1 if your machine is little endian.])]) -])# - - -# /*********************************************************************** -# // -# ************************************************************************/ - -dnl more types which are not yet covered by ACC - -AC_DEFUN([mfx_CHECK_SIZEOF], [ -AC_CHECK_SIZEOF(__int32) -AC_CHECK_SIZEOF(intmax_t) -AC_CHECK_SIZEOF(uintmax_t) -AC_CHECK_SIZEOF(intptr_t) -AC_CHECK_SIZEOF(uintptr_t) - -AC_CHECK_SIZEOF(float) -AC_CHECK_SIZEOF(double) -AC_CHECK_SIZEOF(long double) - -AC_CHECK_SIZEOF(dev_t) -AC_CHECK_SIZEOF(fpos_t) -AC_CHECK_SIZEOF(mode_t) -AC_CHECK_SIZEOF(off_t) -AC_CHECK_SIZEOF(ssize_t) -AC_CHECK_SIZEOF(time_t) -])# - - - -AC_DEFUN([mfx_CHECK_LIB_WINMM], [ -if test "X$GCC" = Xyes; then -case $host_os in -cygwin* | mingw* | pw32*) - test "X$LIBS" != "X" && LIBS="$LIBS " - LIBS="${LIBS}-lwinmm" ;; -*) - ;; -esac -fi -])# - diff --git a/meta/recipes-support/lzo/lzo-2.03/autofoo.patch b/meta/recipes-support/lzo/lzo-2.03/autofoo.patch deleted file mode 100644 index 5762f4c6e..000000000 --- a/meta/recipes-support/lzo/lzo-2.03/autofoo.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -Index: lzo-2.02/configure.ac -=================================================================== ---- lzo-2.02.orig/configure.ac 2007-08-08 15:28:14.000000000 +0100 -+++ lzo-2.02/configure.ac 2007-08-08 15:28:21.000000000 +0100 -@@ -47,7 +47,7 @@ AC_CANONICAL_TARGET - AM_MAINTAINER_MODE - - if test -z "$ac_abs_top_srcdir"; then -- _AC_SRCPATHS(.) -+ _AC_SRCDIRS(.) - fi - if test -r .Conf.settings1; then - . ./.Conf.settings1 diff --git a/meta/recipes-support/lzo/lzo-2.04/acinclude.m4 b/meta/recipes-support/lzo/lzo-2.04/acinclude.m4 new file mode 100644 index 000000000..c4d2ccd5b --- /dev/null +++ b/meta/recipes-support/lzo/lzo-2.04/acinclude.m4 @@ -0,0 +1,358 @@ + +AC_DEFUN([mfx_ACC_CHECK_ENDIAN], [ +AC_C_BIGENDIAN([AC_DEFINE(ACC_ABI_BIG_ENDIAN,1,[Define to 1 if your machine is big endian.])],[AC_DEFINE(ACC_ABI_LITTLE_ENDIAN,1,[Define to 1 if your machine is little endian.])]) +])# + +AC_DEFUN([mfx_ACC_CHECK_HEADERS], [ +AC_HEADER_TIME +AC_CHECK_HEADERS([assert.h ctype.h dirent.h errno.h fcntl.h float.h limits.h malloc.h memory.h setjmp.h signal.h stdarg.h stddef.h stdint.h stdio.h stdlib.h string.h strings.h time.h unistd.h utime.h sys/stat.h sys/time.h sys/types.h sys/wait.h]) +])# + +AC_DEFUN([mfx_ACC_CHECK_FUNCS], [ +AC_CHECK_FUNCS(access alloca atexit atoi atol chmod chown ctime difftime fstat gettimeofday gmtime localtime longjmp lstat memcmp memcpy memmove memset mktime qsort raise setjmp signal snprintf strcasecmp strchr strdup strerror strftime stricmp strncasecmp strnicmp strrchr strstr time umask utime vsnprintf) +])# + + +AC_DEFUN([mfx_ACC_CHECK_SIZEOF], [ +AC_CHECK_SIZEOF(short) +AC_CHECK_SIZEOF(int) +AC_CHECK_SIZEOF(long) + +AC_CHECK_SIZEOF(long long) +AC_CHECK_SIZEOF(__int16) +AC_CHECK_SIZEOF(__int32) +AC_CHECK_SIZEOF(__int64) + +AC_CHECK_SIZEOF(void *) +AC_CHECK_SIZEOF(size_t) +AC_CHECK_SIZEOF(ptrdiff_t) +])# + + +# /*********************************************************************** +# // Check for ACC_conformance +# ************************************************************************/ + +AC_DEFUN([mfx_ACC_ACCCHK], [ +mfx_tmp=$1 +mfx_save_CPPFLAGS=$CPPFLAGS +dnl in Makefile.in $(INCLUDES) will be before $(CPPFLAGS), so we mimic this here +test "X$mfx_tmp" = "X" || CPPFLAGS="$mfx_tmp $CPPFLAGS" + +AC_MSG_CHECKING([whether your compiler passes the ACC conformance test]) + +AC_LANG_CONFTEST([AC_LANG_PROGRAM( +[[#define ACC_CONFIG_NO_HEADER 1 +#include "acc/acc.h" +#include "acc/acc_incd.h" +#undef ACCCHK_ASSERT +#define ACCCHK_ASSERT(expr) ACC_COMPILE_TIME_ASSERT_HEADER(expr) +#include "acc/acc_chk.ch" +#undef ACCCHK_ASSERT +static void test_acc_compile_time_assert(void) { +#define ACCCHK_ASSERT(expr) ACC_COMPILE_TIME_ASSERT(expr) +#include "acc/acc_chk.ch" +#undef ACCCHK_ASSERT +} +#undef NDEBUG +#include +static int test_acc_run_time_assert(int r) { +#define ACCCHK_ASSERT(expr) assert(expr); +#include "acc/acc_chk.ch" +#undef ACCCHK_ASSERT +return r; +} +]], [[ +test_acc_compile_time_assert(); +if (test_acc_run_time_assert(1) != 1) return 1; +]] +)]) + +mfx_tmp=FAILED +_AC_COMPILE_IFELSE([], [mfx_tmp=yes]) +rm -f conftest.$ac_ext conftest.$ac_objext + +CPPFLAGS=$mfx_save_CPPFLAGS + +AC_MSG_RESULT([$mfx_tmp]) +case x$mfx_tmp in + xpassed | xyes) ;; + *) + AC_MSG_NOTICE([]) + AC_MSG_NOTICE([Your compiler failed the ACC conformance test - for details see ]) + AC_MSG_NOTICE([`config.log'. Please check that log file and consider sending]) + AC_MSG_NOTICE([a patch or bug-report to <${PACKAGE_BUGREPORT}>.]) + AC_MSG_NOTICE([Thanks for your support.]) + AC_MSG_NOTICE([]) + AC_MSG_ERROR([ACC conformance test failed. Stop.]) +dnl AS_EXIT + ;; +esac +])# mfx_ACC_ACCCHK + + +# /*********************************************************************** +# // Check for ACC_conformance +# ************************************************************************/ + +AC_DEFUN([mfx_MINIACC_ACCCHK], [ +mfx_tmp=$1 +mfx_save_CPPFLAGS=$CPPFLAGS +dnl in Makefile.in $(INCLUDES) will be before $(CPPFLAGS), so we mimic this here +test "X$mfx_tmp" = "X" || CPPFLAGS="$mfx_tmp $CPPFLAGS" + +AC_MSG_CHECKING([whether your compiler passes the ACC conformance test]) + +AC_LANG_CONFTEST([AC_LANG_PROGRAM( +[[#define ACC_CONFIG_NO_HEADER 1 +#define ACC_WANT_ACC_INCD_H 1 +#include $2 + +#define ACC_WANT_ACC_CHK_CH 1 +#undef ACCCHK_ASSERT +#define ACCCHK_ASSERT(expr) ACC_COMPILE_TIME_ASSERT_HEADER(expr) +#include $2 + +#define ACC_WANT_ACC_CHK_CH 1 +#undef ACCCHK_ASSERT +#define ACCCHK_ASSERT(expr) ACC_COMPILE_TIME_ASSERT(expr) +static void test_acc_compile_time_assert(void) { +#include $2 +} + +#undef NDEBUG +#include +#define ACC_WANT_ACC_CHK_CH 1 +#undef ACCCHK_ASSERT +#define ACCCHK_ASSERT(expr) assert(expr); +static int test_acc_run_time_assert(int r) { +#include $2 +return r; +} +]], [[ +test_acc_compile_time_assert(); +if (test_acc_run_time_assert(1) != 1) return 1; +]] +)]) + +mfx_tmp=FAILED +_AC_COMPILE_IFELSE([], [mfx_tmp=yes]) +rm -f conftest.$ac_ext conftest.$ac_objext + +CPPFLAGS=$mfx_save_CPPFLAGS + +AC_MSG_RESULT([$mfx_tmp]) +case x$mfx_tmp in + xpassed | xyes) ;; + *) + AC_MSG_NOTICE([]) + AC_MSG_NOTICE([Your compiler failed the ACC conformance test - for details see ]) + AC_MSG_NOTICE([`config.log'. Please check that log file and consider sending]) + AC_MSG_NOTICE([a patch or bug-report to <${PACKAGE_BUGREPORT}>.]) + AC_MSG_NOTICE([Thanks for your support.]) + AC_MSG_NOTICE([]) + AC_MSG_ERROR([ACC conformance test failed. Stop.]) +dnl AS_EXIT + ;; +esac +])# mfx_MINIACC_ACCCHK + + + +# serial 1 + +AC_DEFUN([mfx_PROG_CPPFLAGS], [ +AC_MSG_CHECKING([whether the C preprocessor needs special flags]) + +AC_LANG_CONFTEST([AC_LANG_PROGRAM( +[[#include +#if (32767 >= 4294967295ul) || (65535u >= 4294967295ul) +# include "your C preprocessor is broken 1" +#elif (0xffffu == 0xfffffffful) +# include "your C preprocessor is broken 2" +#elif (32767 >= ULONG_MAX) || (65535u >= ULONG_MAX) +# include "your C preprocessor is broken 3" +#endif +]], [[ ]] +)]) + +mfx_save_CPPFLAGS=$CPPFLAGS +mfx_tmp=ERROR +for mfx_arg in "" -no-cpp-precomp +do + CPPFLAGS="$mfx_arg $mfx_save_CPPFLAGS" + _AC_COMPILE_IFELSE([], +[mfx_tmp=$mfx_arg +break]) +done +CPPFLAGS=$mfx_save_CPPFLAGS +rm -f conftest.$ac_ext conftest.$ac_objext +case x$mfx_tmp in + x) + AC_MSG_RESULT([none needed]) ;; + xERROR) + AC_MSG_RESULT([ERROR]) + AC_MSG_ERROR([your C preprocessor is broken - for details see config.log]) + ;; + *) + AC_MSG_RESULT([$mfx_tmp]) + CPPFLAGS="$mfx_tmp $CPPFLAGS" + ;; +esac +])# mfx_PROG_CPPFLAGS + + + +# serial 3 + +AC_DEFUN([mfx_CHECK_HEADER_SANE_LIMITS_H], [ +AC_CACHE_CHECK([whether limits.h is sane], +mfx_cv_header_sane_limits_h, +[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include +#if (32767 >= 4294967295ul) || (65535u >= 4294967295ul) +# if defined(__APPLE__) && defined(__GNUC__) +# error "your preprocessor is broken - use compiler option -no-cpp-precomp" +# else +# include "your preprocessor is broken" +# endif +#endif +#define MFX_0xffff 0xffff +#define MFX_0xffffffffL 4294967295ul +#if !defined(CHAR_BIT) || (CHAR_BIT != 8) +# include "error CHAR_BIT" +#endif +#if !defined(UCHAR_MAX) +# include "error UCHAR_MAX 1" +#endif +#if !defined(USHRT_MAX) +# include "error USHRT_MAX 1" +#endif +#if !defined(UINT_MAX) +# include "error UINT_MAX 1" +#endif +#if !defined(ULONG_MAX) +# include "error ULONG_MAX 1" +#endif +#if !defined(SHRT_MAX) +# include "error SHRT_MAX 1" +#endif +#if !defined(INT_MAX) +# include "error INT_MAX 1" +#endif +#if !defined(LONG_MAX) +# include "error LONG_MAX 1" +#endif +#if (UCHAR_MAX < 1) +# include "error UCHAR_MAX 2" +#endif +#if (USHRT_MAX < 1) +# include "error USHRT_MAX 2" +#endif +#if (UINT_MAX < 1) +# include "error UINT_MAX 2" +#endif +#if (ULONG_MAX < 1) +# include "error ULONG_MAX 2" +#endif +#if (UCHAR_MAX < 0xff) +# include "error UCHAR_MAX 3" +#endif +#if (USHRT_MAX < MFX_0xffff) +# include "error USHRT_MAX 3" +#endif +#if (UINT_MAX < MFX_0xffff) +# include "error UINT_MAX 3" +#endif +#if (ULONG_MAX < MFX_0xffffffffL) +# include "error ULONG_MAX 3" +#endif +#if (USHRT_MAX > UINT_MAX) +# include "error USHRT_MAX vs UINT_MAX" +#endif +#if (UINT_MAX > ULONG_MAX) +# include "error UINT_MAX vs ULONG_MAX" +#endif +]], [[ +#if (USHRT_MAX == MFX_0xffff) +{ typedef char a_short2a[1 - 2 * !(sizeof(short) == 2)]; } +#elif (USHRT_MAX >= MFX_0xffff) +{ typedef char a_short2b[1 - 2 * !(sizeof(short) > 2)]; } +#endif +#if (UINT_MAX == MFX_0xffff) +{ typedef char a_int2a[1 - 2 * !(sizeof(int) == 2)]; } +#elif (UINT_MAX >= MFX_0xffff) +{ typedef char a_int2b[1 - 2 * !(sizeof(int) > 2)]; } +#endif +#if (ULONG_MAX == MFX_0xffff) +{ typedef char a_long2a[1 - 2 * !(sizeof(long) == 2)]; } +#elif (ULONG_MAX >= MFX_0xffff) +{ typedef char a_long2b[1 - 2 * !(sizeof(long) > 2)]; } +#endif +#if (USHRT_MAX == MFX_0xffffffffL) +{ typedef char a_short4a[1 - 2 * !(sizeof(short) == 4)]; } +#elif (USHRT_MAX >= MFX_0xffffffffL) +{ typedef char a_short4b[1 - 2 * !(sizeof(short) > 4)]; } +#endif +#if (UINT_MAX == MFX_0xffffffffL) +{ typedef char a_int4a[1 - 2 * !(sizeof(int) == 4)]; } +#elif (UINT_MAX >= MFX_0xffffffffL) +{ typedef char a_int4b[1 - 2 * !(sizeof(int) > 4)]; } +#endif +#if (ULONG_MAX == MFX_0xffffffffL) +{ typedef char a_long4a[1 - 2 * !(sizeof(long) == 4)]; } +#elif (ULONG_MAX >= MFX_0xffffffffL) +{ typedef char a_long4b[1 - 2 * !(sizeof(long) > 4)]; } +#endif +]])], +[mfx_cv_header_sane_limits_h=yes], +[mfx_cv_header_sane_limits_h=no])]) +]) + +# /*********************************************************************** +# // standard +# ************************************************************************/ + +AC_DEFUN([mfx_LZO_CHECK_ENDIAN], [ +AC_C_BIGENDIAN([AC_DEFINE(LZO_ABI_BIG_ENDIAN,1,[Define to 1 if your machine is big endian.])],[AC_DEFINE(LZO_ABI_LITTLE_ENDIAN,1,[Define to 1 if your machine is little endian.])]) +])# + + +# /*********************************************************************** +# // +# ************************************************************************/ + +dnl more types which are not yet covered by ACC + +AC_DEFUN([mfx_CHECK_SIZEOF], [ +AC_CHECK_SIZEOF(__int32) +AC_CHECK_SIZEOF(intmax_t) +AC_CHECK_SIZEOF(uintmax_t) +AC_CHECK_SIZEOF(intptr_t) +AC_CHECK_SIZEOF(uintptr_t) + +AC_CHECK_SIZEOF(float) +AC_CHECK_SIZEOF(double) +AC_CHECK_SIZEOF(long double) + +AC_CHECK_SIZEOF(dev_t) +AC_CHECK_SIZEOF(fpos_t) +AC_CHECK_SIZEOF(mode_t) +AC_CHECK_SIZEOF(off_t) +AC_CHECK_SIZEOF(ssize_t) +AC_CHECK_SIZEOF(time_t) +])# + + + +AC_DEFUN([mfx_CHECK_LIB_WINMM], [ +if test "X$GCC" = Xyes; then +case $host_os in +cygwin* | mingw* | pw32*) + test "X$LIBS" != "X" && LIBS="$LIBS " + LIBS="${LIBS}-lwinmm" ;; +*) + ;; +esac +fi +])# + diff --git a/meta/recipes-support/lzo/lzo-2.04/autoconf.patch b/meta/recipes-support/lzo/lzo-2.04/autoconf.patch new file mode 100644 index 000000000..c34238710 --- /dev/null +++ b/meta/recipes-support/lzo/lzo-2.04/autoconf.patch @@ -0,0 +1,19 @@ +Date: 12/31/2010 +Didn't find 2.67 specific features, so lower the requirement +to pass build + +Signed-off-by: Qing He +--- +diff --git a/configure.ac b/configure.ac +index 650749a..2a78845 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -36,7 +36,7 @@ All Rights Reserved. + This configure script may be copied, distributed and modified under the + terms of the GNU General Public License; see COPYING for more details.]) + +-AC_PREREQ(2.67) ++AC_PREREQ(2.65) + AC_INIT([LZO],[2.04],[markus@oberhumer.com],[lzo],[http://www.oberhumer.com/opensource/lzo/]) + AC_MSG_NOTICE([Configuring LZO $PACKAGE_VERSION]) + AC_CONFIG_SRCDIR(src/lzo_init.c) diff --git a/meta/recipes-support/lzo/lzo_2.03.bb b/meta/recipes-support/lzo/lzo_2.03.bb deleted file mode 100644 index 05b10ee9f..000000000 --- a/meta/recipes-support/lzo/lzo_2.03.bb +++ /dev/null @@ -1,25 +0,0 @@ -DESCRIPTION = "Lossless data compression library" -HOMEPAGE = "http://www.oberhumer.com/opensource/lzo/" -SECTION = "libs" -PRIORITY = "optional" -LICENSE = "GPLv2+" -LIC_FILES_CHKSUM = "file://COPYING;md5=8cad52263e636e25377bc18420118101 \ - file://src/lzo_init.c;beginline=5;endline=33;md5=094776237523b2e93124cf09b9c76aef" -PR = "r0" - -SRC_URI = "http://www.oberhumer.com/opensource/lzo/download/lzo-${PV}.tar.gz \ - file://autofoo.patch \ - file://acinclude.m4" - -SRC_URI[md5sum] = "0c3d078c2e8ea5a88971089a2f02a726" -SRC_URI[sha256sum] = "8b1b0da8f757b9ac318e1c15a0eac8bdb56ca902a2dd25beda06c0f265f22591" - -inherit autotools - -EXTRA_OECONF = "--enable-shared" - -do_configure_prepend () { - cp ${WORKDIR}/acinclude.m4 ${S}/ -} - -BBCLASSEXTEND = "native" diff --git a/meta/recipes-support/lzo/lzo_2.04.bb b/meta/recipes-support/lzo/lzo_2.04.bb new file mode 100644 index 000000000..f8c8aba3a --- /dev/null +++ b/meta/recipes-support/lzo/lzo_2.04.bb @@ -0,0 +1,26 @@ +DESCRIPTION = "Lossless data compression library" +HOMEPAGE = "http://www.oberhumer.com/opensource/lzo/" +SECTION = "libs" +PRIORITY = "optional" +LICENSE = "GPLv2+" +LIC_FILES_CHKSUM = "file://COPYING;md5=8cad52263e636e25377bc18420118101 \ + file://src/lzo_init.c;beginline=5;endline=36;md5=454f781644dfe945e3634a9b699e91f3" +PR = "r0" + +SRC_URI = "http://www.oberhumer.com/opensource/lzo/download/lzo-${PV}.tar.gz \ + file://autoconf.patch \ + file://acinclude.m4 \ + " + +SRC_URI[md5sum] = "a383c7055a310e2a71b9ecd19cfea238" +SRC_URI[sha256sum] = "4ee3a040facf39561f13e4ef2ab99a886fd68251a35d612486ed0625cc6ab428" + +inherit autotools + +EXTRA_OECONF = "--enable-shared" + +do_configure_prepend () { + cp ${WORKDIR}/acinclude.m4 ${S}/ +} + +BBCLASSEXTEND = "native" -- cgit v1.2.3