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>
This commit is contained in:
parent
4ba0cc04af
commit
5bb92a3166
|
@ -3,8 +3,11 @@ Let makefile find libz and zlib.h by CFLAGS and LDFLAGS.
|
||||||
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
|
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
|
||||||
Upstream-Status: Pending
|
Upstream-Status: Pending
|
||||||
---
|
---
|
||||||
|
configure.ac | 4 ++--
|
||||||
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||||
|
|
||||||
diff --git a/configure.ac b/configure.ac
|
diff --git a/configure.ac b/configure.ac
|
||||||
index d1acc36..6f865b0 100644
|
index 0f2ac72..f9099a2 100644
|
||||||
--- a/configure.ac
|
--- a/configure.ac
|
||||||
+++ b/configure.ac
|
+++ b/configure.ac
|
||||||
@@ -62,7 +62,7 @@ AC_CHECK_PROG([RPM], rpm, rpm, [], [$PATH])
|
@@ -62,7 +62,7 @@ AC_CHECK_PROG([RPM], rpm, rpm, [], [$PATH])
|
||||||
|
@ -16,15 +19,15 @@ index d1acc36..6f865b0 100644
|
||||||
|
|
||||||
dnl Find the default programs
|
dnl Find the default programs
|
||||||
if test "with_default" != no ; then
|
if test "with_default" != no ; then
|
||||||
@@ -175,7 +175,7 @@ fi
|
@@ -176,7 +176,7 @@ fi
|
||||||
|
|
||||||
dnl ---Output variables...
|
dnl ---Output variables...
|
||||||
|
|
||||||
-HOST_CFLAGS="$HOST_CFLAGS -O2 -Wall \$(HOST_CPPFLAGS)"
|
CFLAGS="${CFLAGS:--O2} -Wall \$(CPPFLAGS)"
|
||||||
+HOST_CFLAGS="$HOST_CFLAGS -O2 -Wall \$(HOST_CPPFLAGS) $CFLAGS"
|
-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
|
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)"
|
I386_CFLAGS="$I386_CFLAGS -Os -ffreestanding -Wall -W -Wno-format \$(I386_CPPFLAGS)"
|
||||||
--
|
--
|
||||||
1.7.10.4
|
2.7.4
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue