Skip to content

Commit

Permalink
xproto: refresh patch file
Browse files Browse the repository at this point in the history
:Release Notes:
Refresh patch file for old xproto introduced in
  commit d609606532de9df35c887f24f4083949be57e3b8
  Author: Minjae Kim <[email protected]>
  Date:   Fri Jun 7 18:46:11 2019 +0900

    wayland: downgrade 1.16.0 to 1.11.0

:Detailed Notes:
Fixes:
  WARNING: xproto-1_7.0.29-r0 do_patch:
  Some of the context lines in patches were ignored. This can lead to incorrectly applied patches.
  The context lines in the patches can be updated with devtool:

      devtool modify <recipe>
      devtool finish --force-patch-refresh <recipe> <layer_path>

  Then the updated patches and the source tree (in devtool's workspace)
  should be reviewed to make sure the patches apply in the correct place
  and don't introduce duplicate lines (which can, and does happen
  when some of the context is ignored). Further information:
  http://lists.openembedded.org/pipermail/openembedded-core/2018-March/148675.html
  https://bugzilla.yoctoproject.org/show_bug.cgi?id=10450
  Details:
  Applying patch xproto_fix_for_x32.patch
  patching file Xmd.h
  Hunk #1 succeeded at 62 with fuzz 2.

  Now at patch xproto_fix_for_x32.patch

:Testing Performed:
Only build tested.

:QA Notes:
None.

:Issues Addressed:
[PLAT-78082] Upgrade to Yocto 2.6 Thud
[PLAT-80706] [OSE] CCC: Various build fixes 2019-06-20

Change-Id: Icaf0d7a7c72539f91273de1bddd0cc5f492b8013
  • Loading branch information
Minjae Kim committed Jul 29, 2019
1 parent 5e3e487 commit 8cf17a4
Showing 1 changed file with 16 additions and 10 deletions.
Original file line number Diff line number Diff line change
@@ -1,22 +1,28 @@
Upstream-Status: Pending
From 789ed39d01a0dd928c6d525ce403eb449f624f7c Mon Sep 17 00:00:00 2001
From: Minjae Kim <[email protected]>
Date: Mon, 25 Mar 2019 15:35:19 +0900
Subject: [PATCH] Don't always define LONG64 for AMD64

Don't always define LONG64 for AMD64

X32 defines __amd64__/amd64 with 32bit long. We should simply check
__LP64__ before defining LONG64 without checking __amd64__/amd64.

This fixes compilation with x32 toolchain.
---
Xmd.h | 1 -
1 file changed, 1 deletion(-)

Received this patch from H.J. Lu <[email protected]>
Signed-off-by: Nitin A Kamble <[email protected]> 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
diff --git a/Xmd.h b/Xmd.h
index 492465e..c7cc6e3 100644
--- a/Xmd.h
+++ b/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 */
--
2.17.1

0 comments on commit 8cf17a4

Please sign in to comment.