[OE-core] [PATCH] eglibc_2.12.bb: Remove already upstreamed fix-for-make-3.82.diff

[Koen Kooi]

Op 14 jun 2011, om 20:53 heeft Khem Raj het volgende geschreven:

> 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
> 
> Signed-off-by: Khem Raj <raj.khem at gmail.com>

Acked-by: Koen Kooi <koen at dominion.thruhere.net>

> ---
> .../eglibc/eglibc-2.12/fix-for-make-3.82.diff      |   27 --------------------
> meta/recipes-core/eglibc/eglibc_2.12.bb            |    3 +-
> 2 files changed, 1 insertions(+), 29 deletions(-)
> delete mode 100644 meta/recipes-core/eglibc/eglibc-2.12/fix-for-make-3.82.diff
> 
> 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}"
> -- 
> 1.7.4.1
> 
> 
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core at lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core