Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
Bug 591976 - app-emulation/wine-9999 USE=staging uses WINE EGIT_COMMIT value for fetching staging sources (and fails?)
Summary: app-emulation/wine-9999 USE=staging uses WINE EGIT_COMMIT value for fetching ...
Status: RESOLVED FIXED
Alias: None
Product: Gentoo Linux
Classification: Unclassified
Component: Current packages (show other bugs)
Hardware: All Linux
: Normal normal (vote)
Assignee: Wine Maintainers
URL:
Whiteboard:
Keywords: PATCH
Depends on:
Blocks:
 
Reported: 2016-08-23 23:33 UTC by Kim Nilsson
Modified: 2016-08-27 01:38 UTC (History)
0 users

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

Attachments
Fix that temporarily unsets EGIT_COMMIT (wine-9999-disable-egit-commit-for-staging.patch,659 bytes, patch)
2016-08-23 23:33 UTC, Kim Nilsson 		Details | Diff
View All Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.
Description Kim Nilsson 2016-08-23 23:33:33 UTC 
Created attachment 444004 [details, diff]
Fix that temporarily unsets EGIT_COMMIT

Due to using the egit eclass for fetching both WINE and the staging sources, the latter inherits the same EGIT_COMMIT value and thus fails. 
I've included a patch which temporarily unsets EGIT_COMMIT while fetching the staging sources.
Comment 1 Jeroen Roovers (RETIRED) gentoo-dev 2016-08-24 10:05:52 UTC 
Please attach the failing build log or at least enough of it to support the patch.
Comment 2 Adam Feldman gentoo-dev 2016-08-24 17:58:43 UTC 
Fix is staged and will be out as soon as I can finish up my wine related edits today
Comment 3 Adam Feldman gentoo-dev 2016-08-24 19:11:36 UTC 
Fixed in ba956c8e2dcedd1265a19432fc38297c4d6e2e8c.  EGIT_COMMIT usage has been disabled in wine due to the collisions of multiple repos.  WINE_COMMIT, STAGING_COMMIT, and D3D9_COMMIT may be used.
Comment 4 Kim Nilsson 2016-08-27 01:38:38 UTC 
Sorry for not attaching the build log earlier, but I assumed that the build failure itself was not of great importance - it fails while applying patches from staging/D3D. I was about to add that the patch did not take care of the D3D git fetch and would fail similarly, but it seems a more elegant fix was already in-tree.

Thanks!