Skip to contentSkip to conversation

Fix mkelfimage native target

PATCH New Saul Wold 2 participants 3 messages Jun 5, 2017 – Jun 12, 2017

lore
Share & tools
lore

Saul Wold

author
#0 lore raw

PATCH 1/1 Fix mkelfimage native target

Folks,

I am going to start here, we may need a wider audience, let's see what happens!

Based on the fact that mkelfimage-native has been broken since late year, I wonder if it's time to retire the ELF Image type? Clear no one recently has use the native, or we would have seen a patch sooner.

I know that the target side was fixed a year a go, so not sure about getting rid of the recipe completely?

Thoughts? Flames??

Sau!

Saul Wold (1):
mkelfimage: Fix broken patch when building native

 .../mkelfimage/mkelfimage/fix-makefile-to-find-libz.patch            | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
Signature · 1 line
2.7.4
author
#1 lore raw

PATCH 1/1 mkelfimage: Fix broken patch when building native

A change occured about a year ago that broke the native build, fix that patch

[YOCTO #11590]

Signed-off-by Saul Wold <[email protected]>
---
 .../mkelfimage/mkelfimage/fix-makefile-to-find-libz.patch | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)
meta/recipes-devtools/mkelfimage/mkelfimage/fix-makefile-to-find-libz.patch +9 -6
index 756a65c..be54754 100644
@@ -3,8 +3,11 @@ Let makefile find libz and zlib.h by CFLAGS and LDFLAGS.
 Signed-off-by: Hongxu Jia <[email protected]>
 Upstream-Status: Pending
 ---
+ configure.ac | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
 diff --git a/configure.ac b/configure.ac
-index d1acc36..6f865b0 100644
+index 0f2ac72..f9099a2 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -62,7 +62,7 @@ AC_CHECK_PROG([RPM],   rpm,   rpm,   [], [$PATH])

@@ -16,15 +19,15 @@ index d1acc36..6f865b0 100644
  
  dnl Find the default programs
  if test "with_default" != no ; then
-@@ -175,7 +175,7 @@ fi
- 
+@@ -176,7 +176,7 @@ fi
  dnl ---Output variables...
  
--HOST_CFLAGS="$HOST_CFLAGS -O2 -Wall \$(HOST_CPPFLAGS)"
-+HOST_CFLAGS="$HOST_CFLAGS -O2 -Wall \$(HOST_CPPFLAGS) $CFLAGS"
+ CFLAGS="${CFLAGS:--O2} -Wall \$(CPPFLAGS)"
+-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
+2.7.4
Signature · 1 line
2.7.4
#2 lore raw

Re: [PATCH][pyro] mkelfimage: Fix broken patch when building native

Armin,

This should be a 2.3.1 candidate, it's now merged in master

Sau!

Quoted 59 lines · Saul Wold

A change occured about a year ago that broke the native build, fix that patch

[YOCTO #11590]

Signed-off-by Saul Wold <[email protected]>

---
 .../mkelfimage/mkelfimage/fix-makefile-to-find-libz.patch | 15
+++++++++------

 1 file changed, 9 insertions(+), 6 deletions(-)
(quoted diff) +0 -0

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

(quoted diff) +0 -0
@@ -3,8 +3,11 @@ Let makefile find libz and zlib.h by CFLAGS and

LDFLAGS.

Signed-off-by Hongxu Jia <[email protected]>

 Upstream-Status: Pending
 ---
+ configure.ac | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
 diff --git a/configure.ac b/configure.ac

meta/recipes-devtools/mkelfimage/mkelfimage/fix-makefile-to-find-libz.patch +1 -1
-index d1acc36..6f865b0 100644
+index 0f2ac72..f9099a2 100644

 --- a/configure.ac
 +++ b/configure.ac
 @@ -62,7 +62,7 @@ AC_CHECK_PROG([RPM],   rpm,   rpm,   [], [$PATH])

(quoted diff) +0 -0
@@ -16,15 +19,15 @@ index d1acc36..6f865b0 100644


  dnl Find the default programs
  if test "with_default" != no ; then
-@@ -175,7 +175,7 @@ fi
-
+@@ -176,7 +176,7 @@ fi
  dnl ---Output variables...

--HOST_CFLAGS="$HOST_CFLAGS -O2 -Wall \$(HOST_CPPFLAGS)" -+HOST_CFLAGS="$HOST_CFLAGS -O2 -Wall \$(HOST_CPPFLAGS) $CFLAGS"
+ CFLAGS="${CFLAGS:--O2} -Wall \$(CPPFLAGS)" +-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
+2.7.4

--
2.7.4