[oe] [PATCH] eglibc-2.9: allow building with newer GNU make

[Paul Menzel]

Am Mittwoch, den 14.09.2011, 16:30 +0200 schrieb Steffen Sledz:
> On 13.09.2011 21:38, Steffen Sledz wrote:
> > On 13.09.2011 16:51, Paul Menzel wrote:
> >> Am Dienstag, den 13.09.2011, 15:29 +0200 schrieb Steffen Sledz:
> >>> GNU make >= 3.82 does not allow mixed implicit and normal rules
> >>
> >> Did you update your build host?
> > 
> > No. It's a clean setup with oe master and Kaeilos at openSUSE 11.4.
> > 
> >> I think to circumvent such issues `make-native` 3.81 should be used?
> > 
> > So this assumption seems to be wrong.
> > 
> >>> Signed-off-by: Steffen Sledz <sledz at dresearch-fe.de> --- recipes/eglibc/eglibc-2.9/make-3.82.patch |   16 ++++++++++++++++ recipes/eglibc/eglibc_2.9.bb              |    3 ++- 2 files changed, 18 insertions(+), 1 deletions(-) create mode 100644 recipes/eglibc/eglibc-2.9/make-3.82.patch
> >>>
> >>> diff --git a/recipes/eglibc/eglibc-2.9/make-3.82.patch b/recipes/eglibc/eglibc-2.9/make-3.82.patch new file mode 100644 index 0000000..b0a45d9 --- /dev/null +++ b/recipes/eglibc/eglibc-2.9/make-3.82.patch @@ -0,0 +1,16 @@

Thunderbird also messes with the line breaks. Koen had the same problem
and fixed it somehow by manually setting the line width I think.

> >> The patch header is missing [1].
> > 
> > Hmmm? After reading [1] i could not find what exactly is missing.
> 
> Does the guidelines require that the patch files itself (make-3.82.patch in this case) need a header (in addition to the commit comment)?

Yes, that is correct.

> If yes, how do i create such a header? Normally i create the patch with "diff -Nurd".
> 
> If no, please enlighten me what is required?

You can add any text to a diff file above a `---` I think. `patch` can
handle that. But there should be some example in the repositories.

> >>> +diff -Nurd libc.orig//manual/Makefile libc/manual/Makefile +--- libc.orig//manual/Makefile	2011-09-13 14:49:57.428424088 +0200 ++++ libc/manual/Makefile	2011-09-13 14:50:47.009620484 +0200 +@@ -242,7 +242,11 @@ + .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/recipes/eglibc/eglibc_2.9.bb b/recipes/eglibc/eglibc_2.9.bb index be60ba7..7e0fa55 100644 --- a/recipes/eglibc/eglibc_2.9.bb +++ b/recipes/eglibc/eglibc_2.9.bb @@ -3,7 +3,7 @@ require eglibc.inc DEPENDS += "gperf-native" FILESPATHPKG =. "eglibc-svn:" PV = "2.9" -PR = "${INC_PR}.10" +PR = "${INC_PR}.11" PR_append = "+svnr${SRCPV}" SRCREV="10153" EGLIBC_BRANCH="eglibc-2_9" @@ -14,6 +14,7 @@ SRC_URI = "svn://svn.eglibc.org/branches;module=${EGLIBC_BRANCH};proto=svn \ file://shorten-build-commands.patch \ 
> >>> file://sh4_set_fpscr.patch \ file://sh4_local-fpscr_values.patch \ +           file://make-3.82.patch \ file://etc/ld.so.conf \ file://generate-supported.mk" S = "${WORKDIR}/${EGLIBC_BRANCH}/libc"


Thanks,

Paul


> >> [1] http://openembedded.org/index.php?title=Commit_Patch_Message_Guidelines
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 198 bytes
Desc: This is a digitally signed message part
URL: <http://lists.openembedded.org/pipermail/openembedded-devel/attachments/20110914/dd7b0c61/attachment-0002.sig>