aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2017-11-15 16:44:41 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-03-07 06:33:58 -0800
commita9f9ca73840d1e6911e496a32ee862a724615b50 (patch)
treef1d592d12f7c728009dc88434c3311e9bac67a7b
parent4a3d8806d25e146be40eaf640bc6da8bdd1b6e05 (diff)
downloadopenembedded-core-a9f9ca73840d1e6911e496a32ee862a724615b50.zip
openembedded-core-a9f9ca73840d1e6911e496a32ee862a724615b50.tar.gz
openembedded-core-a9f9ca73840d1e6911e496a32ee862a724615b50.tar.bz2
xproto: refresh patches
The patch tool will apply patches by default with "fuzz", which is where if the hunk context isn't present but what is there is close enough, it will force the patch in. Whilst this is useful when there's just whitespace changes, when applied to source it is possible for a patch applied with fuzz to produce broken code which still compiles (see #10450). This is obviously bad. We'd like to eventually have do_patch() rejecting any fuzz on these grounds. For that to be realistic the existing patches with fuzz need to be rebased and reviewed. Signed-off-by: Ross Burton <ross.burton@intel.com>
-rw-r--r--meta/recipes-graphics/xorg-proto/xproto/xproto_fix_for_x32.patch10
1 files changed, 6 insertions, 4 deletions
diff --git a/meta/recipes-graphics/xorg-proto/xproto/xproto_fix_for_x32.patch b/meta/recipes-graphics/xorg-proto/xproto/xproto_fix_for_x32.patch
index 8a5ff58..4f9ed99 100644
--- a/meta/recipes-graphics/xorg-proto/xproto/xproto_fix_for_x32.patch
+++ b/meta/recipes-graphics/xorg-proto/xproto/xproto_fix_for_x32.patch
@@ -10,13 +10,15 @@ This fixes compilation with x32 toolchain.
Received this patch from H.J. Lu <hjl.tools@gmail.com>
Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com> 2011/12/1
---- xproto-7.0.22/Xmd.h.x32 2009-07-11 04:19:50.000000000 -0700
-+++ xproto-7.0.22/Xmd.h 2011-11-30 17:14:19.290395893 -0800
+Index: xproto-7.0.31/Xmd.h
+===================================================================
+--- xproto-7.0.31.orig/Xmd.h
++++ xproto-7.0.31/Xmd.h
@@ -62,7 +62,6 @@ SOFTWARE.
defined(__ia64__) || defined(ia64) || \
defined(__sparc64__) || \
defined(__s390x__) || \
- defined(__amd64__) || defined(amd64) || \
defined(__powerpc64__)
- # define LONG64 /* 32/64-bit architecture */
- # endif
+ # if !defined(__ILP32__) /* amd64-x32 is 32bit */
+ # define LONG64 /* 32/64-bit architecture */