mkelfimage-native:make failed if libz not in host
cover mkelfimage-native:make failed if libz not in host
The following changes since commit 381c4b69c7e8b452f4d3de2f8214e6e5f6a9abe7:
sstate.bbclass: fix detection of owners matching sstate files (2012-12-05 15:34:07 +0000)
are available in the git repository at:
git://git.pokylinux.org/poky-contrib hongxu/mkelfimage-native
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=hongxu/mkelfimage-native
Hongxu Jia (1):
mkelfimage-native:make failed if libz not in host
.../mkelfimage/fix-makefile-to-find-libz.patch | 30 ++++++++++++++++++++ meta/recipes-devtools/mkelfimage/mkelfimage_svn.bb | 3 +- 2 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-devtools/mkelfimage/mkelfimage/fix-makefile-to-find-libz.patch
Signature · 1 line
1.7.10.4
PATCH 1/1 mkelfimage-native:make failed if libz not in host
mkelfimage-native finds libz from host dir, not
from the staging directories.
Modify confiugre.ac to let makefile find libz
and zlib.h by CFLAGS and LDFLAGS.
[YOCTO #3547]
Signed-off-by Hongxu Jia <[email protected]>
--- .../mkelfimage/fix-makefile-to-find-libz.patch | 30 ++++++++++++++++++++ meta/recipes-devtools/mkelfimage/mkelfimage_svn.bb | 3 +- 2 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-devtools/mkelfimage/mkelfimage/fix-makefile-to-find-libz.patch
meta/recipes-devtools/mkelfimage/mkelfimage/fix-makefile-to-find-libz.patch new file +30 -0
@@ -0,0 +1,30 @@ +Let makefile find libz and zlib.h by CFLAGS and LDFLAGS. + +Signed-off-by: Hongxu Jia <[email protected]> +Upstream-Status: Pending +--- +diff --git a/configure.ac b/configure.ac +index d1acc36..6f865b0 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -62,7 +62,7 @@ AC_CHECK_PROG([RPM], rpm, rpm, [], [$PATH]) + AC_CHECK_PROG([SED], sed, sed, [], [$PATH]) + AC_CHECK_PROG([FIND], find, find, [], [$PATH]) + +-AC_CHECK_HEADER(zlib.h, AC_CHECK_LIB(z, inflateInit_, [AC_DEFINE(HAVE_ZLIB_H, 1) LIBS="$LIBS -lz"])) ++AC_CHECK_HEADER(zlib.h, AC_CHECK_LIB(z, inflateInit_, [AC_DEFINE(HAVE_ZLIB_H, 1) LIBS="$LIBS $LDFLAGS -lz"])) + + dnl Find the default programs + if test "with_default" != no ; then +@@ -175,7 +175,7 @@ fi + + dnl ---Output variables... + +-HOST_CFLAGS="$HOST_CFLAGS -O2 -Wall \$(HOST_CPPFLAGS)" ++HOST_CFLAGS="$HOST_CFLAGS -O2 -Wall \$(HOST_CPPFLAGS) $CFLAGS" + + dnl TODO: figure out how to set these appropriately for compilers other than gcc + I386_CFLAGS="$I386_CFLAGS -Os -ffreestanding -Wall -W -Wno-format \$(I386_CPPFLAGS)" +-- +1.7.10.4 +
meta/recipes-devtools/mkelfimage/mkelfimage_svn.bb +2 -1
@@ -6,12 +6,13 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=ea5bed2f60d357618ca161ad539f7c0a" SRCREV = "6637" PV = "1.0.0+svn${SRCPV}" -PR = "r1" +PR = "r2" DEPENDS += "zlib" SRC_URI = "svn://coreboot.org/coreboot/trunk/util;module=mkelfImage;protocol=svn \ file://cross-compile.patch \ + file://fix-makefile-to-find-libz.patch \ " S = "${WORKDIR}/mkelfImage"
Signature · 1 line
1.7.10.4