summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/mkelfimage/mkelfimage/fix-makefile-to-find-libz.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-devtools/mkelfimage/mkelfimage/fix-makefile-to-find-libz.patch')
-rw-r--r--meta/recipes-devtools/mkelfimage/mkelfimage/fix-makefile-to-find-libz.patch33
1 files changed, 0 insertions, 33 deletions
diff --git a/meta/recipes-devtools/mkelfimage/mkelfimage/fix-makefile-to-find-libz.patch b/meta/recipes-devtools/mkelfimage/mkelfimage/fix-makefile-to-find-libz.patch
deleted file mode 100644
index be547543dd..0000000000
--- a/meta/recipes-devtools/mkelfimage/mkelfimage/fix-makefile-to-find-libz.patch
+++ /dev/null
@@ -1,33 +0,0 @@
1Let makefile find libz and zlib.h by CFLAGS and LDFLAGS.
2
3Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
4Upstream-Status: Pending
5---
6 configure.ac | 4 ++--
7 1 file changed, 2 insertions(+), 2 deletions(-)
8
9diff --git a/configure.ac b/configure.ac
10index 0f2ac72..f9099a2 100644
11--- a/configure.ac
12+++ b/configure.ac
13@@ -62,7 +62,7 @@ AC_CHECK_PROG([RPM], rpm, rpm, [], [$PATH])
14 AC_CHECK_PROG([SED], sed, sed, [], [$PATH])
15 AC_CHECK_PROG([FIND], find, find, [], [$PATH])
16
17-AC_CHECK_HEADER(zlib.h, AC_CHECK_LIB(z, inflateInit_, [AC_DEFINE(HAVE_ZLIB_H, 1) LIBS="$LIBS -lz"]))
18+AC_CHECK_HEADER(zlib.h, AC_CHECK_LIB(z, inflateInit_, [AC_DEFINE(HAVE_ZLIB_H, 1) LIBS="$LIBS $LDFLAGS -lz"]))
19
20 dnl Find the default programs
21 if test "with_default" != no ; then
22@@ -176,7 +176,7 @@ fi
23 dnl ---Output variables...
24
25 CFLAGS="${CFLAGS:--O2} -Wall \$(CPPFLAGS)"
26-HOST_CFLAGS="${HOST_CFLAGS:--O2} -Wall \$(HOST_CPPFLAGS)"
27+HOST_CFLAGS="${HOST_CFLAGS:--O2} -Wall \$(HOST_CPPFLAGS) $CFLAGS"
28
29 dnl TODO: figure out how to set these appropriately for compilers other than gcc
30 I386_CFLAGS="$I386_CFLAGS -Os -ffreestanding -Wall -W -Wno-format \$(I386_CPPFLAGS)"
31--
322.7.4
33