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 | |
parent | 90dab9783dc0e8c3ebf244d89f9523c39ff2255e (diff) | |
download | 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>
-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 89fff79c00..0000000000 --- a/meta/recipes-core/eglibc/eglibc-2.12/fix-for-make-3.82.diff +++ /dev/null | |||
@@ -1,27 +0,0 @@ | |||
1 | Upstream-Status: Inappropriate [Backport] | ||
2 | |||
3 | Make 3.82, as shipped with Fedora 14, fixes some holes in the parser which in | ||
4 | turn breaks behaviour of some Makefiles. Most notably eglibc's. | ||
5 | |||
6 | http://www.mail-archive.com/bug-make@gnu.org/msg06220.html | ||
7 | |||
8 | Fix back-ported from glibc/eglibc revision control. | ||
9 | |||
10 | JL 13/10/10 | ||
11 | |||
12 | Index: libc/manual/Makefile | ||
13 | =================================================================== | ||
14 | --- libc.orig/manual/Makefile | ||
15 | +++ libc/manual/Makefile | ||
16 | @@ -243,7 +243,10 @@ ifdef objpfx | ||
17 | .PHONY: stubs | ||
18 | stubs: $(objpfx)stubs | ||
19 | endif | ||
20 | -$(objpfx)stubs ../po/manual.pot $(objpfx)stamp%: | ||
21 | +$(objpfx)stubs ../po/manual.pot: | ||
22 | + $(make-target-directory) | ||
23 | + touch $@ | ||
24 | +$(objpfx)stamp%: | ||
25 | $(make-target-directory) | ||
26 | touch $@ | ||
27 | |||
diff --git a/meta/recipes-core/eglibc/eglibc_2.12.bb b/meta/recipes-core/eglibc/eglibc_2.12.bb index d851b5dcae..fe2f51d538 100644 --- a/meta/recipes-core/eglibc/eglibc_2.12.bb +++ b/meta/recipes-core/eglibc/eglibc_2.12.bb | |||
@@ -1,7 +1,6 @@ | |||
1 | require eglibc.inc | 1 | require eglibc.inc |
2 | 2 | ||
3 | DEPENDS += "gperf-native" | 3 | DEPENDS += "gperf-native" |
4 | FILESPATHPKG =. "eglibc-svn:" | ||
5 | PR = "r14" | 4 | PR = "r14" |
6 | 5 | ||
7 | SRCREV = "14158" | 6 | SRCREV = "14158" |
@@ -14,7 +13,7 @@ SRC_URI = "svn://www.eglibc.org/svn/branches/;module=${EGLIBC_BRANCH};proto=http | |||
14 | file://mips-rld-map-check.patch \ | 13 | file://mips-rld-map-check.patch \ |
15 | file://etc/ld.so.conf \ | 14 | file://etc/ld.so.conf \ |
16 | file://generate-supported.mk \ | 15 | file://generate-supported.mk \ |
17 | file://fix-for-make-3.82.diff" | 16 | " |
18 | SRC_URI_append_virtclass-nativesdk = " file://ld-search-order.patch" | 17 | SRC_URI_append_virtclass-nativesdk = " file://ld-search-order.patch" |
19 | S = "${WORKDIR}/${EGLIBC_BRANCH}/libc" | 18 | S = "${WORKDIR}/${EGLIBC_BRANCH}/libc" |
20 | B = "${WORKDIR}/build-${TARGET_SYS}" | 19 | B = "${WORKDIR}/build-${TARGET_SYS}" |