mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-04-27 03:32:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

mkelfimage: obey LDFLAGS, sort out HOST_ flags

Browse Source 
We weren't consistent in the HOST_ (aka BUILD_) and non-HOST_ flags, so we
were using BUILD_CPPFLAGS to compile target stuff, for example. Sort that out,
and make sure we obey LDFLAGS.

(From OE-Core rev: 3ba4fd81f99b5479830d1fb18e6b8f2f6edb7839)

Signed-off-by: Christopher Larson <chris_larson@mentor.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Christopher Larson
2016-05-20 10:04:20 -07:00
committed by Richard Purdie
parent d61d4ba6ca
commit fe70c063c5
2 changed files with 62 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

85
meta/recipes-devtools/mkelfimage/mkelfimage/cross-compile.patch
View File

@@ -1,13 +1,43 @@
make the tool to be cross compilable.
From dc2712119d6832e24a9b7bed9ed4ce5ae03ce0a3 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Sat, 14 Jul 2012 14:14:07 -0700
Subject: [PATCH] mkelfimage: Fix cross build
Make the tool to be cross compilable, by separating the variables for build
tools from those for the target. Also modified to obey LDFLAGS.
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Christopher Larson <chris_larson@mentor.com>
Upstream-Status: Pending
Index: mkelfImage/configure.ac
===================================================================
--- mkelfImage.orig/configure.ac 2012-07-14 14:04:48.964898667 -0700
+++ mkelfImage/configure.ac 2012-07-14 14:10:47.800916083 -0700
@@ -70,6 +70,9 @@
---
Makefile.conf.in | 3 +++
configure.ac | 7 +++++--
linux-i386/Makefile | 2 +-
linux-ia64/Makefile | 2 +-
main/Makefile | 4 ++--
5 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/Makefile.conf.in b/Makefile.conf.in
index 4645e44..dcb6cf2 100644
--- a/Makefile.conf.in
+++ b/Makefile.conf.in
@@ -17,6 +17,9 @@ DEFS=@DEFS@
LIBS=@LIBS@
HOST_CC=@HOST_CC@
HOST_CFLAGS=@HOST_CFLAGS@ $(DEFS)
+CC=@CC@
+CFLAGS=@CFLAGS@ $(DEFS)
+LDFLAGS=@LDFLAGS@
I386_CC =@I386_CC@
I386_LD =@I386_LD@
diff --git a/configure.ac b/configure.ac
index 652b952..0f2ac72 100644
--- a/configure.ac
+++ b/configure.ac
@@ -70,6 +70,9 @@ if test "with_default" != no ; then
AC_MSG_ERROR([cc not found])
fi
eval "${with_default}_CC='$CC'"
@@ -17,19 +47,22 @@ Index: mkelfImage/configure.ac
AC_PROG_CPP
if test "$CPP" = no; then
AC_MSG_ERROR([cpp not found])
@@ -172,7 +175,6 @@
@@ -172,8 +175,8 @@ fi
dnl ---Output variables...
-HOST_CC=$CC
HOST_CFLAGS="$HOST_CFLAGS -O2 -Wall \$(HOST_CPPFLAGS)"
-HOST_CFLAGS="$HOST_CFLAGS -O2 -Wall \$(HOST_CPPFLAGS)"
+CFLAGS="${CFLAGS:--O2} -Wall \$(CPPFLAGS)"
+HOST_CFLAGS="${HOST_CFLAGS:--O2} -Wall \$(HOST_CPPFLAGS)"
dnl TODO: figure out how to set these appropriately for compilers other than gcc
Index: mkelfImage/linux-i386/Makefile
===================================================================
--- mkelfImage.orig/linux-i386/Makefile 2012-07-14 14:04:48.964898667 -0700
+++ mkelfImage/linux-i386/Makefile 2012-07-14 14:04:49.032898671 -0700
@@ -4,7 +4,7 @@
I386_CFLAGS="$I386_CFLAGS -Os -ffreestanding -Wall -W -Wno-format \$(I386_CPPFLAGS)"
diff --git a/linux-i386/Makefile b/linux-i386/Makefile
index 51531d6..7e8aa3c 100644
--- a/linux-i386/Makefile
+++ b/linux-i386/Makefile
@@ -4,7 +4,7 @@ LI386_DEP=Makefile Makefile.conf $(LI386_DIR)/Makefile
$(LI386_OBJ)/mkelf-linux-i386.o: $(LI386_DIR)/mkelf-linux-i386.c $(LI386_DIR)/convert.bin.c $(LI386_DEP)
$(MKDIR) -p $(@D)
@@ -38,11 +71,11 @@ Index: mkelfImage/linux-i386/Makefile
ifdef I386_CC
Index: mkelfImage/linux-ia64/Makefile
===================================================================
--- mkelfImage.orig/linux-ia64/Makefile 2012-07-14 14:04:48.964898667 -0700
+++ mkelfImage/linux-ia64/Makefile 2012-07-14 14:04:49.032898671 -0700
@@ -4,7 +4,7 @@
diff --git a/linux-ia64/Makefile b/linux-ia64/Makefile
index 38f5d8c..5df8870 100644
--- a/linux-ia64/Makefile
+++ b/linux-ia64/Makefile
@@ -4,7 +4,7 @@ LIA64_DEP=Makefile Makefile.conf $(LIA64_DIR)/Makefile
$(LIA64_OBJ)/mkelf-linux-ia64.o: $(LIA64_DIR)/mkelf-linux-ia64.c $(LIA64_DIR)/convert.bin.c $(LIA64_DEP)
$(MKDIR) -p $(@D)
@@ -51,21 +84,23 @@ Index: mkelfImage/linux-ia64/Makefile
ifdef IA64_CC
Index: mkelfImage/main/Makefile
===================================================================
--- mkelfImage.orig/main/Makefile 2012-07-14 14:04:48.964898667 -0700
+++ mkelfImage/main/Makefile 2012-07-14 14:04:49.032898671 -0700
@@ -4,11 +4,11 @@
diff --git a/main/Makefile b/main/Makefile
index 403b0a4..cd53613 100644
--- a/main/Makefile
+++ b/main/Makefile
@@ -4,11 +4,11 @@ MKELF_OBJS=$(OBJDIR)/main/mkelfImage.o \
$(OBJDIR)/sbin/mkelfImage: $(MKELF_OBJS) $(DEPS)
$(MKDIR) -p $(@D)
- $(HOST_CC) $(HOST_CFLAGS) $(MKELF_OBJS) -o $@ $(LIBS)
+ $(CC) $(HOST_CFLAGS) $(MKELF_OBJS) -o $@ $(LIBS)
+ $(CC) $(CFLAGS) $(LDFLAGS) $(MKELF_OBJS) -o $@ $(LIBS)
$(OBJDIR)/main/mkelfImage.o: main/mkelfImage.c include/mkelfImage.h $(DEPS)
$(MKDIR) -p $(@D)
- $(HOST_CC) $(HOST_CFLAGS) -c $< -o $@
+ $(CC) $(HOST_CFLAGS) -c $< -o $@
+ $(CC) $(CFLAGS) -c $< -o $@
$(OBJDIR)/man/man8/mkelfImage.8: main/mkelfImage.man
$(MKDIR) -p $(@D)
--
2.8.0

4
meta/recipes-devtools/mkelfimage/mkelfimage_git.bb
View File

@@ -13,8 +13,8 @@ http://review.coreboot.org/gitweb?p=coreboot.git;a=commit;h=34fc4ab80b507739e258
DEPENDS += "zlib"
SRC_URI = "git://review.coreboot.org/p/coreboot;protocol=http \
file://cross-compile.patch \
"
file://cross-compile.patch \
"
SRC_URI_append_class-native = " \
file://fix-makefile-to-find-libz.patch \
"