--- Begin Message ---
Package: wine-development
Version: 3.20-2
Tags: patch
Fix two issues specific to the wine-development package:
1) Fix locating libwine.so and hence the correct library path for
cross-compiling. Using the 64bit -tools package breaks linking
32bit binaries [0][1] because winegcc fails to find its 32bit
libraries, and it incorrectly falls back to the native ones.
2) While at it, make winegcc use `winebuild-development` per default,
so the workaround script /usr/bin/winegcc-development can be removed.
The envvar WINEBUILD can still be used to override this.
[0] echo 'int main() { return 0; }' | winegcc-development -m32 -x -
[1] ld: relocatable linking with relocations from format elf64-x86-64
(/usr/lib/x86_64-linux-gnu/wine-development/libwinecrt0.a(exe_entry.o))
to format elf32-i386 (a.gjlTmQ.o) is not supported
Attached patch fixes both issues, please consider applying it!
Thanks!
Andre
>From 44ef6582ef3c3628bccac8d9bf10db6609feb439 Mon Sep 17 00:00:00 2001
From: Andre Heider <a.heider@gmail.com>
Date: Fri, 16 Nov 2018 23:14:08 +0100
Subject: [PATCH] winegcc: fixups for wine-development non-standard paths
Fix two issues specific to the wine-development package:
1) Fix locating libwine.so and hence the correct library path for
cross-compiling. Using the 64bit -tools package breaks linking
32bit binaries [0][1] because winegcc fails to find its 32bit
libraries, and it incorrectly falls back to the native ones.
2) While at it, make winegcc use `winebuild-development` per default,
so the workaround script /usr/bin/winegcc-development can be removed.
The envvar WINEBUILD can still be used to override this.
[0] echo 'int main() { return 0; }' | winegcc-development -m32 -x -
[1] ld: relocatable linking with relocations from format elf64-x86-64 (/usr/lib/x86_64-linux-gnu/wine-development/libwinecrt0.a(exe_entry.o)) to format elf32-i386 (a.gjlTmQ.o) is not supported
Signed-off-by: Andre Heider <a.heider@gmail.com>
---
tools/winegcc/winegcc.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c
index 6b3b4b6aab..39bd6b69a2 100644
--- a/tools/winegcc/winegcc.c
+++ b/tools/winegcc/winegcc.c
@@ -456,7 +456,7 @@ static char *get_lib_dir( struct options *opts )
for (i = 0; i < sizeof(stdlibpath)/sizeof(stdlibpath[0]); i++)
{
- char *p, *buffer = xmalloc( strlen(stdlibpath[i]) + strlen("/arm-linux-gnueabi") + strlen(libwine) + 1 );
+ char *p, *buffer = xmalloc( strlen(stdlibpath[i]) + strlen("/arm-linux-gnueabi") + strlen("/wine-development") + strlen(libwine) + 1 );
strcpy( buffer, stdlibpath[i] );
p = buffer + strlen(buffer);
while (p > buffer && p[-1] == '/') p--;
@@ -481,6 +481,7 @@ static char *get_lib_dir( struct options *opts )
default:
assert(0);
}
+ strcat( p, "/wine-development" );
strcat( p, libwine );
if (check_platform( opts, buffer )) goto found;
@@ -711,7 +712,7 @@ static strarray *get_winebuild_args(struct options *opts)
const char* winebuild = getenv("WINEBUILD");
strarray *spec_args = strarray_alloc();
- if (!winebuild) winebuild = "winebuild";
+ if (!winebuild) winebuild = "winebuild-development";
strarray_add( spec_args, winebuild );
if (verbose) strarray_add( spec_args, "-v" );
if (keep_generated) strarray_add( spec_args, "--save-temps" );
--
2.19.1
--- End Message ---
--- Begin Message ---
Source: wine-development
Source-Version: 3.21-1
We believe that the bug you reported is fixed in the latest version of
wine-development, which is due to be installed in the Debian FTP archive.
A summary of the changes between this version and the previous one is
attached.
Thank you for reporting the bug, which will now be closed. If you
have further comments please address them to 914031@bugs.debian.org,
and the maintainer will reopen the bug report if appropriate.
Debian distribution maintenance software
pp.
Michael Gilbert <mgilbert@debian.org> (supplier of updated wine-development package)
(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing ftpmaster@ftp-master.debian.org)
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512
Format: 1.8
Date: Sun, 25 Nov 2018 01:41:42 +0000
Source: wine-development
Binary: wine-development wine32-development wine64-development wine32-development-preloader wine64-development-preloader wine32-development-tools wine64-development-tools libwine-development libwine-development-dev
Architecture: source
Version: 3.21-1
Distribution: unstable
Urgency: medium
Maintainer: Debian Wine Party <debian-wine@lists.debian.org>
Changed-By: Michael Gilbert <mgilbert@debian.org>
Description:
libwine-development - Windows API implementation - library
libwine-development-dev - Windows API implementation - development files
wine-development - Windows API implementation - standard suite
wine32-development - Windows API implementation - 32-bit binary loader
wine32-development-preloader - Windows API implementation - prelinked 32-bit binary loader
wine32-development-tools - Windows API implementation - 32-bit developer tools
wine64-development - Windows API implementation - 64-bit binary loader
wine64-development-preloader - Windows API implementation - prelinked 64-bit binary loader
wine64-development-tools - Windows API implementation - 64-bit developer tools
Closes: 914031
Changes:
wine-development (3.21-1) unstable; urgency=medium
.
* New upstream release 3.21, released Nov 23, 2018.
- Fixes linking with winegcc when using multiarch (closes: #914031).
- Typelib marshaller rewrite using NDR functions.
- Support for memory font resources in DirectWrite.
- Joystick support improvements.
- Various bug fixes.
Checksums-Sha1:
404fb297429273658e3e62c2926ca7549577c93a 4751 wine-development_3.21-1.dsc
9cb8c041068608b701bf4ee127c08036b3874b03 19813732 wine-development_3.21.orig.tar.xz
74c12a1aca1051fa24eee8d6e7fa97ae85ef6322 190748 wine-development_3.21-1.debian.tar.xz
e76e9cbffc6008e7ea01a345248649749fe6f284 19598 wine-development_3.21-1_source.buildinfo
Checksums-Sha256:
793546faaa40be71dde8dc81687a06bd22194ac2a3658caf18c0f3911f70db57 4751 wine-development_3.21-1.dsc
3e5025b69815e9734eca053bc1f7a255eec81465d73f4a361787509fe289ff7b 19813732 wine-development_3.21.orig.tar.xz
39103edcb709384f248d20975b78a5204f53e6d3eaabd509ef78798531c241dd 190748 wine-development_3.21-1.debian.tar.xz
389410508908435167d12f4ee823d384ea3922d78e9226ae9c41565187f36811 19598 wine-development_3.21-1_source.buildinfo
Files:
c3c0e40a0e3c613155853d069dc66acc 4751 otherosfs optional wine-development_3.21-1.dsc
3afe435c13228ec0175d0a1dc4b785c3 19813732 otherosfs optional wine-development_3.21.orig.tar.xz
3d82ce5a3cb31bca44f59e98b6f8392b 190748 otherosfs optional wine-development_3.21-1.debian.tar.xz
cdf077be3030b727c53c7655606b1dc5 19598 otherosfs optional wine-development_3.21-1_source.buildinfo
-----BEGIN PGP SIGNATURE-----
iQQzBAEBCgAdFiEEluhy7ASCBulP9FUWuNayzQLW9HMFAlv6FjIACgkQuNayzQLW
9HMfVh//SHBA4XeR973UNzMfZPB+k5ILJGVtnFtmEotoy47jlRAGJ8qgMCUcgxSG
Kfyn4SXC0IowWySRl7m3H+L4vkeAEcJCh/SIIpaUH7+mLgdRTAHwVWUwu6A81cQa
SoDnPLn6nr7Qnd2p5nCKvmSR6NGe5kTSLBhUrTDedgVitWKb3HKCKQ4xI21t3ybf
WCkZqLwwkxFHZlYOzabIn7/U7PUBJ91OLsqkX0LS8vJ0SXNqG5wQ8i1dVTxqhYTc
8lezSYNJDW0yJ0G6SaMkWKjguMRY8QrzXCzBa5hLogTAi8Rng3V29IXkIIIbuxcS
Wnb8a5m9i+jBBZQTkVkhQktPuY0J06LqSeJ74nWRPbfMpwHXxwXB5AoF4M6bg8pc
7F8j0A4+Faghd3dl80dRrnoMpACBVVhtJWynq1XyjczmQCyPVmkWubVlYm2BEmMa
HFc17T2Bp8WzvOmKpzNRVVZ90AvQZmXR2uOxXIVUF5x2gdZ2gwxOKpQ2QIKqDQOp
EUZB0LbjGfnHrDkvjzRSU+GSOZbt1JOrWp62i7B635w0lBV5a+bSmoh/maTTfI2O
DfM6kx9GsArV1WgjVTz1DpzQFuF61SiKh6mskYNspRMIRaqdhpfYkrme9em1zvd9
/5jUDHPruPILNxyw9g3npORMR/rBFV6U/rKDFlxb7z4N+45TwMiFibBl6ixBMQ7y
cqwCR6nXuliRQeL9K7BjlsOSCmhUxL55ljXDpFPHh1ZY2JJ5bvoaVjcQ3i+HUpJ1
/TXGrKoN5rsOZnF4hQ+7kg6sbuPqP8nw5OTMRrMpqilyTiI/YamBmMsPiVeFZE3X
eBxryTb32Xs2EwOdt7O+27w91s/nW7ocvxiHfcVTByFkjU/Ecrqkxmoi7bHgJH7R
DS6qtfOgAQPNyb1gOuP3Ua9h9/cNTAomFGrjVpvhLuOoDfF9Xs8yyxsYooSBjg7j
0xZXgPeyxUQNkeq8M5ORGf3z8WEI0Egxz9DnIfVJhs5eMmnYFZBlNj9VvcVoY7jF
iFi/7rAySEtxmcG0vRgwim1Kx9WoeU7lVjZuN9dBXNrnBUadlR4IU95Csie+pdpL
E5DuYKK4WOPaUQx4JCbGIIJF1/IE4ywAoZLTC5xUBCyN+W7ZMKCHl1UsnHh7Nxsm
D/8lWk4nrv/x5FEFkdmYz+BsQGt2IVTjDs9wO822Ml4ws9ZfkaxvdWTRzA3xKuBi
zG9pBz32iWQ0HKlc/TknB6uYydj8AblQzGXforrp2Hz9LjP/GiWup5xAhPYjn/cC
Wu8tNri6R6lJODrazswxvFa9CQgTjTjN5uPpBxakDcCKTztD73oeiv0yV/8N2Dv7
q+BLJFftLAfTrO8dr5eZUS2seQN+JQ==
=+/y8
-----END PGP SIGNATURE-----
--- End Message ---