diff options
| author | Khem Raj <raj.khem@gmail.com> | 2011-06-14 11:53:58 -0700 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-06-16 22:14:06 +0100 |
| commit | f8461862ff77d19f56b1069e4a73e819c83f99d6 (patch) | |
| tree | 6c1f89e4deff3aa3666eb302e444fb25066c44c7 /meta | |
| parent | 90dab9783dc0e8c3ebf244d89f9523c39ff2255e (diff) | |
| download | ast2050-yocto-poky-f8461862ff77d19f56b1069e4a73e819c83f99d6.zip ast2050-yocto-poky-f8461862ff77d19f56b1069e4a73e819c83f99d6.tar.gz | |
eglibc_2.12.bb: Remove already upstreamed fix-for-make-3.82.diff
This patch is already applied to eglibc 2.12 branch as seen here
http://www.eglibc.org/cgi-bin/viewcvs.cgi/branches/eglibc-2_12/libc/manual/Makefile?rev=12230&sortby=date&r2=12230&r1=10495
(From OE-Core rev: 832d6d4226682ac9f3b6792ebed9837ff39017e0)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/recipes-core/eglibc/eglibc-2.12/fix-for-make-3.82.diff | 27 | ||||
| -rw-r--r-- | meta/recipes-core/eglibc/eglibc_2.12.bb | 3 |
2 files changed, 1 insertions, 29 deletions
diff --git a/meta/recipes-core/eglibc/eglibc-2.12/fix-for-make-3.82.diff b/meta/recipes-core/eglibc/eglibc-2.12/fix-for-make-3.82.diff deleted file mode 100644 index 89fff79..0000000 --- a/meta/recipes-core/eglibc/eglibc-2.12/fix-for-make-3.82.diff +++ /dev/null @@ -1,27 +0,0 @@ -Upstream-Status: Inappropriate [Backport] - -Make 3.82, as shipped with Fedora 14, fixes some holes in the parser which in -turn breaks behaviour of some Makefiles. Most notably eglibc's. - -http://www.mail-archive.com/bug-make@gnu.org/msg06220.html - -Fix back-ported from glibc/eglibc revision control. - -JL 13/10/10 - -Index: libc/manual/Makefile -=================================================================== ---- libc.orig/manual/Makefile -+++ libc/manual/Makefile -@@ -243,7 +243,10 @@ ifdef objpfx - .PHONY: stubs - stubs: $(objpfx)stubs - endif --$(objpfx)stubs ../po/manual.pot $(objpfx)stamp%: -+$(objpfx)stubs ../po/manual.pot: -+ $(make-target-directory) -+ touch $@ -+$(objpfx)stamp%: - $(make-target-directory) - touch $@ - diff --git a/meta/recipes-core/eglibc/eglibc_2.12.bb b/meta/recipes-core/eglibc/eglibc_2.12.bb index d851b5d..fe2f51d 100644 --- a/meta/recipes-core/eglibc/eglibc_2.12.bb +++ b/meta/recipes-core/eglibc/eglibc_2.12.bb @@ -1,7 +1,6 @@ require eglibc.inc DEPENDS += "gperf-native" -FILESPATHPKG =. "eglibc-svn:" PR = "r14" SRCREV = "14158" @@ -14,7 +13,7 @@ SRC_URI = "svn://www.eglibc.org/svn/branches/;module=${EGLIBC_BRANCH};proto=http file://mips-rld-map-check.patch \ file://etc/ld.so.conf \ file://generate-supported.mk \ - file://fix-for-make-3.82.diff" + " SRC_URI_append_virtclass-nativesdk = " file://ld-search-order.patch" S = "${WORKDIR}/${EGLIBC_BRANCH}/libc" B = "${WORKDIR}/build-${TARGET_SYS}" |
