* [PATCH] eglibc_2.12.bb: Remove already upstreamed fix-for-make-3.82.diff
@ 2011-06-14 18:53 Khem Raj
2011-06-14 19:08 ` Koen Kooi
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Khem Raj @ 2011-06-14 18:53 UTC (permalink / raw)
To: OE core
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@gmail.com>
---
.../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
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH] eglibc_2.12.bb: Remove already upstreamed fix-for-make-3.82.diff
2011-06-14 18:53 [PATCH] eglibc_2.12.bb: Remove already upstreamed fix-for-make-3.82.diff Khem Raj
@ 2011-06-14 19:08 ` Koen Kooi
2011-06-14 19:13 ` Koen Kooi
2011-06-15 13:29 ` Richard Purdie
2 siblings, 0 replies; 4+ messages in thread
From: Koen Kooi @ 2011-06-14 19:08 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
Testing it now
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@gmail.com>
> ---
> .../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@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH] eglibc_2.12.bb: Remove already upstreamed fix-for-make-3.82.diff
2011-06-14 18:53 [PATCH] eglibc_2.12.bb: Remove already upstreamed fix-for-make-3.82.diff Khem Raj
2011-06-14 19:08 ` Koen Kooi
@ 2011-06-14 19:13 ` Koen Kooi
2011-06-15 13:29 ` Richard Purdie
2 siblings, 0 replies; 4+ messages in thread
From: Koen Kooi @ 2011-06-14 19:13 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
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@gmail.com>
Acked-by: Koen Kooi <koen@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@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH] eglibc_2.12.bb: Remove already upstreamed fix-for-make-3.82.diff
2011-06-14 18:53 [PATCH] eglibc_2.12.bb: Remove already upstreamed fix-for-make-3.82.diff Khem Raj
2011-06-14 19:08 ` Koen Kooi
2011-06-14 19:13 ` Koen Kooi
@ 2011-06-15 13:29 ` Richard Purdie
2 siblings, 0 replies; 4+ messages in thread
From: Richard Purdie @ 2011-06-15 13:29 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
On Tue, 2011-06-14 at 11:53 -0700, Khem Raj wrote:
> 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@gmail.com>
> ---
> .../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
Merged to master, thanks.
Richard
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2011-06-15 13:33 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-06-14 18:53 [PATCH] eglibc_2.12.bb: Remove already upstreamed fix-for-make-3.82.diff Khem Raj
2011-06-14 19:08 ` Koen Kooi
2011-06-14 19:13 ` Koen Kooi
2011-06-15 13:29 ` Richard Purdie
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox