Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
Bug 458756 - app-emulation/wine: conversion to autotools-multilib.eclass
Summary: app-emulation/wine: conversion to autotools-multilib.eclass
Status: RESOLVED FIXED
Alias: None
Product: Gentoo Linux
Classification: Unclassified
Component: Current packages (show other bugs)
Hardware: All Linux
: Normal enhancement (vote)
Assignee: Wine Maintainers
URL:
Whiteboard:
Keywords:
Depends on: 458728
Blocks: gx86-multilib
  Show dependency tree
 
Reported: 2013-02-22 16:09 UTC by Michał Górny
Modified: 2013-03-03 08:15 UTC (History)
2 users (show)

See Also:
Package list:
Runtime testing required: ---


Attachments
Step 1: use autotools-utils (0001-Step-1-use-autotools-utils.patch,5.17 KB, patch)
2013-02-22 16:10 UTC, Michał Górny
Details | Diff
Step 2: use autotools-multilib (0002-Step-2-Convert-to-autotools-multilib.patch,7.50 KB, patch)
2013-02-22 16:10 UTC, Michał Górny
Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Michał Górny archtester Gentoo Infrastructure gentoo-dev Security 2013-02-22 16:09:53 UTC
I have converted the wine ebuild to autotools-multilib. I will attach two patches to this bug; first one initially converting the ebuild to autotools-utils, second one doing necessary multilib changes.


1) USE=win32/win64 is replaced with ABI_X86 flags.

This is good for consistency but I don't think it fully matches the original intent of wine. Therefore, I'd say we should also use the multilib profile to un-force abi_x86_64 and enable abi_x86_32 by default on wine.


2) 32-bit gecko is now conditional to abi_x86_32.

I'm not sure why it was installed unconditionally. This means that it is installed on 32-bit installs only.


3) 'make depend' is done without -j1.

Nobody bothered to write a comment what the problem was, so I assumed it has been fixed over time and the package builds fine for me without it.


4) --with-wine64 is no longer used.

That option caused the 32-bit build to use the build-time tools from the 64-bit build. It's not really necessary, doesn't make much of a difference and gets totally broken with multilib_toolchain_setup's definition of CC.

Building two sets of build tools does get everything right, and the 32-bit tools in ${D} are overwritten during install with 64-bit ones, so the end result is the same.


5) all multilib deps get [development] USE-deps.

multilib.eclass sets up PKG_CONFIG_PATH right and thus requires all pkg-config files in lib32.

As a side effect, we have failure with missing .pc file in emul-linux-x86-xlibs. Therefore, until bug 458728, this can be tested only with USE=-truetype.
Comment 1 Michał Górny archtester Gentoo Infrastructure gentoo-dev Security 2013-02-22 16:10:23 UTC
Created attachment 339714 [details, diff]
Step 1: use autotools-utils
Comment 2 Michał Górny archtester Gentoo Infrastructure gentoo-dev Security 2013-02-22 16:10:39 UTC
Created attachment 339716 [details, diff]
Step 2: use autotools-multilib
Comment 3 Alexandre Rostovtsev (RETIRED) gentoo-dev 2013-03-03 08:15:49 UTC
+*wine-1.5.25 (03 Mar 2013)
+
+  03 Mar 2013; Alexandre Rostovtsev <tetromino@gentoo.org> +wine-1.5.25.ebuild,
+  wine-9999.ebuild:
+  Version bump, see http://www.winehq.org/announce/1.5.25 for the announcement.
+  Update to autotools-multilib.eclass (bug #458756, thanks to Michał Górny),
+  so USE="win32 -win64" is now ABI_X86="32 -64".