From: Saul Wold <sgw@linux.intel.com>
To: Ross Burton <ross.burton@intel.com>
Cc: openembedded-core@lists.openembedded.org
Subject: Re: [PATCH] glib-2.0: drop Makefile.in hunks from patch
Date: Tue, 11 Jun 2013 07:33:25 -0700 [thread overview]
Message-ID: <51B73535.8000504@linux.intel.com> (raw)
In-Reply-To: <1370949528-4946-1-git-send-email-ross.burton@intel.com>
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
>
next prev parent reply other threads:[~2013-06-11 14:33 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-06-11 11:18 [PATCH] glib-2.0: drop Makefile.in hunks from patch Ross Burton
2013-06-11 14:33 ` Saul Wold [this message]
2013-06-11 14:46 ` Burton, Ross
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=51B73535.8000504@linux.intel.com \
--to=sgw@linux.intel.com \
--cc=openembedded-core@lists.openembedded.org \
--cc=ross.burton@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox