svn commit: r529780 - in head/emulators/wine-devel: . files
Gerald Pfeifer
gerald at FreeBSD.org
Sun Mar 29 09:22:51 UTC 2020
Author: gerald
Date: Sun Mar 29 09:22:41 2020
New Revision: 529780
URL: https://svnweb.freebsd.org/changeset/ports/529780
Log:
According to pkg-fallout 11.3-RELEASE-p7 runs into problems building
dlls/dbghelp/module.c after upstream changes in the last two weeks due
to a specific combination of macros related to ELF being (not) defined:
module.c: In function 'image_locate_build_id_target':
module.c:643:32: error: 'NT_GNU_BUILD_ID' undeclared (first use in this function)
643 | if (note[2] == NT_GNU_BUILD_ID)
| ^~~~~~~~~~~~~~~
Add a patch that I created and provided upstream where it was tentatively
ack-ed already.
Reported by: pkg-fallout
Added:
head/emulators/wine-devel/files/patch-dlls-dbghelp (contents, props changed)
Modified:
head/emulators/wine-devel/distinfo
Modified: head/emulators/wine-devel/distinfo
==============================================================================
--- head/emulators/wine-devel/distinfo Sun Mar 29 08:42:23 2020 (r529779)
+++ head/emulators/wine-devel/distinfo Sun Mar 29 09:22:41 2020 (r529780)
@@ -1,3 +1,5 @@
-TIMESTAMP = 1585347054
+TIMESTAMP = 1585468461
SHA256 (wine-5.5.tar.xz) = a0e3139b0beaa8cd0cd3fbafc96cd6097df615caa7045f377aeccce70cddf5fc
SIZE (wine-5.5.tar.xz) = 23630916
+SHA256 (v5.5.tar.gz) = 3559ed0f91dd9a863b4d3df70c41cdba385ce7a64f15102501a39e9f2c53b69c
+SIZE (v5.5.tar.gz) = 9920540
Added: head/emulators/wine-devel/files/patch-dlls-dbghelp
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/emulators/wine-devel/files/patch-dlls-dbghelp Sun Mar 29 09:22:41 2020 (r529780)
@@ -0,0 +1,61 @@
+From: Gerald Pfeifer <gerald at pfeifer.com>
+To: wine-devel at winehq.org, Jacek Caban <jacek at codeweavers.com>
+Date: Sat, 28 Mar 2020 16:23:58 +0100 (CET)
+Subject: [PATCH] dbghelp: Define NT_GNU_BUILD_ID regardless of whether __ELF__ is defined.
+
+[ Jacek, this materialized as a consequence of your changes
+ over the last 14 days, between Wine 5.4 and Wine 5.5. ]
+
+In dlls/dbghelp/module.c we have unconditional code like the following:
+
+ if (note[2] == NT_GNU_BUILD_ID)
+ {
+
+NT_GNU_BUILD_ID is #defined in image_private.h, which is #included by
+module.c, alas that definition is conditional on __ELF__ *not* being
+defined:
+
+ #ifndef __ELF__
+ :
+ #ifndef NT_GNU_BUILD_ID
+ #define NT_GNU_BUILD_ID 3
+ #endif
+ #endif
+
+This causes problems on some (newer) versions of FreeBSD, where
+apparently __ELF__ is defined while NT_GNU_BUILD_ID is not (at
+least not without including sys/elf_common.h which we do not).
+
+I do not have access to the version of FreeBSD 11.3 where that
+issue was reported. It did successfully pass on a different
+version of FreeBSD 11.3, though.
+
+Gerald
+
+
+Signed-off-by: Gerald Pfeifer <gerald at pfeifer.com>
+---
+ dlls/dbghelp/image_private.h | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+--- UTC
+diff --git a/dlls/dbghelp/image_private.h b/dlls/dbghelp/image_private.h
+index 9be6d3ebdc..d3c154b713 100644
+--- dlls/dbghelp/image_private.h
++++ dlls/dbghelp/image_private.h
+@@ -52,10 +52,11 @@
+ #ifndef SHT_NULL
+ #define SHT_NULL 0
+ #endif
++#endif
++
+ #ifndef NT_GNU_BUILD_ID
+ #define NT_GNU_BUILD_ID 3
+ #endif
+-#endif
+
+ /* structure holding information while handling an ELF image
+ * allows one by one section mapping for memory savings
+--
+2.25.0
+
More information about the svn-ports-all
mailing list