From a142cbd47eb78b4ea63459286d97ab5e769c7bdc Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Mon, 30 Jan 2012 15:04:45 -0800 Subject: zlib: Upgrade 1.2.5 -> 1.2.6 Dont use autotools, it really not so autoconf like. the configure script gets updated with every release of zlib and we overwrite that. Instead use the upstream provided configure copyright year was changed in zlib.h which caused change in LIC_FILE_CHECKSUM fix.inverted.LFS.logic.patch is already applied upstream so drop it Drop the configure.ac and Makefile.am scripts since we do not autoreconf anymore and do not inherit autotools anymore Bump PR for depending recipes so a rebuild it ensues so that they dont depend on .la anymore and add missing dependencies discovered during incremental build (From OE-Core rev: 50ad5230ea9e0982cdfda23fb9fcfccf89d28f29) Signed-off-by: Khem Raj Signed-off-by: Richard Purdie --- meta/recipes-core/zlib/files/configure.ac | 48 ------------------------------- 1 file changed, 48 deletions(-) delete mode 100644 meta/recipes-core/zlib/files/configure.ac (limited to 'meta/recipes-core/zlib/files/configure.ac') diff --git a/meta/recipes-core/zlib/files/configure.ac b/meta/recipes-core/zlib/files/configure.ac deleted file mode 100644 index 4761b7ef28..0000000000 --- a/meta/recipes-core/zlib/files/configure.ac +++ /dev/null @@ -1,48 +0,0 @@ -AC_INIT(zlib,1.2.5) -AC_CONFIG_SRCDIR(adler32.c) -AM_INIT_AUTOMAKE(zlibs,1.2.5) - -AC_PREREQ([2.59]) - -AC_PROG_CC([gcc]) -AC_PROG_LIBTOOL - -AC_HEADER_STDC - -zlib_save_CPPFLAGS=$CPPFLAGS -CPPFLAGS="$CPPFLAGS -D_LARGEFILE64_SOURCE" -AC_CHECK_TYPES(off64_t) -CPPFLAGS=$zlib_save_CPPFLAGS - -AC_CACHE_CHECK([whether to enable -D_LARGEFILE64_SOURCE], [zlib_cv_use_lfs64], [ - zlib_cv_use_lfs64=no - if test "$ac_cv_type_off64_t" = "yes"; then - zlib_cv_use_lfs64=yes - fi -]) - -if test "$zlib_cv_use_lfs64" = "yes"; then - CPPFLAGS="$CPPFLAGS -D_LARGEFILE64_SOURCE" - - #APR_ADDTO(CPPFLAGS, [-D_LARGEFILE64_SOURCE]) -fi - -cat > zlibdefs.h << EOF -/* zlibdefs.h -- compile-time definitions for the zlib compression library - * Copyright (C) 1995-2006 Jean-loup Gailly. - * For conditions of distribution and use, see copyright notice in zlib.h - */ - -#include /* for off_t */ -#include /* for SEEK_* and off_t */ -#ifdef VMS -# include /* for off_t */ -#endif -#ifndef z_off_t -# define z_off_t off_t -#endif -EOF - -AC_CONFIG_FILES([Makefile]) - -AC_OUTPUT -- cgit v1.2.3-54-g00ecf