summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSaul Wold <sgw@linux.intel.com>2017-06-05 22:47:56 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-06-14 10:57:47 (GMT)
commit5bb92a3166ce0983bbef9df9db5110bd6e567eca (patch)
tree570e47e22df6c4151a395c48dcc2a29133a34c3d
parent4ba0cc04af911271b7020d0a4f52182cb4bea19e (diff)
downloadpoky-5bb92a3166ce0983bbef9df9db5110bd6e567eca.tar.gz
mkelfimage: Fix broken patch when building native
A change occured about a year ago that broke the native build, fix that patch [YOCTO #11590] (From OE-Core rev: ccd8e2cf7157c941ebacc6be306c1dbe2ec31e86) Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/mkelfimage/mkelfimage/fix-makefile-to-find-libz.patch15
1 files changed, 9 insertions, 6 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
index 756a65c..be54754 100644
--- a/meta/recipes-devtools/mkelfimage/mkelfimage/fix-makefile-to-find-libz.patch
+++ b/meta/recipes-devtools/mkelfimage/mkelfimage/fix-makefile-to-find-libz.patch
@@ -3,8 +3,11 @@ Let makefile find libz and zlib.h by CFLAGS and LDFLAGS.
3Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> 3Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
4Upstream-Status: Pending 4Upstream-Status: Pending
5--- 5---
6 configure.ac | 4 ++--
7 1 file changed, 2 insertions(+), 2 deletions(-)
8
6diff --git a/configure.ac b/configure.ac 9diff --git a/configure.ac b/configure.ac
7index d1acc36..6f865b0 100644 10index 0f2ac72..f9099a2 100644
8--- a/configure.ac 11--- a/configure.ac
9+++ b/configure.ac 12+++ b/configure.ac
10@@ -62,7 +62,7 @@ AC_CHECK_PROG([RPM], rpm, rpm, [], [$PATH]) 13@@ -62,7 +62,7 @@ AC_CHECK_PROG([RPM], rpm, rpm, [], [$PATH])
@@ -16,15 +19,15 @@ index d1acc36..6f865b0 100644
16 19
17 dnl Find the default programs 20 dnl Find the default programs
18 if test "with_default" != no ; then 21 if test "with_default" != no ; then
19@@ -175,7 +175,7 @@ fi 22@@ -176,7 +176,7 @@ fi
20
21 dnl ---Output variables... 23 dnl ---Output variables...
22 24
23-HOST_CFLAGS="$HOST_CFLAGS -O2 -Wall \$(HOST_CPPFLAGS)" 25 CFLAGS="${CFLAGS:--O2} -Wall \$(CPPFLAGS)"
24+HOST_CFLAGS="$HOST_CFLAGS -O2 -Wall \$(HOST_CPPFLAGS) $CFLAGS" 26-HOST_CFLAGS="${HOST_CFLAGS:--O2} -Wall \$(HOST_CPPFLAGS)"
27+HOST_CFLAGS="${HOST_CFLAGS:--O2} -Wall \$(HOST_CPPFLAGS) $CFLAGS"
25 28
26 dnl TODO: figure out how to set these appropriately for compilers other than gcc 29 dnl TODO: figure out how to set these appropriately for compilers other than gcc
27 I386_CFLAGS="$I386_CFLAGS -Os -ffreestanding -Wall -W -Wno-format \$(I386_CPPFLAGS)" 30 I386_CFLAGS="$I386_CFLAGS -Os -ffreestanding -Wall -W -Wno-format \$(I386_CPPFLAGS)"
28-- 31--
291.7.10.4 322.7.4
30 33