Patchwork glib-2.0: drop Makefile.in hunks from patch

login
register
mail settings
Submitter Ross Burton
Date June 11, 2013, 11:18 a.m.
Message ID <1370949528-4946-1-git-send-email-ross.burton@intel.com>
Download mbox | patch
Permalink /patch/51525/
State Accepted
Commit 7a434806ebed84baca1c10637328b730b93e3742
Headers show

Comments

Ross Burton - June 11, 2013, 11:18 a.m.
Patching a generated file is prone to conflicts, and we'll be replacing this
file anyway when configuring, so drop the Makefile.in hunks.

Signed-off-by: Ross Burton <ross.burton@intel.com>
---
 .../glib-2.0/glib-2.0/glib-2.0_fix_for_x32.patch   |   34 --------------------
 1 file changed, 34 deletions(-)
Saul Wold - June 11, 2013, 2:33 p.m.
On 06/11/2013 04:18 AM, Ross Burton wrote:
> Patching a generated file is prone to conflicts, and we'll be replacing this
> file anyway when configuring, so drop the Makefile.in hunks.
>
Is there any replacement for  this patch, did you check that glib-2.0 
will still build correctly for x32?

Sau!

> Signed-off-by: Ross Burton <ross.burton@intel.com>
> ---
>   .../glib-2.0/glib-2.0/glib-2.0_fix_for_x32.patch   |   34 --------------------
>   1 file changed, 34 deletions(-)
>
> diff --git a/meta/recipes-core/glib-2.0/glib-2.0/glib-2.0_fix_for_x32.patch b/meta/recipes-core/glib-2.0/glib-2.0/glib-2.0_fix_for_x32.patch
> index 2920e2f..0c243cd 100644
> --- a/meta/recipes-core/glib-2.0/glib-2.0/glib-2.0_fix_for_x32.patch
> +++ b/meta/recipes-core/glib-2.0/glib-2.0/glib-2.0_fix_for_x32.patch
> @@ -23,23 +23,6 @@ Index: glib-2.30.0/glib/Makefile.am
>    BUILT_SOURCES += glib_probes.h glib_probes.o
>    CLEANFILES += glib_probes.h glib_probes.h.tmp
>    libglib_2_0_la_LIBADD += glib_probes.o
> -Index: glib-2.30.0/glib/Makefile.in
> -===================================================================
> ---- glib-2.30.0.orig/glib/Makefile.in
> -+++ glib-2.30.0/glib/Makefile.in
> -@@ -1691,10 +1691,10 @@ uninstall-local: uninstall-ms-lib uninst
> - @OS_WIN32_AND_DLL_COMPILATION_FALSE@uninstall-def-file:
> -
> - @ENABLE_DTRACE_TRUE@glib_probes.h: glib_probes.d Makefile
> --@ENABLE_DTRACE_TRUE@	$(AM_V_GEN) $(DTRACE) -C -h -s $< -o $@.tmp
> -+@ENABLE_DTRACE_TRUE@	$(AM_V_GEN)  CC="$(CC)" CFLAGS="$(CFLAGS)" $(DTRACE) -C -h -s $< -o $@.tmp
> - @ENABLE_DTRACE_TRUE@	@$(SED) -e "s,define STAP_HAS_SEMAPHORES 1,undef STAP_HAS_SEMAPHORES," < $@.tmp > $@ && rm -f $@.tmp
> - @ENABLE_DTRACE_TRUE@glib_probes.o: glib_probes.d Makefile
> --@ENABLE_DTRACE_TRUE@	$(AM_V_GEN) $(DTRACE) -G -s $< -o $@
> -+@ENABLE_DTRACE_TRUE@	$(AM_V_GEN)  CC="$(CC)" CFLAGS="$(CFLAGS)" $(DTRACE) -G -s $< -o $@
> -
> - gspawn-win32-helper-console.c:
> - 	echo '#define HELPER_CONSOLE' >$@
>   Index: glib-2.30.0/gobject/Makefile.am
>   ===================================================================
>   --- glib-2.30.0.orig/gobject/Makefile.am
> @@ -57,20 +40,3 @@ Index: glib-2.30.0/gobject/Makefile.am
>    BUILT_SOURCES += gobject_probes.h gobject_probes.o
>    CLEANFILES += gobject_probes.h
>    libgobject_2_0_la_LIBADD += gobject_probes.o
> -Index: glib-2.30.0/gobject/Makefile.in
> -===================================================================
> ---- glib-2.30.0.orig/gobject/Makefile.in
> -+++ glib-2.30.0/gobject/Makefile.in
> -@@ -1581,10 +1581,10 @@ uninstall-ms-lib:
> - @OS_WIN32_AND_DLL_COMPILATION_FALSE@uninstall-def-file:
> -
> - @ENABLE_DTRACE_TRUE@gobject_probes.h: gobject_probes.d Makefile
> --@ENABLE_DTRACE_TRUE@	$(AM_V_GEN) $(DTRACE) -C -h -s $< -o $@.tmp
> -+@ENABLE_DTRACE_TRUE@	$(AM_V_GEN) CFLAGS="$(CFLAGS)" $(DTRACE) -C -h -s $< -o $@.tmp
> - @ENABLE_DTRACE_TRUE@	@$(SED) -e "s,define STAP_HAS_SEMAPHORES 1,undef STAP_HAS_SEMAPHORES," < $@.tmp > $@ && rm -f $@.tmp
> - @ENABLE_DTRACE_TRUE@gobject_probes.o: gobject_probes.d Makefile
> --@ENABLE_DTRACE_TRUE@	$(AM_V_GEN) $(DTRACE) -G -s $< -o $@
> -+@ENABLE_DTRACE_TRUE@	$(AM_V_GEN) CFLAGS="$(CFLAGS)" $(DTRACE) -G -s $< -o $@
> -
> - # This is read by gobject-introspection/misc/ and gtk-doc
> - gobject-public-headers.txt: Makefile
>
Ross Burton - June 11, 2013, 2:46 p.m.
On 11 June 2013 15:33, Saul Wold <sgw@linux.intel.com> wrote:
>> Patching a generated file is prone to conflicts, and we'll be replacing
>> this
>> file anyway when configuring, so drop the Makefile.in hunks.
>>
> Is there any replacement for  this patch, did you check that glib-2.0 will
> still build correctly for x32?

The Makefile.am patches are still there, and as we run a full
autoreconf the Makefile.in patches will be overwritten.  I didn't test
x32 but if it breaks we've got bigger problems!

(I'll do a build now just to verify)

Ross

Patch

diff --git a/meta/recipes-core/glib-2.0/glib-2.0/glib-2.0_fix_for_x32.patch b/meta/recipes-core/glib-2.0/glib-2.0/glib-2.0_fix_for_x32.patch
index 2920e2f..0c243cd 100644
--- a/meta/recipes-core/glib-2.0/glib-2.0/glib-2.0_fix_for_x32.patch
+++ b/meta/recipes-core/glib-2.0/glib-2.0/glib-2.0_fix_for_x32.patch
@@ -23,23 +23,6 @@  Index: glib-2.30.0/glib/Makefile.am
  BUILT_SOURCES += glib_probes.h glib_probes.o
  CLEANFILES += glib_probes.h glib_probes.h.tmp
  libglib_2_0_la_LIBADD += glib_probes.o
-Index: glib-2.30.0/glib/Makefile.in
-===================================================================
---- glib-2.30.0.orig/glib/Makefile.in
-+++ glib-2.30.0/glib/Makefile.in
-@@ -1691,10 +1691,10 @@ uninstall-local: uninstall-ms-lib uninst
- @OS_WIN32_AND_DLL_COMPILATION_FALSE@uninstall-def-file:
- 
- @ENABLE_DTRACE_TRUE@glib_probes.h: glib_probes.d Makefile
--@ENABLE_DTRACE_TRUE@	$(AM_V_GEN) $(DTRACE) -C -h -s $< -o $@.tmp
-+@ENABLE_DTRACE_TRUE@	$(AM_V_GEN)  CC="$(CC)" CFLAGS="$(CFLAGS)" $(DTRACE) -C -h -s $< -o $@.tmp
- @ENABLE_DTRACE_TRUE@	@$(SED) -e "s,define STAP_HAS_SEMAPHORES 1,undef STAP_HAS_SEMAPHORES," < $@.tmp > $@ && rm -f $@.tmp
- @ENABLE_DTRACE_TRUE@glib_probes.o: glib_probes.d Makefile
--@ENABLE_DTRACE_TRUE@	$(AM_V_GEN) $(DTRACE) -G -s $< -o $@
-+@ENABLE_DTRACE_TRUE@	$(AM_V_GEN)  CC="$(CC)" CFLAGS="$(CFLAGS)" $(DTRACE) -G -s $< -o $@
- 
- gspawn-win32-helper-console.c:
- 	echo '#define HELPER_CONSOLE' >$@
 Index: glib-2.30.0/gobject/Makefile.am
 ===================================================================
 --- glib-2.30.0.orig/gobject/Makefile.am
@@ -57,20 +40,3 @@  Index: glib-2.30.0/gobject/Makefile.am
  BUILT_SOURCES += gobject_probes.h gobject_probes.o
  CLEANFILES += gobject_probes.h
  libgobject_2_0_la_LIBADD += gobject_probes.o
-Index: glib-2.30.0/gobject/Makefile.in
-===================================================================
---- glib-2.30.0.orig/gobject/Makefile.in
-+++ glib-2.30.0/gobject/Makefile.in
-@@ -1581,10 +1581,10 @@ uninstall-ms-lib:
- @OS_WIN32_AND_DLL_COMPILATION_FALSE@uninstall-def-file:
- 
- @ENABLE_DTRACE_TRUE@gobject_probes.h: gobject_probes.d Makefile
--@ENABLE_DTRACE_TRUE@	$(AM_V_GEN) $(DTRACE) -C -h -s $< -o $@.tmp
-+@ENABLE_DTRACE_TRUE@	$(AM_V_GEN) CFLAGS="$(CFLAGS)" $(DTRACE) -C -h -s $< -o $@.tmp
- @ENABLE_DTRACE_TRUE@	@$(SED) -e "s,define STAP_HAS_SEMAPHORES 1,undef STAP_HAS_SEMAPHORES," < $@.tmp > $@ && rm -f $@.tmp
- @ENABLE_DTRACE_TRUE@gobject_probes.o: gobject_probes.d Makefile
--@ENABLE_DTRACE_TRUE@	$(AM_V_GEN) $(DTRACE) -G -s $< -o $@
-+@ENABLE_DTRACE_TRUE@	$(AM_V_GEN) CFLAGS="$(CFLAGS)" $(DTRACE) -G -s $< -o $@
- 
- # This is read by gobject-introspection/misc/ and gtk-doc
- gobject-public-headers.txt: Makefile