busybox: Drop -r passthrough patch
This was added to help clang compile busybox but since then the option has been added to llvm and now we have upgraded clang to 3.8 which has this option available Fix git recipe to build with mdev feature and update to tip when here (From OE-Core rev: e617b6f9bf0aa3f1a7a19019f6953d0a102f3039) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
2c666af536
commit
3c5ee61b6d
|
@ -1,32 +0,0 @@
|
|||
From df2cc76cdebc4773361477f3db203790f6986e3b Mon Sep 17 00:00:00 2001
|
||||
From: Khem Raj <raj.khem@gmail.com>
|
||||
Date: Sat, 22 Aug 2015 23:42:40 -0700
|
||||
Subject: [PATCH 2/2] Passthrough -r to linker
|
||||
|
||||
clang does not have -r switch and it does not pass it down to linker
|
||||
either, LDFLAGS_RELOCATABLE is used when CC is used for LD, so this
|
||||
should not cause side effects
|
||||
|
||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||
---
|
||||
Upstream-Status: Pending
|
||||
|
||||
Makefile | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/Makefile b/Makefile
|
||||
index 9da02cb..10dd4a9 100644
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -309,7 +309,7 @@ CHECKFLAGS := -D__linux__ -Dlinux -D__STDC__ -Dunix -D__unix__ -Wbitwise $(C
|
||||
MODFLAGS = -DMODULE
|
||||
CFLAGS_MODULE = $(MODFLAGS)
|
||||
AFLAGS_MODULE = $(MODFLAGS)
|
||||
-LDFLAGS_RELOCATABLE = -r -nostdlib
|
||||
+LDFLAGS_RELOCATABLE = -Xlinker -r -nostdlib
|
||||
LDFLAGS_MODULE = $(LDFLAGS_RELOCATABLE)
|
||||
CFLAGS_KERNEL =
|
||||
AFLAGS_KERNEL =
|
||||
--
|
||||
2.1.4
|
||||
|
|
@ -29,7 +29,6 @@ SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \
|
|||
file://recognize_connmand.patch \
|
||||
file://busybox-cross-menuconfig.patch \
|
||||
file://0001-Use-CC-when-linking-instead-of-LD-and-use-CFLAGS-and.patch \
|
||||
file://0002-Passthrough-r-to-linker.patch \
|
||||
file://busybox-1.24.1-unzip.patch \
|
||||
file://busybox-1.24.1-unzip-regression.patch \
|
||||
file://busybox-1.24.1-truncate-open-mode.patch \
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
require busybox.inc
|
||||
|
||||
SRCREV = "966423d4034067f52b419570a1016d1dfc4aeacd"
|
||||
SRCREV = "1b7c17391de66502dd7a97c866e0a33681edbb1f"
|
||||
# Lookout for PV bump too when SRCREV is changed
|
||||
PV = "1.25.0+git${SRCPV}"
|
||||
|
||||
|
@ -35,12 +35,17 @@ SRC_URI = "git://busybox.net/busybox.git \
|
|||
file://recognize_connmand.patch \
|
||||
file://busybox-cross-menuconfig.patch \
|
||||
file://0001-Use-CC-when-linking-instead-of-LD-and-use-CFLAGS-and.patch \
|
||||
file://0002-Passthrough-r-to-linker.patch \
|
||||
file://mount-via-label.cfg \
|
||||
file://sha1sum.cfg \
|
||||
file://sha256sum.cfg \
|
||||
file://getopts.cfg \
|
||||
file://resize.cfg \
|
||||
${@["", "file://init.cfg"][(d.getVar('VIRTUAL-RUNTIME_init_manager', True) == 'busybox')]} \
|
||||
${@["", "file://mdev.cfg"][(d.getVar('VIRTUAL-RUNTIME_dev_manager', True) == 'busybox-mdev')]} \
|
||||
file://inittab \
|
||||
file://rcS \
|
||||
file://rcK \
|
||||
file://runlevel \
|
||||
"
|
||||
SRC_URI_append_libc-musl = " file://musl.cfg "
|
||||
|
||||
|
|
Loading…
Reference in New Issue