diff options
author | Martin Ertsaas <mertsas@cisco.com> | 2012-07-25 09:19:23 +0000 |
---|---|---|
committer | Koen Kooi <koen@dominion.thruhere.net> | 2012-08-07 12:23:28 +0200 |
commit | 697b369635031d77787cf553c323f96eda44b6d1 (patch) | |
tree | c111b06295589242ae6d2b22c335a00b4ad8a89f /meta-oe/recipes-support | |
parent | a6dc426c1ce9597cb96534819f7194603ce8f82f (diff) | |
download | meta-openembedded-697b369635031d77787cf553c323f96eda44b6d1.tar.gz |
cpufrequtils: Use CC, LD etc. that comes from OE.
The problem with just setting CROSS, is that it will unset all the flags
that OE sets in CC, like float-abi=hard.
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Diffstat (limited to 'meta-oe/recipes-support')
-rw-r--r-- | meta-oe/recipes-support/cpufrequtils/cpufrequtils/0001-dont-unset-cflags.patch | 30 | ||||
-rw-r--r-- | meta-oe/recipes-support/cpufrequtils/cpufrequtils_008.bb | 3 |
2 files changed, 32 insertions, 1 deletions
diff --git a/meta-oe/recipes-support/cpufrequtils/cpufrequtils/0001-dont-unset-cflags.patch b/meta-oe/recipes-support/cpufrequtils/cpufrequtils/0001-dont-unset-cflags.patch new file mode 100644 index 0000000000..fb2f07f073 --- /dev/null +++ b/meta-oe/recipes-support/cpufrequtils/cpufrequtils/0001-dont-unset-cflags.patch @@ -0,0 +1,30 @@ +--- git.old/Makefile 2012-04-17 13:29:46.280435340 +0200 ++++ git/Makefile 2012-04-17 13:31:13.664433470 +0200 +@@ -77,17 +77,7 @@ INSTALL_PROGRAM = ${INSTALL} + INSTALL_DATA = ${INSTALL} -m 644 + INSTALL_SCRIPT = ${INSTALL_PROGRAM} + +-# If you are running a cross compiler, you may want to set this +-# to something more interesting, like "arm-linux-". If you want +-# to compile vs uClibc, that can be done here as well. +-CROSS = #/usr/i386-linux-uclibc/usr/bin/i386-uclibc- +-CC = $(CROSS)gcc +-LD = $(CROSS)gcc +-AR = $(CROSS)ar +-STRIP = $(CROSS)strip +-RANLIB = $(CROSS)ranlib +-HOSTCC = gcc +- ++HOSTCC = $(BUILD_CC) + + # Now we set up the build system + # +@@ -95,7 +85,7 @@ HOSTCC = gcc + # set up PWD so that older versions of make will work with our build. + PWD = $(shell pwd) + +-export CROSS CC AR STRIP RANLIB CFLAGS LDFLAGS LIB_OBJS ++export CFLAGS LDFLAGS LIB_OBJS + + # check if compiler option is supported + cc-supports = ${shell if $(CC) ${1} -S -o /dev/null -xc /dev/null > /dev/null 2>&1; then echo "$(1)"; fi;} diff --git a/meta-oe/recipes-support/cpufrequtils/cpufrequtils_008.bb b/meta-oe/recipes-support/cpufrequtils/cpufrequtils_008.bb index 0cc3725dbc..6bab016507 100644 --- a/meta-oe/recipes-support/cpufrequtils/cpufrequtils_008.bb +++ b/meta-oe/recipes-support/cpufrequtils/cpufrequtils_008.bb @@ -9,11 +9,12 @@ SRCREV = "a2f0c39d5f21596bb9f5223e895c0ff210b265d0" # SRC_URI = "git://git.kernel.org/pub/scm/utils/kernel/cpufreq/cpufrequtils.git \ SRC_URI = "git://github.com/emagii/cpufrequtils.git \ + file://0001-dont-unset-cflags.patch \ " CFLAGS_append_libc-uclibc = " ${@['-DNLS', '-UNLS']['${USE_NLS}' == 'no']} " -PR = "r4" +PR = "r5" S = "${WORKDIR}/git" |