* [PATCH] eglibc-2.9: allow building with newer GNU make
@ 2011-09-13 13:29 Steffen Sledz
2011-09-13 14:51 ` Paul Menzel
2011-09-13 15:19 ` [PATCH] " Khem Raj
0 siblings, 2 replies; 11+ messages in thread
From: Steffen Sledz @ 2011-09-13 13:29 UTC (permalink / raw)
To: openembedded-devel
GNU make >= 3.82 does not allow mixed implicit and normal rules
Signed-off-by: Steffen Sledz <sledz@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 @@
+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"
--
1.7.3.4
^ permalink raw reply related [flat|nested] 11+ messages in thread
* Re: [PATCH] eglibc-2.9: allow building with newer GNU make
2011-09-13 13:29 [PATCH] eglibc-2.9: allow building with newer GNU make Steffen Sledz
@ 2011-09-13 14:51 ` Paul Menzel
2011-09-13 19:38 ` Steffen Sledz
2011-09-13 15:19 ` [PATCH] " Khem Raj
1 sibling, 1 reply; 11+ messages in thread
From: Paul Menzel @ 2011-09-13 14:51 UTC (permalink / raw)
To: openembedded-devel
[-- Attachment #1: Type: text/plain, Size: 2280 bytes --]
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?
I think to circumvent such issues `make-native` 3.81 should be used?
> Signed-off-by: Steffen Sledz <sledz@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 @@
The patch header is missing [1].
> +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
[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 205 bytes --]
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH] eglibc-2.9: allow building with newer GNU make
2011-09-13 13:29 [PATCH] eglibc-2.9: allow building with newer GNU make Steffen Sledz
2011-09-13 14:51 ` Paul Menzel
@ 2011-09-13 15:19 ` Khem Raj
1 sibling, 0 replies; 11+ messages in thread
From: Khem Raj @ 2011-09-13 15:19 UTC (permalink / raw)
To: Steffen Sledz; +Cc: openembedded-devel
On Tue, Sep 13, 2011 at 6:29 AM, Steffen Sledz <sledz@dresearch-fe.de> wrote:
> GNU make >= 3.82 does not allow mixed implicit and normal rules
>
> Signed-off-by: Steffen Sledz <sledz@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 @@
> +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"
> --
> 1.7.3.4
>
>
patch in essence is fine. Address Paul's concern about patch header
Acked-by: Khem Raj <raj.khem@gmail.com>
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH] eglibc-2.9: allow building with newer GNU make
2011-09-13 14:51 ` Paul Menzel
@ 2011-09-13 19:38 ` Steffen Sledz
2011-09-14 14:30 ` Steffen Sledz
0 siblings, 1 reply; 11+ messages in thread
From: Steffen Sledz @ 2011-09-13 19:38 UTC (permalink / raw)
To: openembedded-devel; +Cc: Paul Menzel
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@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 @@
>
> The patch header is missing [1].
Hmmm? After reading [1] i could not find what exactly is missing.
>> +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
>
>
>
> _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
--
DResearch Fahrzeugelektronik GmbH
Otto-Schmirgal-Str. 3, 10319 Berlin, Germany
Tel: +49 30 515932-237 mailto:sledz@dresearch-fe.de
Fax: +49 30 515932-299
Geschäftsführer: Dr. Michael Weber, Werner Mögle;
Amtsgericht Berlin Charlottenburg; HRB 130120 B;
Ust.-IDNr. DE273952058
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH] eglibc-2.9: allow building with newer GNU make
2011-09-13 19:38 ` Steffen Sledz
@ 2011-09-14 14:30 ` Steffen Sledz
2011-09-14 14:36 ` Paul Menzel
0 siblings, 1 reply; 11+ messages in thread
From: Steffen Sledz @ 2011-09-14 14:30 UTC (permalink / raw)
To: openembedded-devel; +Cc: Paul Menzel
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@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 @@
>>
>> 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)?
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?
>>> +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
>>
>>
>>
>> _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
>
>
--
DResearch Fahrzeugelektronik GmbH
Otto-Schmirgal-Str. 3, 10319 Berlin, Germany
Tel: +49 30 515932-237 mailto:sledz@dresearch-fe.de
Fax: +49 30 515932-299
Geschäftsführer: Dr. Michael Weber, Werner Mögle;
Amtsgericht Berlin Charlottenburg; HRB 130120 B;
Ust.-IDNr. DE273952058
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH] eglibc-2.9: allow building with newer GNU make
2011-09-14 14:30 ` Steffen Sledz
@ 2011-09-14 14:36 ` Paul Menzel
2011-09-14 14:43 ` Steffen Sledz
2011-09-14 14:55 ` [PATCH v2] " Steffen Sledz
0 siblings, 2 replies; 11+ messages in thread
From: Paul Menzel @ 2011-09-14 14:36 UTC (permalink / raw)
To: openembedded-devel
[-- Attachment #1: Type: text/plain, Size: 3090 bytes --]
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@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
[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 205 bytes --]
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH] eglibc-2.9: allow building with newer GNU make
2011-09-14 14:36 ` Paul Menzel
@ 2011-09-14 14:43 ` Steffen Sledz
2011-09-14 14:58 ` Paul Menzel
2011-09-14 14:55 ` [PATCH v2] " Steffen Sledz
1 sibling, 1 reply; 11+ messages in thread
From: Steffen Sledz @ 2011-09-14 14:43 UTC (permalink / raw)
To: openembedded-devel; +Cc: Paul Menzel
On 14.09.2011 16:36, Paul Menzel wrote:
>>>> 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.
It would be very helpful if [1] could be modified in a way that makes clear that it talk about to separate things: the commit message *and* the patch header.
This was totally unclear for me after reading it.
>> 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.
OK, i'll create a new version of the commit.
Steffen
[1] http://openembedded.org/index.php?title=Commit_Patch_Message_Guidelines
--
DResearch Fahrzeugelektronik GmbH
Otto-Schmirgal-Str. 3, 10319 Berlin, Germany
Tel: +49 30 515932-237 mailto:sledz@dresearch-fe.de
Fax: +49 30 515932-299
Geschäftsführer: Dr. Michael Weber, Werner Mögle;
Amtsgericht Berlin Charlottenburg; HRB 130120 B;
Ust.-IDNr. DE273952058
^ permalink raw reply [flat|nested] 11+ messages in thread
* [PATCH v2] eglibc-2.9: allow building with newer GNU make
2011-09-14 14:36 ` Paul Menzel
2011-09-14 14:43 ` Steffen Sledz
@ 2011-09-14 14:55 ` Steffen Sledz
2011-09-15 9:08 ` Paul Menzel
1 sibling, 1 reply; 11+ messages in thread
From: Steffen Sledz @ 2011-09-14 14:55 UTC (permalink / raw)
To: openembedded-devel; +Cc: paulepanter
GNU make >= 3.82 does not allow mixed implicit and normal rules
Signed-off-by: Steffen Sledz <sledz@dresearch-fe.de>
Acked-by: Khem Raj <raj.khem@gmail.com>
---
recipes/eglibc/eglibc-2.9/make-3.82.patch | 27 +++++++++++++++++++++++++++
recipes/eglibc/eglibc_2.9.bb | 3 ++-
2 files changed, 29 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..64cb270
--- /dev/null
+++ b/recipes/eglibc/eglibc-2.9/make-3.82.patch
@@ -0,0 +1,27 @@
+eglibc-2.9: allow building with newer GNU make
+
+GNU make >= 3.82 does not allow mixed implicit and normal rules
+
+Because eglibc-2.9 is superseeded by newer versions it makes no sense
+to submit this patch upstream.
+
+Upstream-Status: Inappropriate [other]
+
+Signed-off-by: Steffen Sledz <sledz@dresearch-fe.de>
+
+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"
--
1.7.3.4
^ permalink raw reply related [flat|nested] 11+ messages in thread
* Re: [PATCH] eglibc-2.9: allow building with newer GNU make
2011-09-14 14:43 ` Steffen Sledz
@ 2011-09-14 14:58 ` Paul Menzel
0 siblings, 0 replies; 11+ messages in thread
From: Paul Menzel @ 2011-09-14 14:58 UTC (permalink / raw)
To: openembedded-devel
[-- Attachment #1: Type: text/plain, Size: 1791 bytes --]
Am Mittwoch, den 14.09.2011, 16:43 +0200 schrieb Steffen Sledz:
> On 14.09.2011 16:36, Paul Menzel wrote:
> >>>> 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.
>
> It would be very helpful if [1] could be modified in a way that makes clear that it talk about to separate things: the commit message *and* the patch header.
>
> This was totally unclear for me after reading it.
I remarked that too when the guide lines were reviewed. And it is
explained in the second paragraph in the guideline [1].
This policy refers both to patches that are being applied by
recipes as well as commit messages that are part of the source
control system, usually git. A patch file needs a header in
order to describe the specific changes that are made within that
patch, while a commit message describes one or more changes to
the overall project or system. Both the patch headers and commit
messages require the same attention and basic details, however
the purposes of the messages are slightly different. A commit
message documents all of the changes made as part of a commit,
while a patch header documents items specific to a single patch.
In many cases the patch header can also be used as the commit
message.
Any suggestions are welcome though. And (the lame response) it is a Wiki
so everybody can improve the document.
Thanks,
Paul
> [1] http://openembedded.org/index.php?title=Commit_Patch_Message_Guidelines
[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 205 bytes --]
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH v2] eglibc-2.9: allow building with newer GNU make
2011-09-14 14:55 ` [PATCH v2] " Steffen Sledz
@ 2011-09-15 9:08 ` Paul Menzel
2011-09-15 10:14 ` Steffen Sledz
0 siblings, 1 reply; 11+ messages in thread
From: Paul Menzel @ 2011-09-15 9:08 UTC (permalink / raw)
To: openembedded-devel
[-- Attachment #1: Type: text/plain, Size: 1552 bytes --]
Am Mittwoch, den 14.09.2011, 16:55 +0200 schrieb Steffen Sledz:
Please amend the commit before pushing to replace »newer« with »>= 3.82«
and the typo below.
> GNU make >= 3.82 does not allow mixed implicit and normal rules
>
> Signed-off-by: Steffen Sledz <sledz@dresearch-fe.de>
> Acked-by: Khem Raj <raj.khem@gmail.com>
> ---
> recipes/eglibc/eglibc-2.9/make-3.82.patch | 27 +++++++++++++++++++++++++++
> recipes/eglibc/eglibc_2.9.bb | 3 ++-
> 2 files changed, 29 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..64cb270
> --- /dev/null
> +++ b/recipes/eglibc/eglibc-2.9/make-3.82.patch
> @@ -0,0 +1,27 @@
> +eglibc-2.9: allow building with newer GNU make
> +
> +GNU make >= 3.82 does not allow mixed implicit and normal rules
> +
> +Because eglibc-2.9 is superseeded by newer versions it makes no sense
s/superseeded/superseded/
(I always make the same mistake.)
> +to submit this patch upstream.
> +
> +Upstream-Status: Inappropriate [other]
> +
> +Signed-off-by: Steffen Sledz <sledz@dresearch-fe.de>
> +
> +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
Acked-by: Paul Menzel <paulepanter@users.sourceforge.net>
Thanks,
Paul
[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 205 bytes --]
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH v2] eglibc-2.9: allow building with newer GNU make
2011-09-15 9:08 ` Paul Menzel
@ 2011-09-15 10:14 ` Steffen Sledz
0 siblings, 0 replies; 11+ messages in thread
From: Steffen Sledz @ 2011-09-15 10:14 UTC (permalink / raw)
To: openembedded-devel; +Cc: Paul Menzel
On 15.09.2011 11:08, Paul Menzel wrote:
> Am Mittwoch, den 14.09.2011, 16:55 +0200 schrieb Steffen Sledz:
>
> Please amend the commit before pushing to replace »newer« with »>= 3.82«
> and the typo below.
>
>> GNU make >= 3.82 does not allow mixed implicit and normal rules
>>
>> Signed-off-by: Steffen Sledz <sledz@dresearch-fe.de>
>> Acked-by: Khem Raj <raj.khem@gmail.com>
>> ---
>> recipes/eglibc/eglibc-2.9/make-3.82.patch | 27 +++++++++++++++++++++++++++
>> recipes/eglibc/eglibc_2.9.bb | 3 ++-
>> 2 files changed, 29 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..64cb270
>> --- /dev/null
>> +++ b/recipes/eglibc/eglibc-2.9/make-3.82.patch
>> @@ -0,0 +1,27 @@
>> +eglibc-2.9: allow building with newer GNU make
>> +
>> +GNU make >= 3.82 does not allow mixed implicit and normal rules
>> +
>> +Because eglibc-2.9 is superseeded by newer versions it makes no sense
>
> s/superseeded/superseded/
>
> (I always make the same mistake.)
>
>> +to submit this patch upstream.
>> +
>> +Upstream-Status: Inappropriate [other]
>> +
>> +Signed-off-by: Steffen Sledz <sledz@dresearch-fe.de>
>> +
>> +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
>
> Acked-by: Paul Menzel <paulepanter@users.sourceforge.net>
Comment and patch header fixed and commit pushed.
Steffen
--
DResearch Fahrzeugelektronik GmbH
Otto-Schmirgal-Str. 3, 10319 Berlin, Germany
Tel: +49 30 515932-237 mailto:sledz@dresearch-fe.de
Fax: +49 30 515932-299
Geschäftsführer: Dr. Michael Weber, Werner Mögle;
Amtsgericht Berlin Charlottenburg; HRB 130120 B;
Ust.-IDNr. DE273952058
^ permalink raw reply [flat|nested] 11+ messages in thread
end of thread, other threads:[~2011-09-15 10:19 UTC | newest]
Thread overview: 11+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-09-13 13:29 [PATCH] eglibc-2.9: allow building with newer GNU make Steffen Sledz
2011-09-13 14:51 ` Paul Menzel
2011-09-13 19:38 ` Steffen Sledz
2011-09-14 14:30 ` Steffen Sledz
2011-09-14 14:36 ` Paul Menzel
2011-09-14 14:43 ` Steffen Sledz
2011-09-14 14:58 ` Paul Menzel
2011-09-14 14:55 ` [PATCH v2] " Steffen Sledz
2011-09-15 9:08 ` Paul Menzel
2011-09-15 10:14 ` Steffen Sledz
2011-09-13 15:19 ` [PATCH] " Khem Raj
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.