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